diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index 96745101b7b..b0113c7b1c5 100755 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -35,9 +35,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.naming.ConfigurationException; -import org.apache.cloudstack.managed.context.ManagedContextTimerTask; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextTimerTask; + import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.AgentControlCommand; import com.cloud.agent.api.Answer; @@ -132,11 +133,13 @@ public class Agent implements HandlerFactory, IAgentControl { Runtime.getRuntime().addShutdownHook(new ShutdownThread(this)); - _ugentTaskPool = new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( - "UgentTask")); + _ugentTaskPool = + new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( + "UgentTask")); - _executor = new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue(), new NamedThreadFactory( - "agentRequest-Handler")); + _executor = + new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue(), new NamedThreadFactory( + "agentRequest-Handler")); } public Agent(IAgentShell shell, int localAgentId, ServerResource resource) throws ConfigurationException { @@ -168,14 +171,16 @@ public class Agent implements HandlerFactory, IAgentControl { s_logger.debug("Adding shutdown hook"); Runtime.getRuntime().addShutdownHook(new ShutdownThread(this)); - _ugentTaskPool = new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( - "UgentTask")); + _ugentTaskPool = + new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( + "UgentTask")); - _executor = new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue(), new NamedThreadFactory( - "agentRequest-Handler")); + _executor = + new ThreadPoolExecutor(_shell.getWorkers(), 5 * _shell.getWorkers(), 1, TimeUnit.DAYS, new LinkedBlockingQueue(), new NamedThreadFactory( + "agentRequest-Handler")); s_logger.info("Agent [id = " + (_id != null ? _id : "new") + " : type = " + getResourceName() + " : zone = " + _shell.getZone() + " : pod = " + _shell.getPod() + - " : workers = " + _shell.getWorkers() + " : host = " + _shell.getHost() + " : port = " + _shell.getPort()); + " : workers = " + _shell.getWorkers() + " : host = " + _shell.getHost() + " : port = " + _shell.getPort()); } public String getVersion() { @@ -489,7 +494,7 @@ public class Agent implements HandlerFactory, IAgentControl { } else { if (cmd instanceof ReadyCommand) { - processReadyCommand((ReadyCommand)cmd); + processReadyCommand(cmd); } _inProgress.incrementAndGet(); try { diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index 1bab042725c..936e3cd7a27 100644 --- a/agent/src/com/cloud/agent/AgentShell.java +++ b/agent/src/com/cloud/agent/AgentShell.java @@ -401,6 +401,7 @@ public class AgentShell implements IAgentShell, Daemon { return _nextAgentId++; } + @Override public void start() { try { /* By default we only search for log4j.xml */ @@ -444,10 +445,12 @@ public class AgentShell implements IAgentShell, Daemon { } } + @Override public void stop() { _exit = true; } + @Override public void destroy() { } diff --git a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java b/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java index 9d4cda6b095..5d75acf6a22 100644 --- a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java +++ b/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; - import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -42,6 +41,7 @@ public class DhcpProtocolParserServer extends Thread { _running = true; } + @Override public void run() { while (_running) { try { diff --git a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java b/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java index e25e2cf1f4d..67718d50095 100644 --- a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java +++ b/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java @@ -33,6 +33,7 @@ public interface DhcpSnooper extends Adapter { public Map syncIpAddr(); + @Override public boolean stop(); public void initializeMacTable(List> macVmNameList); diff --git a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java b/agent/src/com/cloud/agent/mockvm/MockVmMgr.java index ff0d41ea34f..b155cb725b1 100644 --- a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java +++ b/agent/src/com/cloud/agent/mockvm/MockVmMgr.java @@ -53,8 +53,8 @@ public class MockVmMgr implements VmMgr { } @Override - public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, String publicMac, - String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) { + public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, + String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) { if (s_logger.isInfoEnabled()) { StringBuffer sb = new StringBuffer(); @@ -132,6 +132,7 @@ public class MockVmMgr implements VmMgr { return false; } + @Override public MockVm getVm(String vmName) { synchronized (this) { MockVm vm = vms.get(vmName); diff --git a/agent/src/com/cloud/agent/mockvm/VmMgr.java b/agent/src/com/cloud/agent/mockvm/VmMgr.java index 95786aaba96..57bc4c12d7f 100644 --- a/agent/src/com/cloud/agent/mockvm/VmMgr.java +++ b/agent/src/com/cloud/agent/mockvm/VmMgr.java @@ -25,8 +25,8 @@ import com.cloud.vm.VirtualMachine.State; public interface VmMgr { public Set getCurrentVMs(); - public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, String publicMac, - String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword); + public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP, + String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword); public String stopVM(String vmName, boolean force); diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java index a3169643350..ec262a8ba35 100755 --- a/agent/src/com/cloud/agent/resource/DummyResource.java +++ b/agent/src/com/cloud/agent/resource/DummyResource.java @@ -32,9 +32,9 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.PingCommand; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; +import com.cloud.agent.api.StartupRoutingCommand.VmState; import com.cloud.agent.api.StartupStorageCommand; import com.cloud.agent.api.StoragePoolInfo; -import com.cloud.agent.api.StartupRoutingCommand.VmState; import com.cloud.host.Host; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -110,14 +110,14 @@ public class DummyResource implements ServerResource { protected void fillNetworkInformation(final StartupCommand cmd) { - cmd.setPrivateIpAddress((String)getConfiguredProperty("private.ip.address", "127.0.0.1")); - cmd.setPrivateMacAddress((String)getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3")); - cmd.setPrivateNetmask((String)getConfiguredProperty("private.ip.netmask", "255.255.255.0")); + cmd.setPrivateIpAddress(getConfiguredProperty("private.ip.address", "127.0.0.1")); + cmd.setPrivateMacAddress(getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3")); + cmd.setPrivateNetmask(getConfiguredProperty("private.ip.netmask", "255.255.255.0")); - cmd.setStorageIpAddress((String)getConfiguredProperty("private.ip.address", "127.0.0.1")); - cmd.setStorageMacAddress((String)getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3")); - cmd.setStorageNetmask((String)getConfiguredProperty("private.ip.netmask", "255.255.255.0")); - cmd.setGatewayIpAddress((String)getConfiguredProperty("gateway.ip.address", "127.0.0.1")); + cmd.setStorageIpAddress(getConfiguredProperty("private.ip.address", "127.0.0.1")); + cmd.setStorageMacAddress(getConfiguredProperty("private.mac.address", "8A:D2:54:3F:7C:C3")); + cmd.setStorageNetmask(getConfiguredProperty("private.ip.netmask", "255.255.255.0")); + cmd.setGatewayIpAddress(getConfiguredProperty("gateway.ip.address", "127.0.0.1")); } @@ -133,13 +133,13 @@ public class DummyResource implements ServerResource { } protected StoragePoolInfo initializeLocalStorage() { - String hostIp = (String)getConfiguredProperty("private.ip.address", "127.0.0.1"); - String localStoragePath = (String)getConfiguredProperty("local.storage.path", "/mnt"); + String hostIp = getConfiguredProperty("private.ip.address", "127.0.0.1"); + String localStoragePath = getConfiguredProperty("local.storage.path", "/mnt"); String lh = hostIp + localStoragePath; String uuid = UUID.nameUUIDFromBytes(lh.getBytes()).toString(); - String capacity = (String)getConfiguredProperty("local.storage.capacity", "1000000000"); - String available = (String)getConfiguredProperty("local.storage.avail", "10000000"); + String capacity = getConfiguredProperty("local.storage.capacity", "1000000000"); + String available = getConfiguredProperty("local.storage.avail", "10000000"); return new StoragePoolInfo(uuid, hostIp, localStoragePath, localStoragePath, StoragePoolType.Filesystem, Long.parseLong(capacity), Long.parseLong(available)); @@ -151,8 +151,9 @@ public class DummyResource implements ServerResource { final List info = getHostInfo(); - final StartupRoutingCommand cmd = new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), - HypervisorType.KVM, RouterPrivateIpStrategy.HostLocal, changes, null); + final StartupRoutingCommand cmd = + new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), HypervisorType.KVM, + RouterPrivateIpStrategy.HostLocal, changes, null); fillNetworkInformation(cmd); cmd.getHostDetails().putAll(getVersionStrings()); cmd.setCluster(getConfiguredProperty("cluster", "1")); diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java index baba89df2f5..edfb0aa7c17 100644 --- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java +++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java @@ -23,7 +23,6 @@ import org.apache.cloudstack.api.InternalIdentity; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.State; -import com.cloud.network.rules.FirewallRule.TrafficType; import com.cloud.utils.net.NetUtils; /** @@ -60,8 +59,8 @@ public class FirewallRuleTO implements InternalIdentity { protected FirewallRuleTO() { } - public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, FirewallRule.Purpose purpose, - List sourceCidr, Integer icmpType, Integer icmpCode) { + public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, + FirewallRule.Purpose purpose, List sourceCidr, Integer icmpType, Integer icmpCode) { this(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, purpose, sourceCidr, icmpType, icmpCode); } @@ -157,7 +156,8 @@ public class FirewallRuleTO implements InternalIdentity { this.trafficType = trafficType; } - public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType, boolean defaultEgressPolicy) { + public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType, + boolean defaultEgressPolicy) { this(rule.getId(), srcVlanTag, srcIp, @@ -213,6 +213,7 @@ public class FirewallRuleTO implements InternalIdentity { return trafficType; } + @Override public long getId() { return id; } diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java index 777e50750ce..aa979e56744 100644 --- a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java +++ b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java @@ -31,8 +31,8 @@ import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmProfile; import com.cloud.network.lb.LoadBalancingRule.LbCondition; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; -import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRule.LbSslCert; +import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.utils.Pair; public class LoadBalancerTO { @@ -83,7 +83,8 @@ public class LoadBalancerTO { } public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, - List arg_destinations, List stickinessPolicies, List healthCheckPolicies, LbSslCert sslCert, String lbProtocol) { + List arg_destinations, List stickinessPolicies, List healthCheckPolicies, LbSslCert sslCert, + String lbProtocol) { this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations); this.stickinessPolicies = null; this.healthCheckPolicies = null; @@ -106,8 +107,9 @@ public class LoadBalancerTO { this.healthCheckPolicies = new HealthCheckPolicyTO[MAX_HEALTHCHECK_POLICIES]; int index = 0; for (LbHealthCheckPolicy hcp : healthCheckPolicies) { - this.healthCheckPolicies[0] = new HealthCheckPolicyTO(hcp.getpingpath(), hcp.getDescription(), hcp.getResponseTime(), hcp.getHealthcheckInterval(), - hcp.getHealthcheckThresshold(), hcp.getUnhealthThresshold(), hcp.isRevoked()); + this.healthCheckPolicies[0] = + new HealthCheckPolicyTO(hcp.getpingpath(), hcp.getDescription(), hcp.getResponseTime(), hcp.getHealthcheckInterval(), hcp.getHealthcheckThresshold(), + hcp.getUnhealthThresshold(), hcp.isRevoked()); index++; if (index == MAX_HEALTHCHECK_POLICIES) break; @@ -215,7 +217,8 @@ public class LoadBalancerTO { private int unhealthThresshold; private boolean revoke = false; - public HealthCheckPolicyTO(String pingPath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, boolean revoke) { + public HealthCheckPolicyTO(String pingPath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, + boolean revoke) { this.description = description; this.pingPath = pingPath; @@ -411,8 +414,9 @@ public class LoadBalancerTO { private final String vmName; private final String networkId; - public AutoScaleVmProfileTO(String zoneId, String domainId, String cloudStackApiUrl, String autoScaleUserApiKey, String autoScaleUserSecretKey, String serviceOfferingId, - String templateId, String vmName, String networkId, String otherDeployParams, List> counterParamList, Integer destroyVmGraceperiod) { + public AutoScaleVmProfileTO(String zoneId, String domainId, String cloudStackApiUrl, String autoScaleUserApiKey, String autoScaleUserSecretKey, + String serviceOfferingId, String templateId, String vmName, String networkId, String otherDeployParams, List> counterParamList, + Integer destroyVmGraceperiod) { this.zoneId = zoneId; this.domainId = domainId; this.serviceOfferingId = serviceOfferingId; @@ -487,8 +491,8 @@ public class LoadBalancerTO { private final String state; private final String currentState; - AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List policies, AutoScaleVmProfileTO profile, String state, - String currentState) { + AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List policies, AutoScaleVmProfileTO profile, + String state, String currentState) { this.uuid = uuid; this.minMembers = minMembers; this.maxMembers = maxMembers; @@ -551,20 +555,21 @@ public class LoadBalancerTO { conditionTOs.add(conditionTO); } AutoScalePolicy autoScalePolicy = lbAutoScalePolicy.getPolicy(); - autoScalePolicyTOs.add(new AutoScalePolicyTO(autoScalePolicy.getId(), autoScalePolicy.getDuration(), autoScalePolicy.getQuietTime(), autoScalePolicy.getAction(), - conditionTOs, lbAutoScalePolicy.isRevoked())); + autoScalePolicyTOs.add(new AutoScalePolicyTO(autoScalePolicy.getId(), autoScalePolicy.getDuration(), autoScalePolicy.getQuietTime(), + autoScalePolicy.getAction(), conditionTOs, lbAutoScalePolicy.isRevoked())); } LbAutoScaleVmProfile lbAutoScaleVmProfile = lbAutoScaleVmGroup.getProfile(); AutoScaleVmProfile autoScaleVmProfile = lbAutoScaleVmProfile.getProfile(); - AutoScaleVmProfileTO autoScaleVmProfileTO = new AutoScaleVmProfileTO(lbAutoScaleVmProfile.getZoneId(), lbAutoScaleVmProfile.getDomainId(), lbAutoScaleVmProfile.getCsUrl(), - lbAutoScaleVmProfile.getAutoScaleUserApiKey(), lbAutoScaleVmProfile.getAutoScaleUserSecretKey(), lbAutoScaleVmProfile.getServiceOfferingId(), - lbAutoScaleVmProfile.getTemplateId(), lbAutoScaleVmProfile.getVmName(), lbAutoScaleVmProfile.getNetworkId(), autoScaleVmProfile.getOtherDeployParams(), - autoScaleVmProfile.getCounterParams(), autoScaleVmProfile.getDestroyVmGraceperiod()); + AutoScaleVmProfileTO autoScaleVmProfileTO = + new AutoScaleVmProfileTO(lbAutoScaleVmProfile.getZoneId(), lbAutoScaleVmProfile.getDomainId(), lbAutoScaleVmProfile.getCsUrl(), + lbAutoScaleVmProfile.getAutoScaleUserApiKey(), lbAutoScaleVmProfile.getAutoScaleUserSecretKey(), lbAutoScaleVmProfile.getServiceOfferingId(), + lbAutoScaleVmProfile.getTemplateId(), lbAutoScaleVmProfile.getVmName(), lbAutoScaleVmProfile.getNetworkId(), autoScaleVmProfile.getOtherDeployParams(), + autoScaleVmProfile.getCounterParams(), autoScaleVmProfile.getDestroyVmGraceperiod()); AutoScaleVmGroup autoScaleVmGroup = lbAutoScaleVmGroup.getVmGroup(); - autoScaleVmGroupTO = new AutoScaleVmGroupTO(autoScaleVmGroup.getUuid(), autoScaleVmGroup.getMinMembers(), autoScaleVmGroup.getMaxMembers(), - autoScaleVmGroup.getMemberPort(), autoScaleVmGroup.getInterval(), autoScalePolicyTOs, autoScaleVmProfileTO, autoScaleVmGroup.getState(), - lbAutoScaleVmGroup.getCurrentState()); + autoScaleVmGroupTO = + new AutoScaleVmGroupTO(autoScaleVmGroup.getUuid(), autoScaleVmGroup.getMinMembers(), autoScaleVmGroup.getMaxMembers(), autoScaleVmGroup.getMemberPort(), + autoScaleVmGroup.getInterval(), autoScalePolicyTOs, autoScaleVmProfileTO, autoScaleVmGroup.getState(), lbAutoScaleVmGroup.getCurrentState()); } } diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/com/cloud/agent/api/to/NetworkACLTO.java index fc7aac4cf60..3d800794da8 100644 --- a/api/src/com/cloud/agent/api/to/NetworkACLTO.java +++ b/api/src/com/cloud/agent/api/to/NetworkACLTO.java @@ -20,10 +20,10 @@ package com.cloud.agent.api.to; import java.util.ArrayList; import java.util.List; -import com.cloud.network.vpc.NetworkACLItem; -import com.cloud.network.vpc.NetworkACLItem.TrafficType; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.network.vpc.NetworkACLItem; +import com.cloud.network.vpc.NetworkACLItem.TrafficType; import com.cloud.utils.net.NetUtils; public class NetworkACLTO implements InternalIdentity { @@ -95,6 +95,7 @@ public class NetworkACLTO implements InternalIdentity { rule.getNumber()); } + @Override public long getId() { return id; } diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java index 1310734a322..76d6d952814 100644 --- a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java +++ b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java @@ -39,8 +39,8 @@ public class PortForwardingRuleTO extends FirewallRuleTO { this.dstPortRange = new int[] {rule.getDestinationPortStart(), rule.getDestinationPortEnd()}; } - public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol, boolean revoked, - boolean alreadyAdded) { + public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol, + boolean revoked, boolean alreadyAdded) { super(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.PortForwarding, null, 0, 0); this.dstIp = dstIp; this.dstPortRange = new int[] {dstPortStart, dstPortEnd}; diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/com/cloud/agent/api/to/S3TO.java index 700d998d428..f64fe351466 100644 --- a/api/src/com/cloud/agent/api/to/S3TO.java +++ b/api/src/com/cloud/agent/api/to/S3TO.java @@ -47,8 +47,9 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO { } - public S3TO(final Long id, final String uuid, final String accessKey, final String secretKey, final String endPoint, final String bucketName, final Boolean httpsFlag, - final Integer connectionTimeout, final Integer maxErrorRetry, final Integer socketTimeout, final Date created, final boolean enableRRS, final long maxUploadSize) { + public S3TO(final Long id, final String uuid, final String accessKey, final String secretKey, final String endPoint, final String bucketName, + final Boolean httpsFlag, final Integer connectionTimeout, final Integer maxErrorRetry, final Integer socketTimeout, final Date created, + final boolean enableRRS, final long maxUploadSize) { super(); @@ -158,6 +159,7 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO { this.id = id; } + @Override public String getUuid() { return this.uuid; } diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/com/cloud/agent/api/to/SwiftTO.java index 5823192da36..3b76dad145b 100644 --- a/api/src/com/cloud/agent/api/to/SwiftTO.java +++ b/api/src/com/cloud/agent/api/to/SwiftTO.java @@ -42,6 +42,7 @@ public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg { return id; } + @Override public String getUrl() { return url; } diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/com/cloud/agent/api/to/TemplateTO.java index 45fa57bf35e..9d22af899e8 100644 --- a/api/src/com/cloud/agent/api/to/TemplateTO.java +++ b/api/src/com/cloud/agent/api/to/TemplateTO.java @@ -35,6 +35,7 @@ public class TemplateTO implements InternalIdentity { this.format = template.getFormat(); } + @Override public long getId() { return id; } diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java index 4b5b35ccda3..bed3e1d6aaf 100644 --- a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java +++ b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java @@ -61,8 +61,8 @@ public class VirtualMachineTO { DiskTO[] disks; NicTO[] nics; - public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os, - boolean enableHA, boolean limitCpuUse, String vncPassword) { + public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, + String os, boolean enableHA, boolean limitCpuUse, String vncPassword) { this.id = id; this.name = instanceName; this.type = type; diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java index b2df4391fe1..c9bb2f9fd1a 100644 --- a/api/src/com/cloud/agent/api/to/VolumeTO.java +++ b/api/src/com/cloud/agent/api/to/VolumeTO.java @@ -92,6 +92,7 @@ public class VolumeTO implements InternalIdentity { this.deviceId = id; } + @Override public long getId() { return id; } diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index 32f224715fd..50474de7077 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -18,8 +18,6 @@ package com.cloud.configuration; import java.util.List; -import javax.naming.NamingException; - import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; diff --git a/api/src/com/cloud/dc/DedicatedResources.java b/api/src/com/cloud/dc/DedicatedResources.java index ed351fd460d..63188ca0b0e 100755 --- a/api/src/com/cloud/dc/DedicatedResources.java +++ b/api/src/com/cloud/dc/DedicatedResources.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; public interface DedicatedResources extends InfrastructureEntity, InternalIdentity, Identity { + @Override long getId(); Long getDataCenterId(); @@ -35,6 +36,7 @@ public interface DedicatedResources extends InfrastructureEntity, InternalIdenti Long getAccountId(); + @Override String getUuid(); long getAffinityGroupId(); diff --git a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java index a9fdb79d5e1..6c09a6d5106 100644 --- a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java +++ b/api/src/com/cloud/deploy/DeploymentClusterPlanner.java @@ -18,9 +18,10 @@ package com.cloud.deploy; import java.util.List; +import org.apache.cloudstack.framework.config.ConfigKey; + import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.vm.VirtualMachineProfile; -import org.apache.cloudstack.framework.config.ConfigKey; /** */ @@ -29,20 +30,22 @@ public interface DeploymentClusterPlanner extends DeploymentPlanner { static final String ClusterCPUCapacityDisableThresholdCK = "cluster.cpu.allocated.capacity.disablethreshold"; static final String ClusterMemoryCapacityDisableThresholdCK = "cluster.memory.allocated.capacity.disablethreshold"; - static final ConfigKey ClusterCPUCapacityDisableThreshold = new ConfigKey( - Float.class, - ClusterCPUCapacityDisableThresholdCK, - "Alert", - "0.85", - "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.", - true, ConfigKey.Scope.Cluster, null); - static final ConfigKey ClusterMemoryCapacityDisableThreshold = new ConfigKey( - Float.class, - ClusterMemoryCapacityDisableThresholdCK, - "Alert", - "0.85", - "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.", - true, ConfigKey.Scope.Cluster, null); + static final ConfigKey ClusterCPUCapacityDisableThreshold = + new ConfigKey( + Float.class, + ClusterCPUCapacityDisableThresholdCK, + "Alert", + "0.85", + "Percentage (as a value between 0 and 1) of cpu utilization above which allocators will disable using the cluster for low cpu available. Keep the corresponding notification threshold lower than this to be notified beforehand.", + true, ConfigKey.Scope.Cluster, null); + static final ConfigKey ClusterMemoryCapacityDisableThreshold = + new ConfigKey( + Float.class, + ClusterMemoryCapacityDisableThresholdCK, + "Alert", + "0.85", + "Percentage (as a value between 0 and 1) of memory utilization above which allocators will disable using the cluster for low memory available. Keep the corresponding notification threshold lower than this to be notified beforehand.", + true, ConfigKey.Scope.Cluster, null); /** * This is called to determine list of possible clusters where a virtual diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/com/cloud/domain/Domain.java index 612ecd69046..c4755d79c96 100644 --- a/api/src/com/cloud/domain/Domain.java +++ b/api/src/com/cloud/domain/Domain.java @@ -60,6 +60,7 @@ public interface Domain extends OwnedBy, Identity, InternalIdentity { String getNetworkDomain(); + @Override public String getUuid(); } diff --git a/api/src/com/cloud/event/ActionEvents.java b/api/src/com/cloud/event/ActionEvents.java index db535b67e07..24cc0950b5b 100644 --- a/api/src/com/cloud/event/ActionEvents.java +++ b/api/src/com/cloud/event/ActionEvents.java @@ -18,8 +18,9 @@ */ package com.cloud.event; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/api/src/com/cloud/event/UsageEvent.java b/api/src/com/cloud/event/UsageEvent.java index 9e0952ccf0a..3921e704aa9 100644 --- a/api/src/com/cloud/event/UsageEvent.java +++ b/api/src/com/cloud/event/UsageEvent.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.event; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; +import org.apache.cloudstack.api.InternalIdentity; + public interface UsageEvent extends InternalIdentity { String getType(); diff --git a/api/src/com/cloud/exception/AgentControlChannelException.java b/api/src/com/cloud/exception/AgentControlChannelException.java index ea3cafb32f3..65e82040c92 100644 --- a/api/src/com/cloud/exception/AgentControlChannelException.java +++ b/api/src/com/cloud/exception/AgentControlChannelException.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.exception; -import com.cloud.exception.CloudException; - public class AgentControlChannelException extends CloudException { private static final long serialVersionUID = -310647782960500466L; diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java index 3f32b683ee4..9d811255e14 100755 --- a/api/src/com/cloud/host/Host.java +++ b/api/src/com/cloud/host/Host.java @@ -30,23 +30,10 @@ import com.cloud.utils.fsm.StateObject; */ public interface Host extends StateObject, Identity, InternalIdentity { public enum Type { - Storage(false), - Routing(false), - SecondaryStorage(false), - SecondaryStorageCmdExecutor(false), - ConsoleProxy(true), - ExternalFirewall(false), - ExternalLoadBalancer(false), - ExternalVirtualSwitchSupervisor(false), - PxeServer(false), - BaremetalPxe(false), - BaremetalDhcp(false), - TrafficMonitor(false), + Storage(false), Routing(false), SecondaryStorage(false), SecondaryStorageCmdExecutor(false), ConsoleProxy(true), ExternalFirewall(false), ExternalLoadBalancer( + false), ExternalVirtualSwitchSupervisor(false), PxeServer(false), BaremetalPxe(false), BaremetalDhcp(false), TrafficMonitor(false), - ExternalDhcp(false), - SecondaryStorageVM(true), - LocalSecondaryStorage(false), - L2Networking(false); + ExternalDhcp(false), SecondaryStorageVM(true), LocalSecondaryStorage(false), L2Networking(false); boolean _virtual; private Type(boolean virtual) { diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java index fd136c9be50..2a8bf9ea96e 100755 --- a/api/src/com/cloud/host/Status.java +++ b/api/src/com/cloud/host/Status.java @@ -23,10 +23,15 @@ import com.cloud.utils.fsm.NoTransitionException; import com.cloud.utils.fsm.StateMachine2; public enum Status { - Creating(true, false, false), Connecting(true, false, false), Up(true, false, false), Down(true, true, true), Disconnected(true, true, true), Alert(true, true, true), Removed( - true, - false, - true), Error(true, false, true), Rebalancing(true, false, true); + Creating(true, false, false), + Connecting(true, false, false), + Up(true, false, false), + Down(true, true, true), + Disconnected(true, true, true), + Alert(true, true, true), + Removed(true, false, true), + Error(true, false, true), + Rebalancing(true, false, true); private final boolean updateManagementServer; private final boolean checkManagementServer; diff --git a/api/src/com/cloud/network/GuestVlan.java b/api/src/com/cloud/network/GuestVlan.java index a5173d87830..4597192ef60 100644 --- a/api/src/com/cloud/network/GuestVlan.java +++ b/api/src/com/cloud/network/GuestVlan.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity; public interface GuestVlan extends InternalIdentity, Identity { + @Override public long getId(); public long getAccountId(); diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/com/cloud/network/MonitoringService.java index 2024204e699..63f2ec10425 100644 --- a/api/src/com/cloud/network/MonitoringService.java +++ b/api/src/com/cloud/network/MonitoringService.java @@ -32,6 +32,7 @@ public interface MonitoringService extends ControlledEntity, Identity, InternalI Dhcp, LoadBalancing, Ssh, Webserver, } + @Override long getId(); String getService(); diff --git a/api/src/com/cloud/network/NetworkMigrationResponder.java b/api/src/com/cloud/network/NetworkMigrationResponder.java index 2a99036c050..659b7df29c2 100644 --- a/api/src/com/cloud/network/NetworkMigrationResponder.java +++ b/api/src/com/cloud/network/NetworkMigrationResponder.java @@ -19,7 +19,6 @@ package com.cloud.network; import com.cloud.deploy.DeployDestination; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java index ceb9f417d49..57e95c947cd 100755 --- a/api/src/com/cloud/network/NetworkService.java +++ b/api/src/com/cloud/network/NetworkService.java @@ -32,7 +32,6 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.GuestVlan; import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.offering.NetworkOffering; @@ -51,12 +50,13 @@ public interface NetworkService { List getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner); - IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException; + IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, + ConcurrentOperationException; boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException; - IpAddress allocatePortableIP(Account ipOwner, int regionId, Long zoneId, Long networkId, Long vpcId) throws ResourceAllocationException, InsufficientAddressCapacityException, - ConcurrentOperationException; + IpAddress allocatePortableIP(Account ipOwner, int regionId, Long zoneId, Long networkId, Long vpcId) throws ResourceAllocationException, + InsufficientAddressCapacityException, ConcurrentOperationException; boolean releasePortableIpAddress(long ipAddressId); @@ -90,9 +90,11 @@ public interface NetworkService { List listNetworkServices(String providerName); - PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, List enabledServices); + PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, + List enabledServices); - Pair, Integer> listNetworkServiceProviders(Long physicalNetworkId, String name, String state, Long startIndex, Long pageSize); + Pair, Integer> listNetworkServiceProviders(Long physicalNetworkId, String name, String state, Long startIndex, + Long pageSize); PhysicalNetworkServiceProvider updateNetworkServiceProvider(Long id, String state, List enabledServices); @@ -161,8 +163,9 @@ public interface NetworkService { * @throws ConcurrentOperationException * @throws ResourceAllocationException */ - Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String broadcastUri, String startIp, String endIP, String gateway, String netmask, - long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException; + Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String broadcastUri, String startIp, String endIP, String gateway, + String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, + InsufficientCapacityException; /* Requests an IP address for the guest nic */ NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, Long networkId, String ipaddress) throws InsufficientAddressCapacityException; diff --git a/api/src/com/cloud/network/NetworkUsageService.java b/api/src/com/cloud/network/NetworkUsageService.java index 1cfea24d05a..71a2f49b75f 100644 --- a/api/src/com/cloud/network/NetworkUsageService.java +++ b/api/src/com/cloud/network/NetworkUsageService.java @@ -18,12 +18,11 @@ package com.cloud.network; import java.util.List; -import com.cloud.host.Host; - import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd; import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd; import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd; -import org.apache.cloudstack.api.response.TrafficMonitorResponse; + +import com.cloud.host.Host; import com.cloud.utils.component.Manager; public interface NetworkUsageService extends Manager { diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java index 08b28ae2b80..cfa236d3898 100644 --- a/api/src/com/cloud/network/PhysicalNetwork.java +++ b/api/src/com/cloud/network/PhysicalNetwork.java @@ -18,10 +18,11 @@ package com.cloud.network; import java.util.List; -import com.cloud.utils.Pair; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.Pair; + /** * */ diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java index bbf137cdba6..d3c8193242e 100644 --- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java +++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java @@ -31,6 +31,7 @@ public interface PhysicalNetworkServiceProvider extends InternalIdentity { Disabled, Enabled, Shutdown; } + @Override long getId(); State getState(); diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java index bb09f707c6b..ad1a9825c01 100644 --- a/api/src/com/cloud/network/Site2SiteVpnConnection.java +++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java @@ -26,6 +26,7 @@ public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdenti Pending, Connected, Disconnected, Error, } + @Override public long getId(); public String getUuid(); diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java index ec8dba7d194..96162f31949 100644 --- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java +++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java @@ -16,16 +16,16 @@ // under the License. package com.cloud.network; +import java.util.List; + import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; -import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; - -import java.util.List; public interface VirtualNetworkApplianceService { /** diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java index 7f94f355921..434220a4c8d 100644 --- a/api/src/com/cloud/network/as/AutoScalePolicy.java +++ b/api/src/com/cloud/network/as/AutoScalePolicy.java @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.InternalIdentity; public interface AutoScalePolicy extends ControlledEntity, InternalIdentity { + @Override long getId(); String getUuid(); diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java index cc0a3dac673..3e07fe44fb0 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java +++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java @@ -27,6 +27,7 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity { String State_Enabled = "enabled"; String State_Disabled = "disabled"; + @Override long getId(); @Override diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java index 9c6a0f2f45a..0577080a316 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java +++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java @@ -29,6 +29,7 @@ import com.cloud.utils.Pair; */ public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity { + @Override public long getId(); public String getUuid(); diff --git a/api/src/com/cloud/network/element/DhcpServiceProvider.java b/api/src/com/cloud/network/element/DhcpServiceProvider.java index 2b919683336..2bd6ebcba35 100644 --- a/api/src/com/cloud/network/element/DhcpServiceProvider.java +++ b/api/src/com/cloud/network/element/DhcpServiceProvider.java @@ -23,12 +23,11 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; public interface DhcpServiceProvider extends NetworkElement { - boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException; + boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException; boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException; diff --git a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java index ed1f496e017..8c3243c99f4 100644 --- a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java +++ b/api/src/com/cloud/network/element/NetworkACLServiceProvider.java @@ -20,7 +20,6 @@ import java.util.List; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; -import com.cloud.network.rules.FirewallRule; import com.cloud.network.vpc.NetworkACLItem; public interface NetworkACLServiceProvider extends NetworkElement { diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java index 5d4bda62813..dda3a146996 100644 --- a/api/src/com/cloud/network/element/NetworkElement.java +++ b/api/src/com/cloud/network/element/NetworkElement.java @@ -33,7 +33,6 @@ import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.Adapter; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** @@ -84,7 +83,8 @@ public interface NetworkElement extends Adapter { * @throws ConcurrentOperationException * @throws ResourceUnavailableException */ - boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException; + boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException; /** * The network is being shutdown. @@ -121,7 +121,8 @@ public interface NetworkElement extends Adapter { * @throws ConcurrentOperationException * @throws ResourceUnavailableException */ - boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException; + boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException; /** * This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false. diff --git a/api/src/com/cloud/network/element/UserDataServiceProvider.java b/api/src/com/cloud/network/element/UserDataServiceProvider.java index eb80ede002f..ad485a5b7ab 100644 --- a/api/src/com/cloud/network/element/UserDataServiceProvider.java +++ b/api/src/com/cloud/network/element/UserDataServiceProvider.java @@ -23,7 +23,6 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; public interface UserDataServiceProvider extends NetworkElement { diff --git a/api/src/com/cloud/network/guru/NetworkGuru.java b/api/src/com/cloud/network/guru/NetworkGuru.java index 01e3995b2a5..6c39285051a 100755 --- a/api/src/com/cloud/network/guru/NetworkGuru.java +++ b/api/src/com/cloud/network/guru/NetworkGuru.java @@ -108,7 +108,8 @@ public interface NetworkGuru extends Adapter { * environment. At this time, the admin generally must be involved to * allocate more resources before any more guest network can be implemented. */ - Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context) throws InsufficientVirtualNetworkCapcityException; + Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException; /** * Once a guest network has been designed, virtual machines can be @@ -126,8 +127,8 @@ public interface NetworkGuru extends Adapter { * @throws InsufficientAddressCapacityException if there are not addresses * to be assigned. */ - NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, - ConcurrentOperationException; + NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException; /** * Once a guest network is implemented, then the virtual machine must @@ -147,8 +148,8 @@ public interface NetworkGuru extends Adapter { * @throws ConcurrentOperationException if there are multiple operations * happening on this guest network or vm. */ - void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException, - InsufficientAddressCapacityException, ConcurrentOperationException; + void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException; /** * When a virtual machine is stopped, the NetworkGuru is informed via the diff --git a/api/src/com/cloud/network/lb/CertService.java b/api/src/com/cloud/network/lb/CertService.java index 5342a7e3de5..e9219e07878 100644 --- a/api/src/com/cloud/network/lb/CertService.java +++ b/api/src/com/cloud/network/lb/CertService.java @@ -16,13 +16,13 @@ // under the License. package com.cloud.network.lb; +import java.util.List; + import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd; import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; import org.apache.cloudstack.api.response.SslCertResponse; -import java.util.List; - public interface CertService { public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd); diff --git a/api/src/com/cloud/network/lb/LoadBalancingRule.java b/api/src/com/cloud/network/lb/LoadBalancingRule.java index b9d0cc2a1ce..4b2f9c4237b 100644 --- a/api/src/com/cloud/network/lb/LoadBalancingRule.java +++ b/api/src/com/cloud/network/lb/LoadBalancingRule.java @@ -39,8 +39,8 @@ public class LoadBalancingRule { private LbSslCert sslCert; private String lbProtocol; - public LoadBalancingRule(LoadBalancer lb, List destinations, List stickinessPolicies, List healthCheckPolicies, - Ip sourceIp) { + public LoadBalancingRule(LoadBalancer lb, List destinations, List stickinessPolicies, + List healthCheckPolicies, Ip sourceIp) { this.lb = lb; this.destinations = destinations; this.stickinessPolicies = stickinessPolicies; @@ -48,8 +48,8 @@ public class LoadBalancingRule { this.sourceIp = sourceIp; } - public LoadBalancingRule(LoadBalancer lb, List destinations, List stickinessPolicies, List healthCheckPolicies, - Ip sourceIp, LbSslCert sslCert, String lbProtocol) { + public LoadBalancingRule(LoadBalancer lb, List destinations, List stickinessPolicies, + List healthCheckPolicies, Ip sourceIp, LbSslCert sslCert, String lbProtocol) { this.lb = lb; this.destinations = destinations; this.stickinessPolicies = stickinessPolicies; @@ -196,7 +196,8 @@ public class LoadBalancingRule { this(pingpath, description, responseTime, healthcheckInterval, healthcheckThresshold, unhealthThresshold, false); } - public LbHealthCheckPolicy(String pingpath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, boolean revoke) { + public LbHealthCheckPolicy(String pingpath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, + boolean revoke) { this.pingpath = pingpath; this.description = description; this.responseTime = responseTime; diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java index a48d79a5c5f..e62b45cbb1c 100644 --- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java +++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java @@ -49,8 +49,8 @@ public interface LoadBalancingRulesService { * @return the newly created LoadBalancerVO if successful, null otherwise * @throws InsufficientAddressCapacityException */ - LoadBalancer createPublicLoadBalancerRule(String xId, String name, String description, int srcPortStart, int srcPortEnd, int defPortStart, int defPortEnd, Long ipAddrId, - String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol) throws NetworkRuleConflictException, + LoadBalancer createPublicLoadBalancerRule(String xId, String name, String description, int srcPortStart, int srcPortEnd, int defPortStart, int defPortEnd, + Long ipAddrId, String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol) throws NetworkRuleConflictException, InsufficientAddressCapacityException; LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd); diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/com/cloud/network/rules/HealthCheckPolicy.java index 96bb28204a2..6157bd40203 100644 --- a/api/src/com/cloud/network/rules/HealthCheckPolicy.java +++ b/api/src/com/cloud/network/rules/HealthCheckPolicy.java @@ -16,9 +16,6 @@ // under the License. package com.cloud.network.rules; -import java.util.List; - -import com.cloud.utils.Pair; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/com/cloud/network/rules/RulesService.java index d073672feac..39329d5e734 100644 --- a/api/src/com/cloud/network/rules/RulesService.java +++ b/api/src/com/cloud/network/rules/RulesService.java @@ -28,8 +28,8 @@ import com.cloud.utils.Pair; import com.cloud.utils.net.Ip; public interface RulesService { - Pair, Integer> searchStaticNatRules(Long ipId, Long id, Long vmId, Long start, Long size, String accountName, Long domainId, Long projectId, - boolean isRecursive, boolean listAll); + Pair, Integer> searchStaticNatRules(Long ipId, Long id, Long vmId, Long start, Long size, String accountName, Long domainId, + Long projectId, boolean isRecursive, boolean listAll); /** * Creates a port forwarding rule between two ip addresses or between diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java index 746cba18b30..1ee504fb9a4 100644 --- a/api/src/com/cloud/network/security/SecurityGroupService.java +++ b/api/src/com/cloud/network/security/SecurityGroupService.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupC import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd; -import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java index bd73685c06b..a97c57d6ff0 100644 --- a/api/src/com/cloud/network/vpc/NetworkACL.java +++ b/api/src/com/cloud/network/vpc/NetworkACL.java @@ -17,7 +17,6 @@ package com.cloud.network.vpc; -import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.InternalIdentity; public interface NetworkACL extends InternalIdentity { @@ -30,6 +29,7 @@ public interface NetworkACL extends InternalIdentity { Long getVpcId(); + @Override long getId(); String getName(); diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/com/cloud/network/vpc/NetworkACLItem.java index 78d99571550..d8dd0fb79d1 100644 --- a/api/src/com/cloud/network/vpc/NetworkACLItem.java +++ b/api/src/com/cloud/network/vpc/NetworkACLItem.java @@ -16,12 +16,10 @@ // under the License. package com.cloud.network.vpc; -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.List; +import org.apache.cloudstack.api.InternalIdentity; + public interface NetworkACLItem extends InternalIdentity { String getUuid(); diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/com/cloud/network/vpc/NetworkACLService.java index c9830af21eb..56a21804ea5 100644 --- a/api/src/com/cloud/network/vpc/NetworkACLService.java +++ b/api/src/com/cloud/network/vpc/NetworkACLService.java @@ -16,12 +16,13 @@ // under the License. package com.cloud.network.vpc; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.utils.Pair; +import java.util.List; + import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; -import java.util.List; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.utils.Pair; public interface NetworkACLService { /** diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/com/cloud/network/vpc/VpcProvisioningService.java index 8ab13cc7cf6..174b71f34a2 100644 --- a/api/src/com/cloud/network/vpc/VpcProvisioningService.java +++ b/api/src/com/cloud/network/vpc/VpcProvisioningService.java @@ -23,10 +23,11 @@ public interface VpcProvisioningService { public VpcOffering getVpcOffering(long vpcOfferingId); - public VpcOffering createVpcOffering(String name, String displayText, List supportedServices, Map> serviceProviders, Long serviceOfferingId); + public VpcOffering createVpcOffering(String name, String displayText, List supportedServices, Map> serviceProviders, + Long serviceOfferingId); - List listVpcOfferings(Long id, String name, String displayText, List supportedServicesStr, Boolean isDefault, String keyword, String state, - Long startIndex, Long pageSizeVal); + List listVpcOfferings(Long id, String name, String displayText, List supportedServicesStr, Boolean isDefault, String keyword, + String state, Long startIndex, Long pageSizeVal); /** * @param offId diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java index 8223ae612d5..e28f3515271 100644 --- a/api/src/com/cloud/network/vpc/VpcService.java +++ b/api/src/com/cloud/network/vpc/VpcService.java @@ -46,7 +46,8 @@ public interface VpcService { * @return * @throws ResourceAllocationException TODO */ - public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) throws ResourceAllocationException; + public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) + throws ResourceAllocationException; /** * Deletes a VPC diff --git a/api/src/com/cloud/projects/Project.java b/api/src/com/cloud/projects/Project.java index 9240930c2bf..5fff3082c36 100644 --- a/api/src/com/cloud/projects/Project.java +++ b/api/src/com/cloud/projects/Project.java @@ -34,8 +34,10 @@ public interface Project extends PartOf, Identity, InternalIdentity { String getDisplayText(); + @Override long getDomainId(); + @Override long getId(); Date getCreated(); diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java index 5e7e8cde48d..946c2f93b32 100644 --- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java +++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java @@ -75,6 +75,7 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity, Cont public int getRegion(); + @Override public long getAccountId(); public State getState(); diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java index 708249a1941..ab6e6fb6c5a 100644 --- a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java +++ b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java @@ -17,11 +17,17 @@ package com.cloud.region.ha; -import com.cloud.network.rules.LoadBalancer; -import org.apache.cloudstack.api.command.user.region.ha.gslb.*; - import java.util.List; +import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.ListGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.RemoveFromGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.UpdateGlobalLoadBalancerRuleCmd; + +import com.cloud.network.rules.LoadBalancer; + public interface GlobalLoadBalancingRulesService { /* diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/com/cloud/resource/ResourceState.java index 6400251b561..5d2c962f989 100755 --- a/api/src/com/cloud/resource/ResourceState.java +++ b/api/src/com/cloud/resource/ResourceState.java @@ -25,9 +25,16 @@ public enum ResourceState { Creating, Enabled, Disabled, PrepareForMaintenance, ErrorInMaintenance, Maintenance, Error; public enum Event { - InternalCreated("Resource is created"), Enable("Admin enables"), Disable("Admin disables"), AdminAskMaintenace("Admin asks to enter maintenance"), AdminCancelMaintenance( - "Admin asks to cancel maintenance"), InternalEnterMaintenance("Resource enters maintenance"), UpdatePassword("Admin updates password of host"), UnableToMigrate( - "Management server migrates VM failed"), Error("An internal error happened"), DeleteHost("Admin delete a host"), + InternalCreated("Resource is created"), + Enable("Admin enables"), + Disable("Admin disables"), + AdminAskMaintenace("Admin asks to enter maintenance"), + AdminCancelMaintenance("Admin asks to cancel maintenance"), + InternalEnterMaintenance("Resource enters maintenance"), + UpdatePassword("Admin updates password of host"), + UnableToMigrate("Management server migrates VM failed"), + Error("An internal error happened"), + DeleteHost("Admin delete a host"), /* * Below events don't cause resource state to change, they are merely diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/com/cloud/resource/UnableDeleteHostException.java index bb372d64a43..8466dd45d12 100755 --- a/api/src/com/cloud/resource/UnableDeleteHostException.java +++ b/api/src/com/cloud/resource/UnableDeleteHostException.java @@ -16,8 +16,8 @@ // under the License. package com.cloud.resource; -import com.cloud.utils.SerialVersionUID; import com.cloud.exception.CloudException; +import com.cloud.utils.SerialVersionUID; public class UnableDeleteHostException extends CloudException { private static final long serialVersionUID = SerialVersionUID.UnableDeleteHostException; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 65bc58b46a2..ce62326139b 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -349,7 +349,8 @@ public interface ManagementService { String[] listEventTypes(); - Pair, Integer> listHypervisorCapabilities(Long id, HypervisorType hypervisorType, String keyword, Long startIndex, Long pageSizeVal); + Pair, Integer> listHypervisorCapabilities(Long id, HypervisorType hypervisorType, String keyword, Long startIndex, + Long pageSizeVal); HypervisorCapabilities updateHypervisorCapabilities(Long id, Long maxGuestsLimit, Boolean securityGroupEnabled); diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java index 23c34329622..000808d9f36 100644 --- a/api/src/com/cloud/server/ResourceTag.java +++ b/api/src/com/cloud/server/ResourceTag.java @@ -24,27 +24,13 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit //FIXME - extract enum to another interface as its used both by resourceTags and resourceMetaData code public enum ResourceObjectType { - UserVm(true, true), - Template(true, true), - ISO(true, false), - Volume(true, true), - Snapshot(true, false), - Network(true, true), - Nic(false, true), - LoadBalancer(true, true), - PortForwardingRule(true, true), - FirewallRule(true, true), - SecurityGroup(true, false), - PublicIpAddress(true, true), - Project(true, false), - Vpc(true, false), - NetworkACL(true, false), - StaticRoute(true, false), - VMSnapshot(true, false), - RemoteAccessVpn(true, true), - Zone(false, true), - ServiceOffering(false, true), - Storage(false, true); + UserVm(true, true), Template(true, true), ISO(true, false), Volume(true, true), Snapshot(true, false), Network(true, true), Nic(false, true), LoadBalancer( + true, + true), PortForwardingRule(true, true), FirewallRule(true, true), SecurityGroup(true, false), PublicIpAddress(true, true), Project(true, false), Vpc( + true, + false), NetworkACL(true, false), StaticRoute(true, false), VMSnapshot(true, false), RemoteAccessVpn(true, true), Zone(false, true), ServiceOffering( + false, + true), Storage(false, true); ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) { this.resourceTagsSupport = resourceTagsSupport; diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java index f175ac0a1a1..7f0168efd8e 100644 --- a/api/src/com/cloud/storage/Snapshot.java +++ b/api/src/com/cloud/storage/Snapshot.java @@ -53,6 +53,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, //it's a state, user can't see the snapshot from ui, while the snapshot may still exist on the storage Error; + @Override public String toString() { return this.name(); } @@ -68,6 +69,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, public static final long MANUAL_POLICY_ID = 0L; + @Override long getAccountId(); long getVolumeId(); @@ -78,6 +80,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, Type getRecurringType(); + @Override State getState(); HypervisorType getHypervisorType(); diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java index f0e9931aedb..f1868a7a1b3 100755 --- a/api/src/com/cloud/storage/Storage.java +++ b/api/src/com/cloud/storage/Storage.java @@ -21,11 +21,14 @@ import java.util.List; public class Storage { public static enum ImageFormat { - QCOW2(true, true, false, "qcow2"), RAW(false, false, false, "raw"), VHD(true, true, true, "vhd"), ISO(false, false, false, "iso"), OVA(true, true, true, "ova"), VHDX( - true, - true, - true, - "vhdx"), BAREMETAL(false, false, false, "BAREMETAL"), TAR(false, false, false, "tar"); + QCOW2(true, true, false, "qcow2"), + RAW(false, false, false, "raw"), + VHD(true, true, true, "vhd"), + ISO(false, false, false, "iso"), + OVA(true, true, true, "ova"), + VHDX(true, true, true, "vhdx"), + BAREMETAL(false, false, false, "BAREMETAL"), + TAR(false, false, false, "tar"); private final boolean thinProvisioned; private final boolean supportSparse; diff --git a/api/src/com/cloud/storage/StoragePoolDiscoverer.java b/api/src/com/cloud/storage/StoragePoolDiscoverer.java index 40a925dc73e..88b165dd8ba 100644 --- a/api/src/com/cloud/storage/StoragePoolDiscoverer.java +++ b/api/src/com/cloud/storage/StoragePoolDiscoverer.java @@ -29,5 +29,6 @@ public interface StoragePoolDiscoverer extends Adapter { Map> find(long dcId, Long podId, URI uri, Map details) throws DiscoveryException; - Map> find(long dcId, Long podId, URI uri, Map details, String username, String password) throws DiscoveryException; + Map> find(long dcId, Long podId, URI uri, Map details, String username, String password) + throws DiscoveryException; } diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java index 5344b3618a7..bb5ee08b512 100755 --- a/api/src/com/cloud/storage/Volume.java +++ b/api/src/com/cloud/storage/Volume.java @@ -154,6 +154,7 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba Long getPoolId(); + @Override State getState(); Date getAttached(); diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/com/cloud/storage/VolumeApiService.java index 8274b150412..47afa104b4d 100644 --- a/api/src/com/cloud/storage/VolumeApiService.java +++ b/api/src/com/cloud/storage/VolumeApiService.java @@ -20,8 +20,13 @@ package com.cloud.storage; import java.net.URISyntaxException; -import com.cloud.exception.StorageUnavailableException; -import org.apache.cloudstack.api.command.user.volume.*; +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InternalErrorException; diff --git a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java index 6f3d2ce5468..db6087a9c45 100644 --- a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java +++ b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java @@ -16,11 +16,11 @@ // under the License. package com.cloud.storage.snapshot; +import java.util.Date; + import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; -import java.util.Date; - public interface SnapshotSchedule extends InternalIdentity, Identity { Long getVolumeId(); diff --git a/api/src/com/cloud/user/Account.java b/api/src/com/cloud/user/Account.java index 9b46eae70af..99ef954feac 100755 --- a/api/src/com/cloud/user/Account.java +++ b/api/src/com/cloud/user/Account.java @@ -56,6 +56,7 @@ public interface Account extends ControlledEntity, InternalIdentity, Identity { public Long getDefaultZoneId(); + @Override public String getUuid(); boolean isDefault(); diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java index ddd27fddf10..a9be2922edf 100755 --- a/api/src/com/cloud/user/AccountService.java +++ b/api/src/com/cloud/user/AccountService.java @@ -54,8 +54,8 @@ public interface AccountService { * * @return the user if created successfully, null otherwise */ - UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType, - Long domainId, String networkDomain, Map details, String accountUUID, String userUUID); + UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, + short accountType, Long domainId, String networkDomain, Map details, String accountUUID, String userUUID); /** * Locks a user by userId. A locked user cannot access the API, but will still have running VMs/IP addresses @@ -70,7 +70,8 @@ public interface AccountService { User getSystemUser(); - User createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID); + User + createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID); boolean isAdmin(short accountType); diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java index 48f936cf836..36e90284118 100644 --- a/api/src/com/cloud/user/User.java +++ b/api/src/com/cloud/user/User.java @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.InternalIdentity; public interface User extends OwnedBy, InternalIdentity { public static final long UID_SYSTEM = 1; + @Override public long getId(); public String getUuid(); diff --git a/api/src/com/cloud/user/UserAccount.java b/api/src/com/cloud/user/UserAccount.java index 0cb0f697a5c..c5a0637cca7 100644 --- a/api/src/com/cloud/user/UserAccount.java +++ b/api/src/com/cloud/user/UserAccount.java @@ -21,6 +21,7 @@ import java.util.Date; import org.apache.cloudstack.api.InternalIdentity; public interface UserAccount extends InternalIdentity { + @Override long getId(); String getUsername(); diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java index f72142ce850..2f7cd96684b 100644 --- a/api/src/com/cloud/vm/DiskProfile.java +++ b/api/src/com/cloud/vm/DiskProfile.java @@ -45,7 +45,8 @@ public class DiskProfile { protected DiskProfile() { } - public DiskProfile(long volumeId, Volume.Type type, String name, long diskOfferingId, long size, String[] tags, boolean useLocalStorage, boolean recreatable, Long templateId) { + public DiskProfile(long volumeId, Volume.Type type, String name, long diskOfferingId, long size, String[] tags, boolean useLocalStorage, boolean recreatable, + Long templateId) { this.type = type; this.name = name; this.size = size; diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java index c2122265e7c..d7431ba31e0 100644 --- a/api/src/com/cloud/vm/NicIpAlias.java +++ b/api/src/com/cloud/vm/NicIpAlias.java @@ -31,6 +31,7 @@ public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity active, revoked, } + @Override long getId(); long getNicId(); diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/com/cloud/vm/NicProfile.java index 30d9b1d3565..ab18ca094f9 100644 --- a/api/src/com/cloud/vm/NicProfile.java +++ b/api/src/com/cloud/vm/NicProfile.java @@ -162,6 +162,7 @@ public class NicProfile implements InternalIdentity { return vmId; } + @Override public long getId() { return id; } diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/com/cloud/vm/NicSecondaryIp.java index 02937f46911..fb90dd351f6 100644 --- a/api/src/com/cloud/vm/NicSecondaryIp.java +++ b/api/src/com/cloud/vm/NicSecondaryIp.java @@ -27,6 +27,7 @@ public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIden /** * @return id in the CloudStack database */ + @Override long getId(); long getNicId(); diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 3aac6c3c69f..444c47ab96c 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -40,6 +40,7 @@ import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; + import com.cloud.dc.DataCenter; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -202,11 +203,11 @@ public interface UserVmService { * available. * @throws InsufficientResourcesException */ - UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, Account owner, - String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard, List affinityGroupIdList, Integer cpuSpeed, - Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, - StorageUnavailableException, ResourceAllocationException; + UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, + Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, + String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard, + List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** * Creates a User VM in Advanced Zone (Security Group feature is enabled) in @@ -284,8 +285,8 @@ public interface UserVmService { UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, - List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; + List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdisksize) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** * Creates a User VM in Advanced Zone (Security Group feature is disabled) @@ -359,10 +360,10 @@ public interface UserVmService { */ UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List affinityGroupIdList, Integer cpuSpeed, - Integer memory, Integer cpuNumber, Long rootdkisksize) + String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List affinityGroupIdList, + Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootdkisksize) - throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; + throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** * Starts the virtual machine created from createVirtualMachine. @@ -407,8 +408,8 @@ public interface UserVmService { HypervisorType getHypervisorTypeOfUserVM(long vmid); - UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException, - ResourceAllocationException; + UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, + StorageUnavailableException, ResourceAllocationException; UserVm getUserVm(long vmId); @@ -464,13 +465,15 @@ public interface UserVmService { VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; - UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; + UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException; VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool); UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException; - UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; + UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, + VirtualMachineMigrationException; UserVm expungeVm(ExpungeVMCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException; diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java index ad133993973..f12aebcbbf6 100755 --- a/api/src/com/cloud/vm/VirtualMachine.java +++ b/api/src/com/cloud/vm/VirtualMachine.java @@ -38,15 +38,16 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I } public enum State { - Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."), Running( - false, - "VM is running. host id has the host that it is running on."), Stopping(true, "VM is being stopped. host id has the host that it is being stopped on."), Stopped( - false, - "VM is stopped. host id should be null."), Destroyed(false, "VM is marked for destroy."), Expunging(true, "VM is being expunged."), Migrating( - true, - "VM is being migrated. host id holds to from host"), Error(false, "VM is in error"), Unknown(false, "VM state is unknown."), Shutdowned( - false, - "VM is shutdowned from inside"); + Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."), + Running(false, "VM is running. host id has the host that it is running on."), + Stopping(true, "VM is being stopped. host id has the host that it is being stopped on."), + Stopped(false, "VM is stopped. host id should be null."), + Destroyed(false, "VM is marked for destroy."), + Expunging(true, "VM is being expunged."), + Migrating(true, "VM is being migrated. host id holds to from host"), + Error(false, "VM is in error"), + Unknown(false, "VM state is unknown."), + Shutdowned(false, "VM is shutdowned from inside"); private final boolean _transitional; String _description; diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/com/cloud/vm/snapshot/VMSnapshot.java index 3cd52c28be1..7713b2052ac 100644 --- a/api/src/com/cloud/vm/snapshot/VMSnapshot.java +++ b/api/src/com/cloud/vm/snapshot/VMSnapshot.java @@ -19,23 +19,19 @@ package com.cloud.vm.snapshot; import java.util.Date; +import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; -import org.apache.cloudstack.acl.ControlledEntity; import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.fsm.StateObject; public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity, StateObject { enum State { - Allocated("The VM snapshot is allocated but has not been created yet."), - Creating("The VM snapshot is being created."), - Ready("The VM snapshot is ready to be used."), - Reverting("The VM snapshot is being used to revert"), - Expunging("The volume is being expunging"), - Removed("The volume is destroyed, and can't be recovered."), - Error("The volume is in error state, and can't be recovered"); + Allocated("The VM snapshot is allocated but has not been created yet."), Creating("The VM snapshot is being created."), Ready( + "The VM snapshot is ready to be used."), Reverting("The VM snapshot is being used to revert"), Expunging("The volume is being expunging"), Removed( + "The volume is destroyed, and can't be recovered."), Error("The volume is in error state, and can't be recovered"); String _description; @@ -74,12 +70,14 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity CreateRequested, OperationFailed, OperationSucceeded, RevertRequested, ExpungeRequested, } + @Override long getId(); public String getName(); public Long getVmId(); + @Override public State getState(); public Date getCreated(); @@ -102,5 +100,6 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity public Date getRemoved(); + @Override public long getAccountId(); } diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java index 82807fe5218..aa0b4e6133a 100644 --- a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java @@ -17,21 +17,16 @@ package org.apache.cloudstack.affinity; import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; + +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import org.apache.cloudstack.api.response.ControlledEntityResponse; import org.apache.cloudstack.api.response.ControlledViewEntityResponse; -import org.apache.cloudstack.api.response.UserVmResponse; -import com.cloud.network.security.SecurityGroup; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = AffinityGroup.class) @@ -93,6 +88,7 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie this.description = description; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -106,6 +102,7 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java index 8d8e1034de6..6f5fb23d159 100644 --- a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java @@ -16,18 +16,13 @@ // under the License. package org.apache.cloudstack.affinity; -import java.util.HashSet; -import java.util.Set; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import org.apache.cloudstack.api.response.ControlledEntityResponse; -import org.apache.cloudstack.api.response.ControlledViewEntityResponse; -import com.cloud.network.security.SecurityGroup; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = AffinityGroup.class) diff --git a/api/src/org/apache/cloudstack/api/ApiErrorCode.java b/api/src/org/apache/cloudstack/api/ApiErrorCode.java index fc196cfc782..fa47f30b0e2 100644 --- a/api/src/org/apache/cloudstack/api/ApiErrorCode.java +++ b/api/src/org/apache/cloudstack/api/ApiErrorCode.java @@ -50,6 +50,7 @@ public enum ApiErrorCode { this.httpCode = httpCode; } + @Override public String toString() { return String.valueOf(this.httpCode); } diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java index 3ca5dd44027..b060f43a022 100644 --- a/api/src/org/apache/cloudstack/api/BaseCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseCmd.java @@ -26,18 +26,15 @@ import java.util.regex.Pattern; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupService; - -import com.cloud.server.ResourceMetaDataService; - import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService; import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService; import org.apache.cloudstack.query.QueryService; import org.apache.cloudstack.usage.UsageService; -import org.apache.log4j.Logger; - import com.cloud.configuration.ConfigurationService; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; @@ -54,10 +51,10 @@ import com.cloud.network.StorageNetworkService; import com.cloud.network.VpcVirtualNetworkApplianceService; import com.cloud.network.as.AutoScaleService; import com.cloud.network.firewall.FirewallService; -import com.cloud.network.vpc.NetworkACLService; import com.cloud.network.lb.LoadBalancingRulesService; import com.cloud.network.rules.RulesService; import com.cloud.network.security.SecurityGroupService; +import com.cloud.network.vpc.NetworkACLService; import com.cloud.network.vpc.VpcProvisioningService; import com.cloud.network.vpc.VpcService; import com.cloud.network.vpn.RemoteAccessVpnService; @@ -66,6 +63,7 @@ import com.cloud.projects.Project; import com.cloud.projects.ProjectService; import com.cloud.resource.ResourceService; import com.cloud.server.ManagementService; +import com.cloud.server.ResourceMetaDataService; import com.cloud.server.TaggedResourceService; import com.cloud.storage.DataStoreProviderApiService; import com.cloud.storage.StorageService; @@ -272,7 +270,7 @@ public abstract class BaseCmd { int arrayStartLastIndex = key.lastIndexOf('['); if (arrayStartIndex != arrayStartLastIndex) { throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key + - "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); + "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); } if (arrayStartIndex > 0) { @@ -281,7 +279,7 @@ public abstract class BaseCmd { if ((arrayEndIndex < arrayStartIndex) || (arrayEndIndex != arrayEndLastIndex)) { // malformed parameter throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key + - "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); + "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); } // Now that we have an array object, check for a field name in the case of a complex object @@ -289,7 +287,7 @@ public abstract class BaseCmd { String fieldName = null; if (fieldIndex < arrayEndIndex) { throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key + - "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); + "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); } else { fieldName = key.substring(fieldIndex + 1); } @@ -314,7 +312,7 @@ public abstract class BaseCmd { if (!parsedIndex) { throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key + - "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); + "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup"); } Object value = lowercaseParams.get(paramName); @@ -349,7 +347,8 @@ public abstract class BaseCmd { } public static boolean isAdmin(short accountType) { - return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); } public static boolean isRootAdmin(short accountType) { @@ -381,7 +380,7 @@ public abstract class BaseCmd { return account.getId(); } else { throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() + - " as it's no longer active"); + " as it's no longer active"); } } else { // idList is not used anywhere, so removed it now @@ -397,8 +396,9 @@ public abstract class BaseCmd { if (!enabledOnly || project.getState() == Project.State.Active) { return project.getProjectAccountId(); } else { - PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + - " as it's no longer active"); + PermissionDeniedException ex = + new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + + " as it's no longer active"); ex.addProxyObject(project.getUuid(), "projectId"); throw ex; } diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java index d3ebb95a694..dfb3f3b6ba5 100644 --- a/api/src/org/apache/cloudstack/api/BaseListCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java @@ -64,6 +64,7 @@ public abstract class BaseListCmd extends BaseCmd { return pageSize; } + @Override public void configure() { if (MAX_PAGESIZE == null) { if (_configService.getDefaultPageSize().longValue() != PAGESIZE_UNLIMITED) { diff --git a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java b/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java index b74ec2f5737..79f7edc2297 100644 --- a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java @@ -20,18 +20,18 @@ import org.apache.cloudstack.api.response.DomainResponse; public abstract class BaseListDomainResourcesCmd extends BaseListCmd { - @Parameter(name = ApiConstants.LIST_ALL, - type = CommandType.BOOLEAN, - description = "If set to false, " - + "list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false") + @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "If set to false, " + + "list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false") private Boolean listAll; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "list only resources belonging to the domain specified") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "list only resources belonging to the domain specified") private Long domainId; - @Parameter(name = ApiConstants.IS_RECURSIVE, - type = CommandType.BOOLEAN, - description = "defaults to false," + " but if true, lists all resources from the parent specified by the domainId till leaves.") + @Parameter(name = ApiConstants.IS_RECURSIVE, type = CommandType.BOOLEAN, description = "defaults to false," + + " but if true, lists all resources from the parent specified by the domainId till leaves.") private Boolean recursive; public boolean listAll() { diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java index 67b0bfa0030..c9725a55ee4 100644 --- a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java @@ -18,11 +18,11 @@ package org.apache.cloudstack.api; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.TemplatePermissionsResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/org/apache/cloudstack/api/BaseResponse.java index a31a7d5b58c..05de2187635 100644 --- a/api/src/org/apache/cloudstack/api/BaseResponse.java +++ b/api/src/org/apache/cloudstack/api/BaseResponse.java @@ -16,9 +16,10 @@ // under the License. package org.apache.cloudstack.api; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import com.cloud.serializer.Param; + public abstract class BaseResponse implements ResponseObject { private transient String responseName; private transient String objectName; diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java index f58f2519d9a..2350f6b3892 100644 --- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd; import org.apache.cloudstack.api.response.GuestOSResponse; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java index 84249fc95e2..5d054398772 100644 --- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java @@ -18,10 +18,11 @@ package org.apache.cloudstack.api; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 3ca8e542057..c5a2d1a0cc3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -16,8 +16,10 @@ // under the License. package org.apache.cloudstack.api.command.admin.account; -import com.cloud.user.Account; -import com.cloud.user.UserAccount; +import java.util.Collection; +import java.util.Map; + +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -29,10 +31,8 @@ import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - -import java.util.Collection; -import java.util.Map; +import com.cloud.user.Account; +import com.cloud.user.UserAccount; @APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class) public class CreateAccountCmd extends BaseCmd { @@ -172,8 +172,9 @@ public class CreateAccountCmd extends BaseCmd { @Override public void execute() { CallContext.current().setEventDetails("Account Name: " + getAccountName() + ", Domain Id:" + getDomainId()); - UserAccount userAccount = _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), - getAccountType(), getDomainId(), getNetworkDomain(), getDetails(), getAccountUUID(), getUserUUID()); + UserAccount userAccount = + _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), getAccountType(), + getDomainId(), getNetworkDomain(), getDetails(), getAccountUUID(), getUserUUID()); if (userAccount != null) { AccountResponse response = _responseGenerator.createUserAccountResponse(userAccount); response.setResponseName(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java index e37846df84b..7c1b206d067 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.User; @@ -91,7 +91,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd { public String getEventDescription() { User user = _responseGenerator.findUserById(getId()); return (user != null ? ("deleting User " + user.getUsername() + " (id: " + user.getId() + ") and accountId = " + user.getAccountId()) - : "user delete, but this user does not exist in the system"); + : "user delete, but this user does not exist in the system"); } @Override diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java index beb28dd6483..6fdbefe7afe 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java index 729d876a1a5..59d6acd5d5f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java index e098b39fa87..93ec1be9f88 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.admin.account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java index 6542ebcf516..a8cf63fe5a4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java @@ -21,6 +21,8 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java index 3eb76791069..6c4b81b4f0e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.admin.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.CounterResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.as.Counter; diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java index b9b6dd13153..50477f53760 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.admin.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.CounterResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java index 67d250177a0..d0e73807392 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java @@ -20,6 +20,8 @@ package org.apache.cloudstack.api.command.admin.cluster; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java index 12eb9bc69b0..e1bc5855ee8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.cluster; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java index b74054a8137..8640f371445 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.cluster; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.org.Cluster; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java index 7f5fa1f17f9..b13f81a16bc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.cluster; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.org.Cluster; diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java index d6fe5e7b2cf..2c31dfdc745 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java @@ -19,15 +19,20 @@ package org.apache.cloudstack.api.command.admin.config; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.response.*; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.config.Configuration; -import org.apache.log4j.Logger; - import com.cloud.utils.Pair; @APICommand(name = "listConfigurations", description = "Lists all configurations.", responseObject = ConfigurationResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java index 65a4c840c94..1d9d2d935ff 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java @@ -19,11 +19,12 @@ package org.apache.cloudstack.api.command.admin.config; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.response.DeploymentPlannersResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; @APICommand(name = "listDeploymentPlanners", description = "Lists all DeploymentPlanners available.", responseObject = DeploymentPlannersResponse.class) public class ListDeploymentPlannersCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java index 184758a823f..16adf664bdd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java @@ -19,19 +19,23 @@ package org.apache.cloudstack.api.command.admin.config; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorCapabilities; import com.cloud.utils.Pair; -@APICommand(name = "listHypervisorCapabilities", description = "Lists all hypervisor capabilities.", responseObject = HypervisorCapabilitiesResponse.class, since = "3.0.0") +@APICommand(name = "listHypervisorCapabilities", + description = "Lists all hypervisor capabilities.", + responseObject = HypervisorCapabilitiesResponse.class, + since = "3.0.0") public class ListHypervisorCapabilitiesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName()); @@ -74,8 +78,8 @@ public class ListHypervisorCapabilitiesCmd extends BaseListCmd { @Override public void execute() { - Pair, Integer> hpvCapabilities = _mgr.listHypervisorCapabilities(getId(), getHypervisor(), getKeyword(), this.getStartIndex(), - this.getPageSizeVal()); + Pair, Integer> hpvCapabilities = + _mgr.listHypervisorCapabilities(getId(), getHypervisor(), getKeyword(), this.getStartIndex(), this.getPageSizeVal()); ListResponse response = new ListResponse(); List hpvCapabilitiesResponses = new ArrayList(); for (HypervisorCapabilities capability : hpvCapabilities.first()) { diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index c27947887fb..fe6e3d65538 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java @@ -16,17 +16,21 @@ // under the License. package org.apache.cloudstack.api.command.admin.config; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.*; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.config.Configuration; -import org.apache.log4j.Logger; - import com.cloud.user.Account; @APICommand(name = "updateConfiguration", description = "Updates a configuration.", responseObject = ConfigurationResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java index 1f2c8527a53..5cb5f9c3e52 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java @@ -16,8 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.config; -import com.cloud.hypervisor.HypervisorCapabilities; -import com.cloud.user.Account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,9 +25,14 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; -import org.apache.log4j.Logger; -@APICommand(name = "updateHypervisorCapabilities", description = "Updates a hypervisor capabilities.", responseObject = HypervisorCapabilitiesResponse.class, since = "3.0.0") +import com.cloud.hypervisor.HypervisorCapabilities; +import com.cloud.user.Account; + +@APICommand(name = "updateHypervisorCapabilities", + description = "Updates a hypervisor capabilities.", + responseObject = HypervisorCapabilitiesResponse.class, + since = "3.0.0") public class UpdateHypervisorCapabilitiesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName()); private static final String s_name = "updatehypervisorcapabilitiesresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java index caac5bb0211..47375551aea 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.domain; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.domain.Domain; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java index a3adb61d446..b1075c10fc5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.domain; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.domain.Domain; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java index f8851dab9eb..e1ba1789616 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.domain; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.domain.Domain; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java index 3e09aa98c86..5a3786cda20 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.domain; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.domain.Domain; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java index cac425fd853..8acfcd5acda 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.domain; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,11 +30,8 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.domain.Domain; import com.cloud.user.Account; -import com.cloud.user.UserAccount; @APICommand(name = "updateDomain", description = "Updates a domain with a new name", responseObject = DomainResponse.class) public class UpdateDomainCmd extends BaseCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java index 2ce1462f12d..363bcd6db50 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.host; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java index 9e582d75bf2..61f6f49091c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.storage.ImageStore; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java index 8c225082679..46289ee49bd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java index d1747da296e..5a4478e21a3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java index 97229f408e8..0faf72cc245 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java @@ -20,15 +20,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.cloudstack.api.APICommand; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserVmResponse; + import com.cloud.host.Host; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; @@ -73,8 +74,8 @@ public class FindHostsForMigrationCmd extends BaseListCmd { Pair, Integer> result; Map hostsRequiringStorageMotion; - Ternary, Integer>, List, Map> hostsForMigration = _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), - this.getStartIndex(), this.getPageSizeVal()); + Ternary, Integer>, List, Map> hostsForMigration = + _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal()); result = hostsForMigration.first(); List hostsWithCapacity = hostsForMigration.second(); hostsRequiringStorageMotion = hostsForMigration.third(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index 3cee0d8b7c4..eda821b0498 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -21,7 +21,8 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; -import com.cloud.hypervisor.Hypervisor.HypervisorType; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -34,10 +35,10 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; @@ -152,7 +153,8 @@ public class ListHostsCmd extends BaseListCmd { } dv = EnumSet.copyOf(dc); } catch (IllegalArgumentException e) { - throw new InvalidParameterValueException("The details parameter contains a non permitted value. The allowed values are " + EnumSet.allOf(HostDetails.class)); + throw new InvalidParameterValueException("The details parameter contains a non permitted value. The allowed values are " + + EnumSet.allOf(HostDetails.class)); } } return dv; @@ -171,6 +173,7 @@ public class ListHostsCmd extends BaseListCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Host; } @@ -182,8 +185,8 @@ public class ListHostsCmd extends BaseListCmd { response = _queryService.searchForServers(this); } else { Pair, Integer> result; - Ternary, Integer>, List, Map> hostsForMigration = _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), - this.getStartIndex(), this.getPageSizeVal()); + Ternary, Integer>, List, Map> hostsForMigration = + _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal()); result = hostsForMigration.first(); List hostsWithCapacity = hostsForMigration.second(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java index 3b8ff5a7eff..23cfacfa87a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java index d2d8745fa66..1ce888b1570 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.host.Host; import com.cloud.user.Account; @@ -86,10 +86,12 @@ public class ReconnectHostCmd extends BaseAsyncCmd { return "reconnecting host: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Host; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java index da5599ae7a1..b60feca5977 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java index a751b6a712f..d778b37bed1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.host; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.GuestOSCategoryResponse; import org.apache.cloudstack.api.response.HostResponse; -import org.apache.log4j.Logger; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java index 6a08c0d843e..69480b14f4b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.host; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java index 5ad43357267..51da7608dac 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java @@ -17,12 +17,11 @@ package org.apache.cloudstack.api.command.admin.internallb; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.VirtualRouterProvider; -import com.cloud.user.Account; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -34,11 +33,12 @@ import org.apache.cloudstack.api.response.InternalLoadBalancerElementResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -import java.util.List; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.VirtualRouterProvider; +import com.cloud.user.Account; @APICommand(name = "configureInternalLoadBalancerElement", responseObject = InternalLoadBalancerElementResponse.class, diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java index 777d7bb58ce..a6ece720455 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java @@ -20,6 +20,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.VirtualRouterProvider; diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java index 1ec82d296bf..0e01be142ee 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.internallb; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.router.VirtualRouter.Role; diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java index bb97fa560f2..df7135af211 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.InternalLoadBalancerElementResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -52,7 +53,10 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = InternalLoadBalancerElementResponse.class, description = "list internal load balancer elements by id") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = InternalLoadBalancerElementResponse.class, + description = "list internal load balancer elements by id") private Long id; @Parameter(name = ApiConstants.NSP_ID, @@ -86,7 +90,8 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { List providers = _service.searchForInternalLoadBalancerElements(getId(), getNspId(), getEnabled()); ListResponse response = new ListResponse(); List providerResponses = new ArrayList(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java index 43faa5eefbb..56dcb4f8403 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.internallb; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -89,10 +89,12 @@ public class StartInternalLBVMCmd extends BaseAsyncCmd { return "starting internal lb vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.InternalLbVm; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java index 33895b87c70..9da4db072db 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.internallb; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java index 21f7a212487..7af93559b2e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java @@ -20,6 +20,8 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkDeviceResponse; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -68,7 +69,8 @@ public class AddNetworkDeviceCmd extends BaseCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { Host device = nwDeviceMgr.addNetworkDevice(this); NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(device); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index 5e24da6b9ea..f1904939969 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -29,14 +31,15 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.user.Account; -@APICommand(name = "addNetworkServiceProvider", description = "Adds a network serviceProvider to a physical network", responseObject = ProviderResponse.class, since = "3.0.0") +@APICommand(name = "addNetworkServiceProvider", + description = "Adds a network serviceProvider to a physical network", + responseObject = ProviderResponse.class, + since = "3.0.0") public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName()); @@ -117,8 +120,8 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd { @Override public void create() throws ResourceAllocationException { - PhysicalNetworkServiceProvider result = _networkService.addProviderToPhysicalNetwork(getPhysicalNetworkId(), getProviderName(), getDestinationPhysicalNetworkId(), - getEnabledServices()); + PhysicalNetworkServiceProvider result = + _networkService.addProviderToPhysicalNetwork(getPhysicalNetworkId(), getProviderName(), getDestinationPhysicalNetworkId(), getEnabledServices()); if (result != null) { setEntityId(result.getId()); setEntityUuid(result.getUuid()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java index d52013ebee0..bdf047233ad 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java @@ -23,6 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -31,7 +33,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkOfferingResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network.Capability; @@ -110,10 +111,8 @@ public class CreateNetworkOfferingCmd extends BaseCmd { description = "true if network offering supports persistent networks; defaulted to false if not specified") private Boolean isPersistent; - @Parameter(name = ApiConstants.DETAILS, - type = CommandType.MAP, - since = "4.2.0", - description = "Network offering details in key/value pairs." + " Supported keys are internallbprovider/publiclbprovider with service provider as a value") + @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.2.0", description = "Network offering details in key/value pairs." + + " Supported keys are internallbprovider/publiclbprovider with service provider as a value") protected Map details; @Parameter(name = ApiConstants.EGRESS_DEFAULT_POLICY, @@ -127,7 +126,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd { description = "if true keepalive will be turned on in the loadbalancer. At the time of writing this has only an effect on haproxy; the mode http and httpclose options are unset in the haproxy conf file.") private Boolean keepAliveEnabled; - @Parameter(name = ApiConstants.MAX_CONNECTIONS, type = CommandType.INTEGER, description = "maximum number of concurrent connections supported by the network offering") + @Parameter(name = ApiConstants.MAX_CONNECTIONS, + type = CommandType.INTEGER, + description = "maximum number of concurrent connections supported by the network offering") private Integer maxConnections; ///////////////////////////////////////////////////// @@ -242,9 +243,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd { while (iter.hasNext()) { HashMap svcCapabilityMap = (HashMap)iter.next(); Capability capability = null; - String svc = (String)svcCapabilityMap.get("service"); - String capabilityName = (String)svcCapabilityMap.get("capabilitytype"); - String capabilityValue = (String)svcCapabilityMap.get("capabilityvalue"); + String svc = svcCapabilityMap.get("service"); + String capabilityName = svcCapabilityMap.get("capabilitytype"); + String capabilityValue = svcCapabilityMap.get("capabilityvalue"); if (capabilityName != null) { capability = Capability.getCapability(capabilityName); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java index a4fe4002402..de4e5e55253 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.PhysicalNetwork; @@ -47,7 +47,11 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the Zone ID for the physical network") + @Parameter(name = ApiConstants.ZONE_ID, + type = CommandType.UUID, + entityType = ZoneResponse.class, + required = true, + description = "the Zone ID for the physical network") private Long zoneId; @Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the VLAN for the physical network") @@ -56,7 +60,10 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.NETWORK_SPEED, type = CommandType.STRING, description = "the speed for the physical network[1G/10G]") private String speed; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a physical network") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "domain ID of the account owning a physical network") private Long domainId; @Parameter(name = ApiConstants.BROADCAST_DOMAIN_RANGE, @@ -161,8 +168,9 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { @Override public void create() throws ResourceAllocationException { - PhysicalNetwork result = _networkService.createPhysicalNetwork(getZoneId(), getVlan(), getNetworkSpeed(), getIsolationMethods(), getBroadcastDomainRange(), getDomainId(), - getTags(), getNetworkName()); + PhysicalNetwork result = + _networkService.createPhysicalNetwork(getZoneId(), getVlan(), getNetworkSpeed(), getIsolationMethods(), getBroadcastDomainRange(), getDomainId(), getTags(), + getNetworkName()); if (result != null) { setEntityId(result.getId()); setEntityUuid(result.getUuid()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java index 9f8971287aa..cfbbd36f354 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; -import org.apache.log4j.Logger; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.event.EventTypes; @@ -34,7 +35,10 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -@APICommand(name = "createStorageNetworkIpRange", description = "Creates a Storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0") +@APICommand(name = "createStorageNetworkIpRange", + description = "Creates a Storage network IP range.", + responseObject = StorageNetworkIpRangeResponse.class, + since = "3.0.0") public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class); @@ -43,7 +47,11 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, required = true, description = "UUID of pod where the ip range belongs to") + @Parameter(name = ApiConstants.POD_ID, + type = CommandType.UUID, + entityType = PodResponse.class, + required = true, + description = "UUID of pod where the ip range belongs to") private Long podId; @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, required = true, description = "the beginning IP address") @@ -102,7 +110,8 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { StorageNetworkIpRange result = _storageNetworkService.createIpRange(this); StorageNetworkIpRangeResponse response = _responseGenerator.createStorageNetworkIpRangeResponse(result); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java index e40a3195993..51b49244544 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java @@ -18,10 +18,8 @@ */ package org.apache.cloudstack.api.command.admin.network; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.GuestVlan; -import com.cloud.user.Account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -32,7 +30,11 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.GuestVlanRangeResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; + +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.GuestVlan; +import com.cloud.user.Account; @APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class) public class DedicateGuestVlanRangeCmd extends BaseCmd { @@ -53,7 +55,11 @@ public class DedicateGuestVlanRangeCmd extends BaseCmd { @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "project who will own the VLAN") private Long projectId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "domain ID of the account owning a VLAN") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "domain ID of the account owning a VLAN") private Long domainId; @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java index 867b4bf2158..96e4fa552b8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -56,7 +57,8 @@ public class DeleteNetworkDeviceCmd extends BaseCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = nwDeviceMgr.deleteNetworkDevice(this); if (result) { diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java index 212e54305b3..3aa7d664a52 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkOfferingResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -37,7 +38,11 @@ public class DeleteNetworkOfferingCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, required = true, description = "the ID of the network offering") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = NetworkOfferingResponse.class, + required = true, + description = "the ID of the network offering") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java index a83ffabe831..c4993c3f6e5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -42,7 +43,11 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ProviderResponse.class, required = true, description = "the ID of the network service provider") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = ProviderResponse.class, + required = true, + description = "the ID of the network service provider") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java index 0f61af4e97f..828683accfa 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -41,7 +41,11 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, required = true, description = "the ID of the Physical network") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = PhysicalNetworkResponse.class, + required = true, + description = "the ID of the Physical network") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java index 8742474c3df..42c96190507 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -69,7 +70,8 @@ public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { _storageNetworkService.deleteIpRange(this); SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java index 13519e38838..ca7c1f70173 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java @@ -16,15 +16,25 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.GuestVlanRangeResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.network.GuestVlan; import com.cloud.user.Account; import com.cloud.utils.Pair; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.*; -import org.apache.log4j.Logger; - -import java.util.ArrayList; -import java.util.List; @APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class) public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java index b3a0002e835..de175d079b7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -31,7 +33,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkDeviceResponse; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -69,7 +70,8 @@ public class ListNetworkDeviceCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List devices = nwDeviceMgr.listNetworkDevice(this); List nwdeviceResponses = new ArrayList(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java index 300e638e415..d30f7b8f588 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java @@ -26,7 +26,10 @@ import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.Networks; -@APICommand(name = "listNetworkIsolationMethods", description = "Lists supported methods of network isolation", responseObject = IsolationMethodResponse.class, since = "4.2.0") +@APICommand(name = "listNetworkIsolationMethods", + description = "Lists supported methods of network isolation", + responseObject = IsolationMethodResponse.class, + since = "4.2.0") public class ListNetworkIsolationMethodsCmd extends BaseListCmd { private static final String s_name = "listnetworkisolationmethodsresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java index 2918f90e8b2..25d5d0fd631 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ProviderResponse; -import org.apache.log4j.Logger; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.user.Account; @@ -88,8 +89,8 @@ public class ListNetworkServiceProvidersCmd extends BaseListCmd { @Override public void execute() { - Pair, Integer> serviceProviders = _networkService.listNetworkServiceProviders(getPhysicalNetworkId(), getName(), getState(), - this.getStartIndex(), this.getPageSizeVal()); + Pair, Integer> serviceProviders = + _networkService.listNetworkServiceProviders(getPhysicalNetworkId(), getName(), getState(), this.getStartIndex(), this.getPageSizeVal()); ListResponse response = new ListResponse(); List serviceProvidersResponses = new ArrayList(); for (PhysicalNetworkServiceProvider serviceProvider : serviceProviders.first()) { diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java index 4ef47fdd55b..3ac2faaacd9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.PhysicalNetwork; import com.cloud.user.Account; @@ -85,8 +86,8 @@ public class ListPhysicalNetworksCmd extends BaseListCmd { @Override public void execute() { - Pair, Integer> result = _networkService.searchPhysicalNetworks(getId(), getZoneId(), this.getKeyword(), this.getStartIndex(), - this.getPageSizeVal(), getNetworkName()); + Pair, Integer> result = + _networkService.searchPhysicalNetworks(getId(), getZoneId(), this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getNetworkName()); if (result != null) { ListResponse response = new ListResponse(); List networkResponses = new ArrayList(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java index fc0c15702ed..0b17666e3c7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.exception.ConcurrentOperationException; @@ -83,7 +84,8 @@ public class ListStorageNetworkIpRangeCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List results = _storageNetworkService.listIpRange(this); ListResponse response = new ListResponse(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java index 8a8d1eb2a80..240c03362cb 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ServiceResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java index cb379a07541..43e1149a1ec 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java @@ -17,17 +17,21 @@ package org.apache.cloudstack.api.command.admin.network; -import com.cloud.event.EventTypes; -import com.cloud.exception.ResourceInUseException; -import com.cloud.user.Account; +import org.apache.log4j.Logger; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.CounterResponse; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiCommandJobType; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.GuestVlanRangeResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; +import com.cloud.event.EventTypes; +import com.cloud.user.Account; @APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class) public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java index 40d474a62d0..aaff5a1c46b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; @@ -46,9 +47,8 @@ public class UpdateNetworkOfferingCmd extends BaseCmd { @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "the display text of the network offering") private String displayText; - @Parameter(name = ApiConstants.AVAILABILITY, - type = CommandType.STRING, - description = "the availability of network offering." + " Default value is Required for Guest Virtual network offering; Optional for Guest Direct network offering") + @Parameter(name = ApiConstants.AVAILABILITY, type = CommandType.STRING, description = "the availability of network offering." + + " Default value is Required for Guest Virtual network offering; Optional for Guest Direct network offering") private String availability; @Parameter(name = ApiConstants.SORT_KEY, type = CommandType.INTEGER, description = "sort key of the network offering, integer") @@ -63,7 +63,9 @@ public class UpdateNetworkOfferingCmd extends BaseCmd { description = "if true keepalive will be turned on in the loadbalancer. At the time of writing this has only an effect on haproxy; the mode http and httpclose options are unset in the haproxy conf file.") private Boolean keepAliveEnabled; - @Parameter(name = ApiConstants.MAX_CONNECTIONS, type = CommandType.INTEGER, description = "maximum number of concurrent connections supported by the network offering") + @Parameter(name = ApiConstants.MAX_CONNECTIONS, + type = CommandType.INTEGER, + description = "maximum number of concurrent connections supported by the network offering") private Integer maxConnections; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index b22501dbe98..c530c53b7f3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProviderResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetworkServiceProvider; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index 3ab9f3fbf55..f808424fc86 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.admin.network; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetwork; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java index b57099eca96..9fd084a104f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; -import org.apache.log4j.Logger; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.event.EventTypes; @@ -44,7 +45,11 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = StorageNetworkIpRangeResponse.class, required = true, description = "UUID of storage network ip range") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = StorageNetworkIpRangeResponse.class, + required = true, + description = "UUID of storage network ip range") private Long id; @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the beginning IP address") @@ -93,7 +98,8 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { StorageNetworkIpRange result = _storageNetworkService.updateIpRange(this); StorageNetworkIpRangeResponse response = _responseGenerator.createStorageNetworkIpRangeResponse(result); diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java index d86407314aa..1d959a0589b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.log4j.Logger; import com.cloud.offering.DiskOffering; import com.cloud.offering.ServiceOffering; @@ -64,7 +65,9 @@ public class CreateDiskOfferingCmd extends BaseCmd { @Parameter(name = ApiConstants.STORAGE_TYPE, type = CommandType.STRING, description = "the storage type of the disk offering. Values are local and shared.") private String storageType = ServiceOffering.StorageType.shared.toString(); - @Parameter(name = ApiConstants.DISPLAY_OFFERING, type = CommandType.BOOLEAN, description = "an optional field, whether to display the offering to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_OFFERING, + type = CommandType.BOOLEAN, + description = "an optional field, whether to display the offering to the end user or not.") private Boolean displayOffering; @Parameter(name = ApiConstants.BYTES_READ_RATE, type = CommandType.LONG, required = false, description = "bytes read rate of the disk offering") diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index 82f338f1477..7dd87e1761c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.offering; import java.util.Collection; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java index 2afdbe86ad8..9845aa49e2b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -52,6 +53,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java index a1ad264e9a5..0f81409d264 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -37,7 +38,11 @@ public class DeleteServiceOfferingCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class, required = true, description = "the ID of the service offering") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = ServiceOfferingResponse.class, + required = true, + description = "the ID of the service offering") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java index 53e0b5c7e80..6d45fb5d55d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DiskOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.offering.DiskOffering; import com.cloud.user.Account; @@ -37,7 +38,10 @@ public class UpdateDiskOfferingCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "updates alternate display text of the disk offering with this value", length = 4096) + @Parameter(name = ApiConstants.DISPLAY_TEXT, + type = CommandType.STRING, + description = "updates alternate display text of the disk offering with this value", + length = 4096) private String displayText; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DiskOfferingResponse.class, required = true, description = "ID of the disk offering") @@ -49,7 +53,9 @@ public class UpdateDiskOfferingCmd extends BaseCmd { @Parameter(name = ApiConstants.SORT_KEY, type = CommandType.INTEGER, description = "sort key of the disk offering, integer") private Integer sortKey; - @Parameter(name = ApiConstants.DISPLAY_OFFERING, type = CommandType.BOOLEAN, description = "an optional field, whether to display the offering to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_OFFERING, + type = CommandType.BOOLEAN, + description = "an optional field, whether to display the offering to the end user or not.") private Boolean displayOffering; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java index fae0b949706..fbc88450fea 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.offering; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ServiceOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java index f34d12a53f9..835a3b98bc4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.pod; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Pod; import com.cloud.user.Account; @@ -41,7 +42,11 @@ public class CreatePodCmd extends BaseCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the Pod") private String podName; - @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the Zone ID in which the Pod will be created") + @Parameter(name = ApiConstants.ZONE_ID, + type = CommandType.UUID, + entityType = ZoneResponse.class, + required = true, + description = "the Zone ID in which the Pod will be created") private Long zoneId; @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, required = true, description = "the starting IP address for the Pod") diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java index 584ac055f96..584eed41e7d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.pod; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -53,6 +54,7 @@ public class DeletePodCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java index d7511aeae35..75b5efd2fab 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.pod; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Pod; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java index 79114c68e75..7b8f6eb0f97 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.pod; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Pod; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java index f6b623d1372..9e7c035bb9d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java index d9b16eec90f..e900f47476f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java @@ -17,13 +17,8 @@ package org.apache.cloudstack.api.command.admin.region; -import javax.inject.Inject; +import org.apache.log4j.Logger; -import com.cloud.dc.Vlan; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -33,15 +28,17 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PortableIpRangeResponse; import org.apache.cloudstack.api.response.RegionResponse; -import org.apache.cloudstack.api.response.VlanIpRangeResponse; import org.apache.cloudstack.region.PortableIpRange; -import org.apache.cloudstack.region.Region; -import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ResourceAllocationException; import com.cloud.user.Account; -@APICommand(name = "createPortableIpRange", responseObject = PortableIpRangeResponse.class, description = "adds a range of portable public IP's to a region", since = "4.2.0") +@APICommand(name = "createPortableIpRange", + responseObject = PortableIpRangeResponse.class, + description = "adds a range of portable public IP's to a region", + since = "4.2.0") public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreatePortableIpRangeCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java index f8202606ac7..5408eda5658 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java @@ -17,17 +17,19 @@ package org.apache.cloudstack.api.command.admin.region; -import javax.inject.Inject; - -import com.cloud.event.EventTypes; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PortableIpRangeResponse; -import org.apache.cloudstack.api.response.RegionResponse; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.region.Region; -import org.apache.cloudstack.region.RegionService; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiCommandJobType; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PortableIpRangeResponse; +import org.apache.cloudstack.api.response.SuccessResponse; + +import com.cloud.event.EventTypes; import com.cloud.user.Account; @APICommand(name = "deletePortableIpRange", description = "deletes a range of portable public IP's associated with a region", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java index 3ca621466d8..42a92e62873 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java @@ -16,24 +16,23 @@ // under the License. package org.apache.cloudstack.api.command.admin.region; -import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; -import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PortableIpRangeResponse; import org.apache.cloudstack.api.response.PortableIpResponse; -import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.region.PortableIp; import org.apache.cloudstack.region.PortableIpRange; -import org.apache.cloudstack.region.Region; -import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; -import java.util.ArrayList; -import java.util.List; - @APICommand(name = "listPortableIpRanges", description = "list portable IP ranges", responseObject = PortableIpRangeResponse.class) public class ListPortableIpRangesCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java index 795174555df..e9126595f9f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java index 4d16255d755..527e142ee8b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.region; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java index 1b9fa4d7e57..b1177b9e3eb 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource; import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AlertResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; @@ -43,17 +44,19 @@ public class ArchiveAlertsCmd extends BaseCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AlertResponse.class, description = "the IDs of the alerts") + @Parameter(name = ApiConstants.IDS, + type = CommandType.LIST, + collectionType = CommandType.UUID, + entityType = AlertResponse.class, + description = "the IDs of the alerts") private List ids; - @Parameter(name = ApiConstants.END_DATE, - type = CommandType.DATE, - description = "end date range to archive alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to archive alerts" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date endDate; - @Parameter(name = ApiConstants.START_DATE, - type = CommandType.DATE, - description = "start date range to archive alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to archive alerts" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date startDate; @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "archive by alert type") diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java index d4bae93c0ad..edc3bcf42d0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java @@ -16,13 +16,15 @@ // under the License. package org.apache.cloudstack.api.command.admin.resource; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import org.apache.cloudstack.context.CallContext; + import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java index d4964814e73..8ba25251a70 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource; import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AlertResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; @@ -43,17 +44,19 @@ public class DeleteAlertsCmd extends BaseCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AlertResponse.class, description = "the IDs of the alerts") + @Parameter(name = ApiConstants.IDS, + type = CommandType.LIST, + collectionType = CommandType.UUID, + entityType = AlertResponse.class, + description = "the IDs of the alerts") private List ids; - @Parameter(name = ApiConstants.END_DATE, - type = CommandType.DATE, - description = "end date range to delete alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to delete alerts" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date endDate; - @Parameter(name = ApiConstants.START_DATE, - type = CommandType.DATE, - description = "start date range to delete alerts" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to delete alerts" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date startDate; @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "delete by alert type") diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java index 8251efac158..90ab67ce9b1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.admin.resource; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AlertResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.alert.Alert; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java index 359dc9d9fbd..2b0f82715aa 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.resource; import java.text.DecimalFormat; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.capacity.Capacity; import com.cloud.exception.InvalidParameterValueException; @@ -51,17 +52,19 @@ public class ListCapacityCmd extends BaseListCmd { @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "lists capacity by the Pod ID") private Long podId; - @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, since = "3.0.0", description = "lists capacity by the Cluster ID") + @Parameter(name = ApiConstants.CLUSTER_ID, + type = CommandType.UUID, + entityType = ClusterResponse.class, + since = "3.0.0", + description = "lists capacity by the Cluster ID") private Long clusterId; @Parameter(name = ApiConstants.FETCH_LATEST, type = CommandType.BOOLEAN, since = "3.0.0", description = "recalculate capacities and fetch the latest") private Boolean fetchLatest; @Parameter(name = ApiConstants.TYPE, type = CommandType.INTEGER, description = "lists capacity by type" + "* CAPACITY_TYPE_MEMORY = 0" + "* CAPACITY_TYPE_CPU = 1" - + "* CAPACITY_TYPE_STORAGE = 2" + "* CAPACITY_TYPE_STORAGE_ALLOCATED = 3" - + "* CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = 4" + "* CAPACITY_TYPE_PRIVATE_IP = 5" - + "* CAPACITY_TYPE_SECONDARY_STORAGE = 6" + "* CAPACITY_TYPE_VLAN = 7" - + "* CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8" + "* CAPACITY_TYPE_LOCAL_STORAGE = 9.") + + "* CAPACITY_TYPE_STORAGE = 2" + "* CAPACITY_TYPE_STORAGE_ALLOCATED = 3" + "* CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = 4" + "* CAPACITY_TYPE_PRIVATE_IP = 5" + + "* CAPACITY_TYPE_SECONDARY_STORAGE = 6" + "* CAPACITY_TYPE_VLAN = 7" + "* CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP = 8" + "* CAPACITY_TYPE_LOCAL_STORAGE = 9.") private Integer type; @Parameter(name = ApiConstants.SORT_BY, type = CommandType.STRING, since = "3.0.0", description = "Sort the results. Available values: Usage") diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java index 5673a49f2c3..68ef5accb17 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.resource; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.CustomCertificateResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -48,7 +49,11 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "A name / alias for the certificate.") private String alias; - @Parameter(name = ApiConstants.PRIVATE_KEY, type = CommandType.STRING, required = false, description = "The private key for the attached certificate.", length = 65535) + @Parameter(name = ApiConstants.PRIVATE_KEY, + type = CommandType.STRING, + required = false, + description = "The private key for the attached certificate.", + length = 65535) private String privateKey; @Parameter(name = ApiConstants.DOMAIN_SUFFIX, type = CommandType.STRING, required = true, description = "DNS domain suffix that the certificate is granted for.") diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index 69ae028a577..2cfefda8c40 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java @@ -20,6 +20,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -110,10 +110,12 @@ public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd { return "configuring virtual router provider: " + id; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.None; } + @Override public Long getInstanceId() { return id; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java index 7640cefbe2a..bf5eb188a01 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java @@ -20,6 +20,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index 10e5dae589a..2ad312ee282 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java index 7bbc459fbfd..9c91e0fb2c7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.router.VirtualRouter.Role; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java index 4c91bebf837..4f04018833c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -97,7 +98,8 @@ public class ListVirtualRouterElementsCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { List providers = _service.get(0).searchForVirtualRouterElement(this); ListResponse response = new ListResponse(); List providerResponses = new ArrayList(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index 880cbded2cd..15527d3de36 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -84,10 +84,12 @@ public class RebootRouterCmd extends BaseAsyncCmd { return "rebooting router: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.DomainRouter; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index 23a542e6195..9196cd0dbde 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -90,10 +90,12 @@ public class StartRouterCmd extends BaseAsyncCmd { return "starting router: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.DomainRouter; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java index f2209cfdd0f..ee2b9ebc83a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java index d9bc9f860ab..04a4e6706f6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java index 296071f4948..3a20a515b8c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java @@ -16,12 +16,9 @@ // under the License. package org.apache.cloudstack.api.command.admin.router; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.router.VirtualRouter; -import com.cloud.user.Account; +import java.util.List; +import java.util.logging.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -35,13 +32,14 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UpgradeRouterTemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import java.util.List; -import java.util.logging.Logger; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; @APICommand(name = "upgradeRouterTemplate", description = "Upgrades router to use newer template", responseObject = BaseResponse.class) public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd { @@ -55,7 +53,10 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DomainRouterResponse.class, description = "upgrades router with the specified Id") private Long id; - @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "upgrades all routers within the specified cluster") + @Parameter(name = ApiConstants.CLUSTER_ID, + type = CommandType.UUID, + entityType = ClusterResponse.class, + description = "upgrades all routers within the specified cluster") private Long clusterId; @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "upgrades all routers within the specified pod") @@ -64,10 +65,16 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "upgrades all routers within the specified zone") private Long zoneId; - @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "upgrades all routers owned by the specified account") + @Parameter(name = ApiConstants.ACCOUNT_ID, + type = CommandType.UUID, + entityType = AccountResponse.class, + description = "upgrades all routers owned by the specified account") private Long accountId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "upgrades all routers owned by the specified domain") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "upgrades all routers owned by the specified domain") private Long domainId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java index 1446823eb83..5dcedff2392 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java @@ -21,6 +21,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.storage.ImageStore; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java index 4d015aef3c0..cc6680bcac4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java @@ -34,6 +34,8 @@ import static org.apache.cloudstack.api.BaseCmd.CommandType.STRING; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -41,7 +43,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ImageStoreResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.DiscoveryException; @@ -82,8 +83,8 @@ public final class AddS3Cmd extends BaseCmd { private Integer socketTimeout = null; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { AddImageStoreCmd cmd = new AddImageStoreCmd() { @Override diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java index 76dbd45beb0..b1c55944638 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; import com.cloud.storage.StoragePool; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java index f9d9a08f505..1480e75c063 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java @@ -18,8 +18,13 @@ */ package org.apache.cloudstack.api.command.admin.storage; -import com.cloud.storage.ImageStore; -import com.cloud.user.Account; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,12 +33,9 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import com.cloud.storage.ImageStore; +import com.cloud.user.Account; @APICommand(name = "createSecondaryStagingStore", description = "create secondary staging store.", responseObject = ImageStoreResponse.class) public class CreateSecondaryStagingStoreCmd extends BaseCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java index a939567bb44..dfd00266835 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.storage; import java.net.UnknownHostException; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java index 24a5cccf2d4..602da8350e9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java @@ -16,16 +16,16 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java index e21ce88eff5..fb63daa51d2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolStatus; @@ -43,7 +44,7 @@ public class DeletePoolCmd extends BaseCmd { private Long id; @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force destroy storage pool " - + "(force expunge volumes in Destroyed state as a part of pool removal)") + + "(force expunge volumes in Destroyed state as a part of pool removal)") private Boolean forced; // /////////////////////////////////////////////////// @@ -81,7 +82,8 @@ public class DeletePoolCmd extends BaseCmd { } else { StoragePool pool = _storageService.getStoragePool(id); if (pool != null && pool.getStatus() == StoragePoolStatus.Removed) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to finish storage pool removal. The storage pool will not be used but cleanup is needed"); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, + "Failed to finish storage pool removal. The storage pool will not be used but cleanup is needed"); } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete storage pool"); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java index 8d0ede47765..caf937fed00 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java index 4f7f67d2c08..10813cadc04 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java @@ -16,8 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; -import com.cloud.storage.StoragePool; -import com.cloud.utils.Pair; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,10 +29,9 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.VolumeResponse; -import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.List; +import com.cloud.storage.StoragePool; +import com.cloud.utils.Pair; @APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class) public class FindStoragePoolsForMigrationCmd extends BaseListCmd { @@ -61,6 +63,7 @@ public class FindStoragePoolsForMigrationCmd extends BaseListCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.StoragePool; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java index 2c2ca7572b7..bf470844e68 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; @APICommand(name = "listImageStores", description = "Lists image stores.", responseObject = ImageStoreResponse.class, since = "4.2.0") public class ListImageStoresCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java index bfb5852556c..362d69ef6fc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; @@ -35,8 +36,8 @@ public class ListS3sCmd extends BaseListCmd { private static final String COMMAND_NAME = "lists3sresponse"; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { ListImageStoresCmd cmd = new ListImageStoresCmd(); cmd.setProvider("S3"); diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java index bd9320236a3..171f9714aef 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; @APICommand(name = "listSecondaryStagingStores", description = "Lists secondary staging stores.", responseObject = ImageStoreResponse.class, since = "4.2.0") public class ListSecondaryStagingStoresCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index a214c603501..868b402b9db 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; @APICommand(name = "listStoragePools", description = "Lists storage pools.", responseObject = StoragePoolResponse.class) public class ListStoragePoolsCmd extends BaseListCmd { @@ -38,7 +39,10 @@ public class ListStoragePoolsCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "list storage pools belongig to the specific cluster") + @Parameter(name = ApiConstants.CLUSTER_ID, + type = CommandType.UUID, + entityType = ClusterResponse.class, + description = "list storage pools belongig to the specific cluster") private Long clusterId; @Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "the IP address for the storage pool") diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java index 3ba61780200..bac6b7c46ac 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java @@ -20,6 +20,8 @@ package org.apache.cloudstack.api.command.admin.storage; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.StorageProviderResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -54,8 +55,8 @@ public class ListStorageProvidersCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { if (getType() == null) { throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "need to specify type: either primary or image"); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java index cede60dc687..9d1196648ce 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java index 6441c938bea..50be6ba13f7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.storage; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StoragePoolResponse; -import org.apache.log4j.Logger; import com.cloud.storage.StoragePool; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java index 70045d9cde9..3b684f41a63 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.swift; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd; import org.apache.cloudstack.api.response.ImageStoreResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.storage.ImageStore; diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java index b782dc06927..fcc8e465903 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.swift; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java index 6f7321f55ee..07e111cbccd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.vm.VirtualMachine; @@ -38,7 +38,11 @@ public class DestroySystemVmCmd extends BaseAsyncCmd { private static final String s_name = "destroysystemvmresponse"; - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = SystemVmResponse.class, + required = true, + description = "The ID of the system virtual machine") private Long id; public Long getId() { diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java index 10ca470bf46..9480497cdd5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.systemvm; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachine; @@ -60,7 +61,9 @@ public class ListSystemVMsCmd extends BaseListCmd { @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "the state of the system VM") private String state; - @Parameter(name = ApiConstants.SYSTEM_VM_TYPE, type = CommandType.STRING, description = "the system VM type. Possible types are \"consoleproxy\" and \"secondarystoragevm\".") + @Parameter(name = ApiConstants.SYSTEM_VM_TYPE, + type = CommandType.STRING, + description = "the system VM type. Possible types are \"consoleproxy\" and \"secondarystoragevm\".") private String systemVmType; @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID of the system VM") @@ -118,6 +121,7 @@ public class ListSystemVMsCmd extends BaseListCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.SystemVm; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java index ec36ecce3f5..8199e683caf 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java @@ -16,15 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ManagementServerException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.VirtualMachineMigrationException; -import com.cloud.host.Host; -import com.cloud.user.Account; -import com.cloud.vm.VirtualMachine; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -34,7 +27,16 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; + +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ManagementServerException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.VirtualMachineMigrationException; +import com.cloud.host.Host; +import com.cloud.user.Account; +import com.cloud.vm.VirtualMachine; @APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class) public class MigrateSystemVMCmd extends BaseAsyncCmd { @@ -46,10 +48,18 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "destination Host ID to migrate VM to") + @Parameter(name = ApiConstants.HOST_ID, + type = CommandType.UUID, + entityType = HostResponse.class, + required = true, + description = "destination Host ID to migrate VM to") private Long hostId; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "the ID of the virtual machine") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = SystemVmResponse.class, + required = true, + description = "the ID of the virtual machine") private Long virtualMachineId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java index e6bf5fde76f..1c38b056f04 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.vm.VirtualMachine; @@ -42,7 +42,11 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = SystemVmResponse.class, + required = true, + description = "The ID of the system virtual machine") private Long id; ///////////////////////////////////////////////////// @@ -87,10 +91,12 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { return "rebooting system vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.SystemVm; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java index 7a2d6a1822d..a7c864da53d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java @@ -39,8 +39,10 @@ import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; import com.cloud.vm.VirtualMachine; -@APICommand(name = "scaleSystemVm", responseObject = SystemVmResponse.class, description = "Scale the service offering for a system vm (console proxy or secondary storage). " - + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.") +@APICommand(name = "scaleSystemVm", + responseObject = SystemVmResponse.class, + description = "Scale the service offering for a system vm (console proxy or secondary storage). " + "The system vm must be in a \"Stopped\" state for " + + "this command to take effect.") public class ScaleSystemVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName()); private static final String s_name = "changeserviceforsystemvmresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java index 3c65672dcc8..2e65928af68 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.vm.VirtualMachine; @@ -42,7 +42,11 @@ public class StartSystemVMCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = SystemVmResponse.class, + required = true, + description = "The ID of the system virtual machine") private Long id; ///////////////////////////////////////////////////// @@ -91,10 +95,12 @@ public class StartSystemVMCmd extends BaseAsyncCmd { return "starting system vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.SystemVm; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java index 1760018ace0..7709ebe5cfe 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; @@ -44,7 +44,11 @@ public class StopSystemVmCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = SystemVmResponse.class, required = true, description = "The ID of the system virtual machine") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = SystemVmResponse.class, + required = true, + description = "The ID of the system virtual machine") private Long id; @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force stop the VM. The caller knows the VM is stopped.") diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java index cbdebe11072..1357a7d8d63 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java @@ -37,7 +37,7 @@ import com.cloud.vm.VirtualMachine; @APICommand(name = "changeServiceForSystemVm", responseObject = SystemVmResponse.class, description = "Changes the service offering for a system vm (console proxy or secondary storage). " + "The system vm must be in a \"Stopped\" state for " - + "this command to take effect.") + + "this command to take effect.") public class UpgradeSystemVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName()); private static final String s_name = "changeserviceforsystemvmresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java index 507b9afc3d5..16761bab373 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.template; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java index a85d7572c01..031fc8d752a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.admin.usage; -import javax.inject.Inject; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.TrafficMonitorResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index 4e5c91a73f3..e6e18cb9ffa 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.usage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.TrafficTypeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.PhysicalNetworkTrafficType; @@ -147,8 +147,9 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { @Override public void create() throws ResourceAllocationException { - PhysicalNetworkTrafficType result = _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getXenLabel(), getKvmLabel(), - getVmwareLabel(), getSimulatorLabel(), getVlan(), getHypervLabel()); + PhysicalNetworkTrafficType result = + _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getXenLabel(), getKvmLabel(), getVmwareLabel(), + getSimulatorLabel(), getVlan(), getHypervLabel()); if (result != null) { setEntityId(result.getId()); setEntityUuid(result.getUuid()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java index d650ce6b8e0..debaf0030f1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.admin.usage; -import javax.inject.Inject; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java index 583cf715dce..111e1774268 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.usage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.TrafficTypeResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java index 11bdc864492..4fc36ab5582 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java @@ -18,12 +18,17 @@ package org.apache.cloudstack.api.command.admin.usage; import java.util.Date; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.DomainResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.user.Account; @APICommand(name = "generateUsageRecords", diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java index ef1bba787ec..a8bd1e52358 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.UsageRecordResponse; import org.apache.cloudstack.usage.Usage; -import org.apache.log4j.Logger; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java index 49cab07cefd..3592539aab4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.api.command.admin.usage; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -29,7 +29,6 @@ import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.TrafficMonitorResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java index 38d6e6c8308..3a1dfba61c8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.usage; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.TrafficTypeImplementorResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -61,7 +62,8 @@ public class ListTrafficTypeImplementorsCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { List> results = _networkService.listTrafficTypeImplementor(this); ListResponse response = new ListResponse(); List responses = new ArrayList(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java index 2ef7cb0088e..378058f04f7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.usage; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.ProviderResponse; import org.apache.cloudstack.api.response.TrafficTypeResponse; -import org.apache.log4j.Logger; import com.cloud.network.PhysicalNetworkTrafficType; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java index bc029117350..b5e445bbb53 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java @@ -18,12 +18,13 @@ package org.apache.cloudstack.api.command.admin.usage; import java.util.List; -import org.apache.cloudstack.api.APICommand; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UsageTypeResponse; + import com.cloud.user.Account; @APICommand(name = "listUsageTypes", description = "List Usage Types", responseObject = UsageTypeResponse.class) @@ -36,6 +37,7 @@ public class ListUsageTypesCmd extends BaseCmd { return s_name; } + @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index 8a560312333..2ad470ea761 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.usage; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -23,9 +25,7 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.response.TrafficTypeResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetworkTrafficType; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java index 4448a0dacb3..03512db321a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.user; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.user.Account; import com.cloud.user.User; @@ -150,8 +150,9 @@ public class CreateUserCmd extends BaseCmd { @Override public void execute() { CallContext.current().setEventDetails("UserName: " + getUserName() + ", FirstName :" + getFirstName() + ", LastName: " + getLastName()); - User user = _accountService.createUser(getUserName(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimezone(), getAccountName(), getDomainId(), - getUserUUID()); + User user = + _accountService.createUser(getUserName(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimezone(), getAccountName(), getDomainId(), + getUserUUID()); if (user != null) { UserResponse response = _responseGenerator.createUserResponse(user); response.setResponseName(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java index 02fbf4da61e..6ba382aec71 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.user.Account; import com.cloud.user.User; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java index 26af9ffccc0..599328d1c35 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java @@ -18,20 +18,19 @@ package org.apache.cloudstack.api.command.admin.user; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.User; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java index 8088f9d29e7..8d37eda36e9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java index ab6a27c5cb0..592b8285727 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.command.admin.user; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java index f22ffe7db8d..41d6acda1f4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.admin.user; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; @APICommand(name = "listUsers", description = "Lists user accounts", responseObject = UserResponse.class) public class ListUsersCmd extends BaseListAccountResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java index 1e3ddeddd86..9533004907f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.user; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.user.User; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java index 076e30ff7b4..facdc876759 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.admin.user; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.RegisterResponse; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.user.User; @@ -54,6 +55,7 @@ public class RegisterCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java index 87ddeae36d1..de6e550018a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.user; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; - import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java index 1099af04946..dbaac6e742a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vlan; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Vlan; import com.cloud.exception.ConcurrentOperationException; @@ -48,7 +49,9 @@ public class CreateVlanIpRangeCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited") + @Parameter(name = ApiConstants.ACCOUNT, + type = CommandType.STRING, + description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited") private String accountName; @Parameter(name = ApiConstants.PROJECT_ID, @@ -82,7 +85,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd { private String startIp; @Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the ID or VID of the VLAN. If not specified," - + " will be defaulted to the vlan of the network or if vlan of the network is null - to Untagged") + + " will be defaulted to the vlan of the network or if vlan of the network is null - to Untagged") private String vlan; @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID of the VLAN IP range") @@ -101,7 +104,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd { private String endIpv6; @Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING, description = "the gateway of the IPv6 network. Required " - + "for Shared networks and Isolated networks when it belongs to VPC") + + "for Shared networks and Isolated networks when it belongs to VPC") private String ip6Gateway; @Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING, description = "the CIDR of IPv6 network, must be at least /64") diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java index f52c8d7631d..2650482e9bb 100755 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vlan; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; -import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Vlan; import com.cloud.exception.ResourceAllocationException; @@ -52,7 +52,11 @@ public class DedicatePublicIpRangeCmd extends BaseCmd { @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "project who will own the VLAN") private Long projectId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "domain ID of the account owning a VLAN") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "domain ID of the account owning a VLAN") private Long domainId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java index 65b1aefaa1e..8d291309f4d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vlan; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; 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 7fede446b1a..f629af82cfc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.vlan; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -31,7 +33,6 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.dc.Vlan; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java index 88b7c7e6a51..2c160be3a73 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vlan; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; 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 3419a4d8e52..e85c2886d2d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java @@ -18,18 +18,18 @@ package org.apache.cloudstack.api.command.admin.vm; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @@ -47,7 +47,11 @@ public class AssignVMCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "id of the VM to be moved") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + required = true, + description = "id of the VM to be moved") private Long virtualMachineId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "account name of the new VM owner.") diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java index 6a8596e21f6..7b166864a28 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -86,10 +87,12 @@ public class ExpungeVMCmd extends BaseAsyncCmd { return "Expunging vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java index 7b88dfd020e..3706d5060f7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; @@ -60,7 +60,11 @@ public class MigrateVMCmd extends BaseAsyncCmd { description = "Destination Host ID to migrate VM to. Required for live migrating a VM from host to host") private Long hostId; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + required = true, + description = "the ID of the virtual machine") private Long virtualMachineId; @Parameter(name = ApiConstants.STORAGE_ID, diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java index 3d9848c0ef6..90918bfa8d8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java @@ -21,16 +21,16 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.cloudstack.api.*; - import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -39,12 +39,13 @@ import com.cloud.exception.ManagementServerException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.VirtualMachineMigrationException; import com.cloud.host.Host; -import com.cloud.storage.StoragePool; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.vm.VirtualMachine; -@APICommand(name = "migrateVirtualMachineWithVolume", description = "Attempts Migration of a VM with its volumes to a different host", responseObject = UserVmResponse.class) +@APICommand(name = "migrateVirtualMachineWithVolume", + description = "Attempts Migration of a VM with its volumes to a different host", + responseObject = UserVmResponse.class) public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName()); @@ -54,13 +55,24 @@ public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "Destination Host ID to migrate VM to.") + @Parameter(name = ApiConstants.HOST_ID, + type = CommandType.UUID, + entityType = HostResponse.class, + required = true, + description = "Destination Host ID to migrate VM to.") private Long hostId; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + required = true, + description = "the ID of the virtual machine") private Long virtualMachineId; - @Parameter(name = ApiConstants.MIGRATE_TO, type = CommandType.MAP, required = false, description = "Map of pool to which each volume should be migrated (volume/pool pair)") + @Parameter(name = ApiConstants.MIGRATE_TO, + type = CommandType.MAP, + required = false, + description = "Map of pool to which each volume should be migrated (volume/pool pair)") private Map migrateVolumeTo; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java index 52f34f86c09..abf5168ff28 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ResourceAllocationException; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java index f92511eb810..c3201f13ffc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java @@ -83,7 +83,8 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.SOURCE_NAT_SUPPORTED, type = CommandType.BOOLEAN, required = false, - description = "source NAT supported value. Default value false. If 'true' source NAT is enabled on the private gateway" + " 'false': sourcenat is not supported") + description = "source NAT supported value. Default value false. If 'true' source NAT is enabled on the private gateway" + + " 'false': sourcenat is not supported") private Boolean isSourceNat; @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, required = false, description = "the ID of the network ACL") @@ -144,8 +145,9 @@ public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd { public void create() throws ResourceAllocationException { PrivateGateway result = null; try { - result = _vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(), getBroadcastUri(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(), - getNetworkOfferingId(), getIsSourceNat(), getAclId()); + result = + _vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(), getBroadcastUri(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(), + getNetworkOfferingId(), getIsSourceNat(), getAclId()); } catch (InsufficientCapacityException ex) { s_logger.info(ex); s_logger.trace(ex); diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java index 6aec403b87e..e3c04337f73 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java @@ -61,9 +61,8 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { description = "services supported by the vpc offering") private List supportedServices; - @Parameter(name = ApiConstants.SERVICE_PROVIDER_LIST, - type = CommandType.MAP, - description = "provider to service mapping. " + "If not specified, the provider for the service will be mapped to the default provider on the physical network") + @Parameter(name = ApiConstants.SERVICE_PROVIDER_LIST, type = CommandType.MAP, description = "provider to service mapping. " + + "If not specified, the provider for the service will be mapped to the default provider on the physical network") private Map serviceProviderList; @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java index c3798edb74a..a5bb00c9ac4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.PrivateGatewayResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java index 70bff16aa7c..7abaa7d565c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VpcOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java index 4b77dc55d3d..05b6f9d6fbd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.VpcOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.vpc.VpcOffering; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java index 9cce26aeb6a..0846102652f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.zone; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.dc.DataCenter; import com.cloud.user.Account; @@ -68,7 +68,10 @@ public class CreateZoneCmd extends BaseCmd { @Parameter(name = ApiConstants.DOMAIN, type = CommandType.STRING, description = "Network domain name for the networks in the zone") private String domain; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the containing domain, null for public zones") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "the ID of the containing domain, null for public zones") private Long domainId; @Parameter(name = ApiConstants.NETWORK_TYPE, type = CommandType.STRING, required = true, description = "network type of the zone, can be Basic or Advanced") diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java index a1070622276..3e7462567e1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.admin.zone; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.user.Account; @APICommand(name = "deleteZone", description = "Deletes a Zone.", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java index 26d93e7996b..fe2bc6a7eb6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.admin.zone; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java index 25e13e20ee3..f0074c5c6da 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.zone; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.dc.DataCenter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java index adc40097b7c..36df579d2a6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java index 64c20eca97c..f6aa36c2ea0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java index 9faae8cb986..bc93d2147f7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.user.account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListDomainResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; @APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class) public class ListAccountsCmd extends BaseListDomainResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java index 1df341acdec..aa600166a6f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.account; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java index e06ba25ef45..4df658bcbb4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java @@ -67,7 +67,10 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account to associate with this IP address") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain to associate with this IP address") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "the ID of the domain to associate with this IP address") private Long domainId; @Parameter(name = ApiConstants.ZONE_ID, @@ -76,18 +79,21 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { description = "the ID of the availability zone you want to acquire an public IP address from") private Long zoneId; - @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network this ip address should be associated to.") + @Parameter(name = ApiConstants.NETWORK_ID, + type = CommandType.UUID, + entityType = NetworkResponse.class, + description = "The network this ip address should be associated to.") private Long networkId; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project") private Long projectId; - @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the ip address to " + "be associated with") + @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the ip address to " + + "be associated with") private Long vpcId; - @Parameter(name = ApiConstants.IS_PORTABLE, - type = BaseCmd.CommandType.BOOLEAN, - description = "should be set to true " + "if public IP is required to be transferable across zones, if not specified defaults to false") + @Parameter(name = ApiConstants.IS_PORTABLE, type = BaseCmd.CommandType.BOOLEAN, description = "should be set to true " + + "if public IP is required to be transferable across zones, if not specified defaults to false") private Boolean isPortable; @Parameter(name = ApiConstants.REGION_ID, @@ -168,7 +174,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { List networks = _networkService.getIsolatedNetworksOwnedByAccountInZone(getZoneId(), _accountService.getAccount(getEntityOwnerId())); if (networks.size() == 0) { String domain = _domainService.getDomain(getDomainId()).getName(); - throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + zone.getName()); + throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + + zone.getName()); } if (networks.size() < 1) { @@ -200,7 +207,8 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { if (project.getState() == Project.State.Active) { return project.getProjectAccountId(); } else { - throw new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + " as it's no longer active"); + throw new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + + " as it's no longer active"); } } else { throw new InvalidParameterValueException("Unable to find project by id"); diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java index 6d581a9ca5d..e3669be4bb0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.address; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -47,7 +47,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the id of the public ip address" - + " to disassociate") + + " to disassociate") private Long id; // unexposed parameter needed for events logging diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java index 7b7a3a7e7ad..a5c54ad2fd0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.address; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -31,7 +33,6 @@ import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.VlanIpRangeResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.IpAddress; import com.cloud.utils.Pair; @@ -159,6 +160,7 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd { this.setResponseObject(response); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.IpAddress; } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java index 2dbe8d9126b..a2542a87bc9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.affinitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.user.Account; @@ -47,7 +47,10 @@ public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an account for the affinity group. Must be used with domainId.") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "domainId of the account owning the affinity group", entityType = DomainResponse.class) + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + description = "domainId of the account owning the affinity group", + entityType = DomainResponse.class) private Long domainId; @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "optional description of the affinity group") diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java index 512f40fa841..a6cf1bb29cb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.affinitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; @@ -46,7 +46,10 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account of the affinity group. Must be specified with domain ID") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "the domain ID of account owning the affinity group", entityType = DomainResponse.class) + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + description = "the domain ID of account owning the affinity group", + entityType = DomainResponse.class) private Long domainId; @Parameter(name = ApiConstants.ID, diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java index 2219e7d8cb8..87de7f7acbd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java @@ -19,11 +19,12 @@ package org.apache.cloudstack.api.command.user.affinitygroup; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupTypeResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -42,6 +43,7 @@ public class ListAffinityGroupTypesCmd extends BaseListCmd { return s_name; } + @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java index 3c3e914f980..367dec91ce7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.affinitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; @APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class) public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd { @@ -39,7 +40,10 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "lists affinity groups by name") private String affinityGroupName; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, description = "lists affinity groups by virtual machine id", entityType = UserVmResponse.class) + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + description = "lists affinity groups by virtual machine id", + entityType = UserVmResponse.class) private Long virtualMachineId; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the affinity group by the id provided", entityType = AffinityGroupResponse.class) @@ -75,8 +79,9 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd { @Override public void execute() { - ListResponse response = _queryService.listAffinityGroups(id, affinityGroupName, affinityGroupType, virtualMachineId, this.getAccountName(), - this.getDomainId(), this.isRecursive(), this.listAll(), this.getStartIndex(), this.getPageSizeVal()); + ListResponse response = + _queryService.listAffinityGroups(id, affinityGroupName, affinityGroupType, virtualMachineId, this.getAccountName(), this.getDomainId(), this.isRecursive(), + this.listAll(), this.getStartIndex(), this.getPageSizeVal()); response.setResponseName(getCommandName()); this.setResponseObject(response); diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java index 45733cad534..7bb1c5bb4a0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java @@ -20,21 +20,21 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ACL; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -44,7 +44,7 @@ import com.cloud.uservm.UserVm; @APICommand(name = "updateVMAffinityGroup", description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the " - + "new properties to take effect.", + + "new properties to take effect.", responseObject = UserVmResponse.class) public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName()); @@ -64,7 +64,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd { collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine. " - + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter") + + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter") private List affinityGroupIdList; @ACL @@ -73,7 +73,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd { collectionType = CommandType.STRING, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups names that are going to be applied to the virtual machine." - + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter") + + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter") private List affinityGroupNameList; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java index efe1f3ef61a..ce6dc68b074 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.ConditionResponse; -import org.apache.log4j.Logger; import com.cloud.domain.Domain; import com.cloud.event.EventTypes; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java index 2ea62c1138b..55479748990 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import org.apache.cloudstack.api.response.FirewallRuleResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; @@ -49,7 +50,11 @@ public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private long lbRuleId; @Parameter(name = ApiConstants.MIN_MEMBERS, diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java index 07c673bde9d..bee1b22ea85 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -33,8 +35,6 @@ import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java index 08617aeabd5..914848a40c8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.CounterResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.as.Condition; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java index 6e24b6d8c06..1aedf574682 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScalePolicy; import com.cloud.user.Account; @@ -41,7 +41,11 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, required = true, description = "the ID of the autoscale policy") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScalePolicyResponse.class, + required = true, + description = "the ID of the autoscale policy") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java index 59043468c72..a7823b4920c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; import com.cloud.user.Account; @@ -41,7 +41,11 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmGroupResponse.class, + required = true, + description = "the ID of the autoscale group") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java index a299221d1a6..3d6d0305f88 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmProfile; import com.cloud.user.Account; @@ -41,7 +41,11 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmProfileResponse.class, required = true, description = "the ID of the autoscale profile") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmProfileResponse.class, + required = true, + description = "the ID of the autoscale profile") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java index c6c7fdccf63..0cc23195c5a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ConditionResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java index b4f73725c1f..2bd6f87b01c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; @@ -40,7 +41,11 @@ public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmGroupResponse.class, + required = true, + description = "the ID of the autoscale group") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java index 1a79cef10b0..dc89f2b0794 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.user.autoscale; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; @@ -40,7 +41,11 @@ public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmGroupResponse.class, + required = true, + description = "the ID of the autoscale group") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java index c910607335e..84ed30a25ce 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import org.apache.cloudstack.api.response.ConditionResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.network.as.AutoScalePolicy; @@ -47,7 +48,9 @@ public class ListAutoScalePoliciesCmd extends BaseListAccountResourcesCmd { @Parameter(name = ApiConstants.CONDITION_ID, type = CommandType.UUID, entityType = ConditionResponse.class, description = "the ID of the condition of the policy") private Long conditionId; - @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "the action to be executed if all the conditions evaluate to true for the specified duration.") + @Parameter(name = ApiConstants.ACTION, + type = CommandType.STRING, + description = "the action to be executed if all the conditions evaluate to true for the specified duration.") private String action; @Parameter(name = ApiConstants.VMGROUP_ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, description = "the ID of the autoscale vm group") diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java index 9c8e640e212..4eda7a80608 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java index 743210f968d..651f98703e8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; import com.cloud.network.as.AutoScaleVmProfile; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java index f94ba0e5398..015f3ed2c6a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java @@ -17,7 +17,11 @@ package org.apache.cloudstack.api.command.user.autoscale; -import com.cloud.network.as.Condition; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; @@ -26,10 +30,8 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.ConditionResponse; import org.apache.cloudstack.api.response.CounterResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.List; +import com.cloud.network.as.Condition; @APICommand(name = "listConditions", description = "List Conditions for the specific user", responseObject = ConditionResponse.class) public class ListConditionsCmd extends BaseListAccountResourcesCmd { @@ -43,7 +45,11 @@ public class ListConditionsCmd extends BaseListAccountResourcesCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ConditionResponse.class, required = false, description = "ID of the Condition.") private Long id; - @Parameter(name = ApiConstants.COUNTER_ID, type = CommandType.UUID, entityType = CounterResponse.class, required = false, description = "Counter-id of the condition.") + @Parameter(name = ApiConstants.COUNTER_ID, + type = CommandType.UUID, + entityType = CounterResponse.class, + required = false, + description = "Counter-id of the condition.") private Long counterId; @Parameter(name = ApiConstants.POLICY_ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, description = "the ID of the policy") diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java index cfafb8917b0..f503b2bc81e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java @@ -20,13 +20,14 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.CounterResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.network.as.Counter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java index f596ee9d52d..91adeb130b7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.ConditionResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScalePolicy; import com.cloud.user.Account; @@ -61,7 +61,11 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd { description = "the list of IDs of the conditions that are being evaluated on every interval") private List conditionIds; - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScalePolicyResponse.class, required = true, description = "the ID of the autoscale policy") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScalePolicyResponse.class, + required = true, + description = "the ID of the autoscale policy") private Long id; @Override diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java index c2a5303ae33..dbbd85f1c3a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; import com.cloud.user.Account; @@ -73,7 +73,11 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCmd { description = "list of scaledown autoscale policies") private List scaleDownPolicyIds; - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmGroupResponse.class, required = true, description = "the ID of the autoscale group") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmGroupResponse.class, + required = true, + description = "the ID of the autoscale group") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java index a08e07334af..f3361d82fd9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.autoscale; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmProfile; import com.cloud.user.Account; @@ -47,10 +47,17 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AutoScaleVmProfileResponse.class, required = true, description = "the ID of the autoscale vm profile") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = AutoScaleVmProfileResponse.class, + required = true, + description = "the ID of the autoscale vm profile") private Long id; - @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "the template of the auto deployed virtual machine") + @Parameter(name = ApiConstants.TEMPLATE_ID, + type = CommandType.UUID, + entityType = TemplateResponse.class, + description = "the template of the auto deployed virtual machine") private Long templateId; @Parameter(name = ApiConstants.AUTOSCALE_VM_DESTROY_TIME, diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java index f3e36b4cd39..e51f85071de 100644 --- a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.event; import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; @@ -45,17 +45,19 @@ public class ArchiveEventsCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = EventResponse.class, description = "the IDs of the events") + @Parameter(name = ApiConstants.IDS, + type = CommandType.LIST, + collectionType = CommandType.UUID, + entityType = EventResponse.class, + description = "the IDs of the events") private List ids; - @Parameter(name = ApiConstants.END_DATE, - type = CommandType.DATE, - description = "end date range to archive events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to archive events" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date endDate; - @Parameter(name = ApiConstants.START_DATE, - type = CommandType.DATE, - description = "start date range to archive events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to archive events" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date startDate; @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "archive by event type") diff --git a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java index a3981ec7b28..d00b58dd826 100644 --- a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.event; import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; @@ -45,17 +45,19 @@ public class DeleteEventsCmd extends BaseCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = EventResponse.class, description = "the IDs of the events") + @Parameter(name = ApiConstants.IDS, + type = CommandType.LIST, + collectionType = CommandType.UUID, + entityType = EventResponse.class, + description = "the IDs of the events") private List ids; - @Parameter(name = ApiConstants.END_DATE, - type = CommandType.DATE, - description = "end date range to delete events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "end date range to delete events" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date endDate; - @Parameter(name = ApiConstants.START_DATE, - type = CommandType.DATE, - description = "start date range to delete events" + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") + @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "start date range to delete events" + + " (including) this date (use format \"yyyy-MM-dd\" or the new format \"yyyy-MM-ddThh:mm:ss\")") private Date startDate; @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "delete by event type") diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java index 9cbc204b7c9..7a58d4c32ed 100644 --- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.command.user.event; import java.util.ArrayList; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.response.EventTypeResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -36,6 +37,7 @@ public class ListEventTypesCmd extends BaseCmd { return s_name; } + @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java index da3792929d9..0e45e4e86f4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.user.event; import java.util.Date; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; @APICommand(name = "listEvents", description = "A command to list events.", responseObject = EventResponse.class) public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java index 2e0a86e7054..778a18bc07c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java @@ -28,7 +28,6 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.BaseAsyncCreateCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.FirewallResponse; @@ -61,7 +60,10 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F description = "the network id of the port forwarding rule") private Long networkId; - @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.") + @Parameter(name = ApiConstants.PROTOCOL, + type = CommandType.STRING, + required = true, + description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.") private String protocol; @Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of firewall rule") @@ -242,13 +244,13 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F if (getProtocol().equalsIgnoreCase(NetUtils.ALL_PROTO)) { if (getSourcePortStart() != null && getSourcePortEnd() != null) { throw new InvalidParameterValueException("Do not pass ports to protocol ALL, porotocol ALL do not require ports. Unable to create " + - "firewall rule for the network id=" + networkId); + "firewall rule for the network id=" + networkId); } } if (getVpcId() != null) { throw new InvalidParameterValueException("Unable to create firewall rule for the network id=" + networkId + - " as firewall egress rule can be created only for non vpc networks."); + " as firewall egress rule can be created only for non vpc networks."); } try { diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index 784c4be644f..44aa26fa519 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.FirewallResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; @@ -59,7 +59,10 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal description = "the IP address id of the port forwarding rule") private Long ipAddressId; - @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.") + @Parameter(name = ApiConstants.PROTOCOL, + type = CommandType.STRING, + required = true, + description = "the protocol for the firewall rule. Valid values are TCP/UDP/ICMP.") private String protocol; @Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of firewall rule") @@ -93,6 +96,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal return protocol.trim(); } + @Override public List getSourceCidrList() { if (cidrlist != null) { return cidrlist; @@ -206,7 +210,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal if (ntwkId == null) { throw new InvalidParameterValueException("Unable to create firewall rule for the ipAddress id=" + ipAddressId + - " as ip is not associated with any network and no networkId is passed in"); + " as ip is not associated with any network and no networkId is passed in"); } return ntwkId; } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index 73e5be233ed..89dc0772562 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.firewall; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -32,8 +34,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; @@ -60,19 +60,34 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P description = "the IP address id of the port forwarding rule") private Long ipAddressId; - @Parameter(name = ApiConstants.PRIVATE_START_PORT, type = CommandType.INTEGER, required = true, description = "the starting port of port forwarding rule's private port range") + @Parameter(name = ApiConstants.PRIVATE_START_PORT, + type = CommandType.INTEGER, + required = true, + description = "the starting port of port forwarding rule's private port range") private Integer privateStartPort; - @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.") + @Parameter(name = ApiConstants.PROTOCOL, + type = CommandType.STRING, + required = true, + description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.") private String protocol; - @Parameter(name = ApiConstants.PRIVATE_END_PORT, type = CommandType.INTEGER, required = false, description = "the ending port of port forwarding rule's private port range") + @Parameter(name = ApiConstants.PRIVATE_END_PORT, + type = CommandType.INTEGER, + required = false, + description = "the ending port of port forwarding rule's private port range") private Integer privateEndPort; - @Parameter(name = ApiConstants.PUBLIC_START_PORT, type = CommandType.INTEGER, required = true, description = "the starting port of port forwarding rule's public port range") + @Parameter(name = ApiConstants.PUBLIC_START_PORT, + type = CommandType.INTEGER, + required = true, + description = "the starting port of port forwarding rule's public port range") private Integer publicStartPort; - @Parameter(name = ApiConstants.PUBLIC_END_PORT, type = CommandType.INTEGER, required = false, description = "the ending port of port forwarding rule's private port range") + @Parameter(name = ApiConstants.PUBLIC_END_PORT, + type = CommandType.INTEGER, + required = false, + description = "the ending port of port forwarding rule's private port range") private Integer publicEndPort; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, @@ -85,20 +100,21 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from") private List cidrlist; - @Parameter(name = ApiConstants.OPEN_FIREWALL, - type = CommandType.BOOLEAN, - description = "if true, firewall rule for source/end pubic port is automatically created; " - + "if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when PF" - + " rule is being created for VPC guest network 2) in all other cases defaulted to true") + @Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for source/end pubic port is automatically created; " + + "if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when PF" + + " rule is being created for VPC guest network 2) in all other cases defaulted to true") private Boolean openFirewall; @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network of the vm the Port Forwarding rule will be created for. " - + "Required when public Ip address is not associated with any Guest network yet (VPC case)") + + "Required when public Ip address is not associated with any Guest network yet (VPC case)") private Long networkId; - @Parameter(name = ApiConstants.VM_GUEST_IP, type = CommandType.STRING, required = false, description = "VM guest nic Secondary ip address for the port forwarding rule") + @Parameter(name = ApiConstants.VM_GUEST_IP, + type = CommandType.STRING, + required = false, + description = "VM guest nic Secondary ip address for the port forwarding rule") private String vmSecondaryIp; // /////////////////////////////////////////////////// @@ -126,10 +142,11 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P return virtualMachineId; } + @Override public List getSourceCidrList() { if (cidrlist != null) { throw new InvalidParameterValueException("Parameter cidrList is deprecated; if you need to open firewall " - + "rule for the specific cidr, please refer to createFirewallRule command"); + + "rule for the specific cidr, please refer to createFirewallRule command"); } return null; } @@ -264,7 +281,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P } if (ntwkId == null) { throw new InvalidParameterValueException("Unable to create port forwarding rule for the ipAddress id=" + ipAddressId + - " as ip is not associated with any network and no networkId is passed in"); + " as ip is not associated with any network and no networkId is passed in"); } return ntwkId; } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java index 5d23cc9bbab..8e7b67996be 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java @@ -17,15 +17,13 @@ package org.apache.cloudstack.api.command.user.firewall; -import org.apache.cloudstack.api.APICommand; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java index ab3298aae17..c3029b87d61 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.firewall; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java index be1a8a38b3c..c493dd08970 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java @@ -43,7 +43,11 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the port forwarding rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the port forwarding rule") private Long id; // unexposed parameter needed for events logging diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java index 71e304a7701..4ac94df50d5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java @@ -20,17 +20,16 @@ package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.APICommand; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.FirewallResponse; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + import com.cloud.network.rules.FirewallRule; import com.cloud.utils.Pair; @@ -45,21 +44,27 @@ public class ListEgressFirewallRulesCmd extends ListFirewallRulesCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.") private Long id; - @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the id network network for the egress firwall services") + @Parameter(name = ApiConstants.NETWORK_ID, + type = CommandType.UUID, + entityType = NetworkResponse.class, + description = "the id network network for the egress firwall services") private Long networkId; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// + @Override public Long getNetworkId() { return networkId; } + @Override public FirewallRule.TrafficType getTrafficType() { return FirewallRule.TrafficType.Egress; } + @Override public Long getId() { return id; } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java index bdfdd913cd6..44d26e405a4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; -import org.apache.log4j.Logger; import com.cloud.network.rules.FirewallRule; import com.cloud.utils.Pair; @@ -44,10 +45,17 @@ public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.") private Long id; - @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "the id of IP address of the firwall services") + @Parameter(name = ApiConstants.IP_ADDRESS_ID, + type = CommandType.UUID, + entityType = IPAddressResponse.class, + description = "the id of IP address of the firwall services") private Long ipAddressId; - @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list firewall rules for ceratin network", since = "4.3") + @Parameter(name = ApiConstants.NETWORK_ID, + type = CommandType.UUID, + entityType = NetworkResponse.class, + description = "list firewall rules for ceratin network", + since = "4.3") private Long networkId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java index 554ead63e68..bd8a7a1c7a4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; -import org.apache.log4j.Logger; import com.cloud.network.rules.PortForwardingRule; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java index 6ccf2ad0391..d7e380feb57 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.firewall; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; @@ -47,7 +48,10 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.PRIVATE_PORT, type = CommandType.STRING, required = true, description = "the private port of the port forwarding rule") private String privatePort; - @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, required = true, description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.") + @Parameter(name = ApiConstants.PROTOCOL, + type = CommandType.STRING, + required = true, + description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.") private String protocol; @Parameter(name = ApiConstants.IP_ADDRESS_ID, diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java index 23d6cdadc05..604f1ede0df 100644 --- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.guest; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; import org.apache.cloudstack.api.response.GuestOSCategoryResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.storage.GuestOsCategory; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java index 27b7b8553fb..287fb1e8ef5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.guest; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; import org.apache.cloudstack.api.response.GuestOSCategoryResponse; import org.apache.cloudstack.api.response.GuestOSResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; import com.cloud.storage.GuestOS; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java index 46488a0b8c8..d38c8164273 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.uservm.UserVm; @@ -46,7 +46,11 @@ public class AttachIsoCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the ISO file") private Long id; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the virtual machine") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + required = true, + description = "the ID of the virtual machine") private Long virtualMachineId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java index 42e55d4c7a0..36193182be3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; @APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject = TemplateResponse.class) public class CopyIsoCmd extends CopyTemplateCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java index df5e624ade9..91ad5f1e11a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; @@ -97,10 +97,12 @@ public class DeleteIsoCmd extends BaseAsyncCmd { return "Deleting iso " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Iso; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java index ce50b0fcf92..e40195b3185 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,9 +25,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; -import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; @@ -41,7 +41,11 @@ public class DetachIsoCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + required = true, + description = "The ID of the virtual machine") private Long virtualMachineId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java index 90744c23b1a..2fb215aea5d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,10 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InternalErrorException; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; -import com.cloud.utils.Pair; @APICommand(name = "extractIso", description = "Extracts an ISO", responseObject = ExtractResponse.class) public class ExtractIsoCmd extends BaseAsyncCmd { @@ -116,10 +115,12 @@ public class ExtractIsoCmd extends BaseAsyncCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Iso; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java index 1e91640d030..9d9e44b447a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd; import org.apache.cloudstack.api.response.TemplatePermissionsResponse; -import org.apache.log4j.Logger; import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; @@ -42,6 +43,7 @@ public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd { return Logger.getLogger(ListIsoPermissionsCmd.class.getName()); } + @Override protected boolean templateIsCorrectType(VirtualMachineTemplate template) { return template.getFormat().equals(ImageFormat.ISO); } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java index 4e555006694..3e66e52249f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java @@ -16,9 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -30,11 +28,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.template.VirtualMachineTemplate.TemplateFilter; import com.cloud.user.Account; -import com.cloud.utils.Pair; @APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class) public class ListIsosCmd extends BaseListTaggedResourcesCmd { @@ -64,12 +59,12 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.ISO_FILTER, type = CommandType.STRING, description = "possible values are \"featured\", \"self\", \"selfexecutable\",\"sharedexecutable\",\"executable\", and \"community\". " - + "* featured : templates that have been marked as featured and public. " - + "* self : templates that have been registered or created by the calling user. " - + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. " - + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. " - + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. " - + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).") + + "* featured : templates that have been marked as featured and public. " + + "* self : templates that have been registered or created by the calling user. " + + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. " + + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. " + + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. " + + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).") private String isoFilter = TemplateFilter.selfexecutable.toString(); @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list all isos by name") @@ -120,9 +115,9 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd { boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null); // Show only those that are downloaded. TemplateFilter templateFilter = TemplateFilter.valueOf(getIsoFilter()); - boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || - (templateFilter == TemplateFilter.sharedexecutable) || (templateFilter == TemplateFilter.executable && isAccountSpecific) || - (templateFilter == TemplateFilter.community); + boolean onlyReady = + (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) || + (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community); if (!onlyReady) { if (isReady() != null && isReady().booleanValue() != onlyReady) { @@ -142,6 +137,7 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Iso; } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java index a2b8a6ede12..29e3d678857 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.iso; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -32,8 +34,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.ResourceAllocationException; import com.cloud.template.VirtualMachineTemplate; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java index 64183ed2020..6a471c944f8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java index e6d5ca75385..8267b5c294a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java @@ -16,20 +16,23 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoPermissionsCmd; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; @APICommand(name = "updateIsoPermissions", description = "Updates iso permissions", responseObject = SuccessResponse.class) public class UpdateIsoPermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd { + @Override protected String getResponseName() { return "updateisopermissionsresponse"; } + @Override protected Logger getLogger() { return Logger.getLogger(UpdateIsoPermissionsCmd.class.getName()); } diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java index a24ba667223..1f9f5dbc411 100644 --- a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.command.user.job; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AsyncJobResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java index fa8b6fbe783..4ea4a588cea 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java @@ -16,15 +16,26 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import com.cloud.event.EventTypes; -import com.cloud.exception.*; -import com.cloud.network.rules.LoadBalancer; -import com.cloud.user.Account; -import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.SslCertResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; + +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.rules.LoadBalancer; +import com.cloud.user.Account; @APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a Load Balancer Rule", responseObject = SuccessResponse.class) public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd { @@ -33,15 +44,23 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd { private static final String s_name = "assignCertToLoadBalancer"; - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") Long lbRuleId; - @Parameter(name = ApiConstants.CERTIFICATE_ID, type = CommandType.UUID, entityType = SslCertResponse.class, required = true, description = "the ID of the certificate") + @Parameter(name = ApiConstants.CERTIFICATE_ID, + type = CommandType.UUID, + entityType = SslCertResponse.class, + required = true, + description = "the ID of the certificate") Long certId; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { //To change body of implemented methods use File | Settings | File Templates. if (_lbService.assignCertToLoadBalancer(getLbRuleId(), getCertId())) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java index 3db326fbbd4..bcf6200ca10 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; @@ -49,7 +49,11 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long id; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_IDS, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java index 84b69943efc..0b8d3774dfa 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; @@ -63,7 +63,10 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { description = "The guest network the Load Balancer will be created for") private Long networkId; - @Parameter(name = ApiConstants.SOURCE_PORT, type = CommandType.INTEGER, required = true, description = "the source port the network traffic will be load balanced from") + @Parameter(name = ApiConstants.SOURCE_PORT, + type = CommandType.INTEGER, + required = true, + description = "the source port the network traffic will be load balanced from") private Integer sourcePort; @Parameter(name = ApiConstants.ALGORITHM, type = CommandType.STRING, required = true, description = "load balancer algorithm (source, roundrobin, leastconn)") @@ -85,7 +88,10 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { description = "the network id of the source ip address") private Long sourceIpNetworkId; - @Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, required = true, description = "the load balancer scheme. Supported value in this release is Internal") + @Parameter(name = ApiConstants.SCHEME, + type = CommandType.STRING, + required = true, + description = "the load balancer scheme. Supported value in this release is Internal") private String scheme; ///////////////////////////////////////////////////// @@ -207,8 +213,9 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { public void create() { try { - ApplicationLoadBalancerRule result = _appLbService.createApplicationLoadBalancer(getName(), getDescription(), getScheme(), getSourceIpNetworkId(), getSourceIp(), - getSourcePort(), getInstancePort(), getAlgorithm(), getNetworkId(), getEntityOwnerId()); + ApplicationLoadBalancerRule result = + _appLbService.createApplicationLoadBalancer(getName(), getDescription(), getScheme(), getSourceIpNetworkId(), getSourceIp(), getSourcePort(), + getInstancePort(), getAlgorithm(), getNetworkId(), getEntityOwnerId()); this.setEntityId(result.getId()); this.setEntityUuid(result.getUuid()); } catch (NetworkRuleConflictException e) { diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java index 09d9289340c..5ff7239e832 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java @@ -16,30 +16,30 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import org.apache.cloudstack.api.response.FirewallRuleResponse; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCreateCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.LBHealthCheckResponse; +import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.HealthCheckPolicy; - -import org.apache.cloudstack.api.response.LBHealthCheckResponse; -import org.apache.cloudstack.context.CallContext; - import com.cloud.network.rules.LoadBalancer; import com.cloud.user.Account; -@APICommand(name = "createLBHealthCheckPolicy", description = "Creates a Load Balancer healthcheck policy ", responseObject = LBHealthCheckResponse.class, since = "4.2.0") +@APICommand(name = "createLBHealthCheckPolicy", + description = "Creates a Load Balancer healthcheck policy ", + responseObject = LBHealthCheckResponse.class, + since = "4.2.0") @SuppressWarnings("rawtypes") public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateLBHealthCheckPolicyCmd.class.getName()); @@ -50,7 +50,11 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long lbRuleId; @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer HealthCheck policy") diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java index 3649d1a124e..159fcf542d6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.LBStickinessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; @@ -51,7 +51,11 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long lbRuleId; @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the LB Stickiness policy") diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index c7d7618c564..764e3793728 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -33,8 +35,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.event.EventTypes; @@ -93,14 +93,14 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L description = "the public port from where the network traffic will be load balanced from") private Integer publicPort; - @Parameter(name = ApiConstants.OPEN_FIREWALL, - type = CommandType.BOOLEAN, - description = "if true, firewall rule for" - + " source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB" - + " rule is being created for VPC guest network 2) in all other cases defaulted to true") + @Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for" + + " source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB" + + " rule is being created for VPC guest network 2) in all other cases defaulted to true") private Boolean openFirewall; - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the load balancer. Must be used with the domainId parameter.") + @Parameter(name = ApiConstants.ACCOUNT, + type = CommandType.STRING, + description = "the account associated with the load balancer. Must be used with the domainId parameter.") private String accountName; @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the load balancer") @@ -109,10 +109,8 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from") private List cidrlist; - @Parameter(name = ApiConstants.NETWORK_ID, - type = CommandType.UUID, - entityType = NetworkResponse.class, - description = "The guest network this " + "rule will be created for. Required when public Ip address is not associated with any Guest network yet (VPC case)") + @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The guest network this " + + "rule will be created for. Required when public Ip address is not associated with any Guest network yet (VPC case)") private Long networkId; @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "The protocol for the LB") @@ -183,7 +181,8 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L List networks = _networkService.getIsolatedNetworksOwnedByAccountInZone(getZoneId(), _accountService.getAccount(getEntityOwnerId())); if (networks.size() == 0) { String domain = _domainService.getDomain(getDomainId()).getName(); - throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + zone.getName()); + throw new InvalidParameterValueException("Account name=" + getAccountName() + " domain=" + domain + " doesn't have virtual networks in zone=" + + zone.getName()); } if (networks.size() < 1) { @@ -300,8 +299,9 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L "Parameter cidrList is deprecated; if you need to open firewall rule for the specific cidr, please refer to createFirewallRule command"); } try { - LoadBalancer result = _lbService.createPublicLoadBalancerRule(getXid(), getName(), getDescription(), getSourcePortStart(), getSourcePortEnd(), getDefaultPortStart(), - getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(), getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol()); + LoadBalancer result = + _lbService.createPublicLoadBalancerRule(getXid(), getName(), getDescription(), getSourcePortStart(), getSourcePortEnd(), getDefaultPortStart(), + getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(), getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol()); this.setEntityId(result.getId()); this.setEntityUuid(result.getUuid()); } catch (NetworkRuleConflictException e) { diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java index f5784619403..0b53d53f808 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java index e1032a2589e..d625ed571e4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java @@ -16,16 +16,15 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import org.apache.cloudstack.api.response.LBHealthCheckResponse; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.LBHealthCheckResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java index 9c0f42927e5..c4f72d9742b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.LBStickinessResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; @@ -42,7 +42,11 @@ public class DeleteLBStickinessPolicyCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBStickinessResponse.class, required = true, description = "the ID of the LB stickiness policy") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = LBStickinessResponse.class, + required = true, + description = "the ID of the LB stickiness policy") private Long id; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index fea84f43392..1dc3cd17604 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; @@ -42,7 +42,11 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java index 4b498cabc31..d5683b0b198 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java @@ -16,16 +16,26 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import com.cloud.network.lb.CertService; -import org.apache.cloudstack.api.response.SslCertResponse; -import com.cloud.exception.*; -import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; +import javax.inject.Inject; + import org.apache.log4j.Logger; -import javax.inject.Inject; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.SslCertResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.lb.CertService; +import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteSslCert", description = "Delete a certificate to cloudstack", responseObject = SuccessResponse.class) public class DeleteSslCertCmd extends BaseCmd { @@ -56,8 +66,8 @@ public class DeleteSslCertCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { _certService.deleteSslCert(this); SuccessResponse rsp = new SuccessResponse(); diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java index 9c13022cb04..05572c81b13 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancerContainer.Scheme; @@ -53,7 +54,10 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd @Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source ip address of the Load Balancer") private String sourceIp; - @Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the network id of the source ip address") + @Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID, + type = CommandType.UUID, + entityType = NetworkResponse.class, + description = "the network id of the source ip address") private Long sourceIpNetworkId; @Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, description = "the scheme of the Load Balancer. Supported value is Internal in the current release") @@ -116,7 +120,8 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd ListResponse response = new ListResponse(); List lbResponses = new ArrayList(); for (ApplicationLoadBalancerRule loadBalancer : loadBalancers.first()) { - ApplicationLoadBalancerResponse lbResponse = _responseGenerator.createLoadBalancerContainerReponse(loadBalancer, _lbService.getLbInstances(loadBalancer.getId())); + ApplicationLoadBalancerResponse lbResponse = + _responseGenerator.createLoadBalancerContainerReponse(loadBalancer, _lbService.getLbInstances(loadBalancer.getId())); lbResponse.setObjectName("loadbalancer"); lbResponses.add(lbResponse); } diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java index c28685b262e..8aa286fb3d7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java @@ -19,22 +19,18 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.response.FirewallRuleResponse; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.LBHealthCheckResponse; -import org.apache.cloudstack.api.response.LBStickinessResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.context.CallContext; import com.cloud.network.rules.HealthCheckPolicy; import com.cloud.network.rules.LoadBalancer; -import com.cloud.user.Account; @APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer HealthCheck policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0") public class ListLBHealthCheckPoliciesCmd extends BaseListCmd { @@ -45,7 +41,11 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long lbRuleId; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java index df5bb3c49c5..ade487881b0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.LBStickinessResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.StickinessPolicy; import com.cloud.user.Account; @@ -43,7 +43,11 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd { // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long lbRuleId; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java index 140cd2979fb..2a39e1ac073 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java @@ -17,9 +17,10 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -27,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; @@ -49,7 +49,11 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd { description = "true if listing all virtual machines currently applied to the load balancer rule; default is true") private Boolean applied; - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java index 56fd1fe9542..663f9910098 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.response.LoadBalancerResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.rules.LoadBalancer; import com.cloud.utils.Pair; @@ -51,7 +52,10 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the load balancer rule") private String loadBalancerRuleName; - @Parameter(name = ApiConstants.PUBLIC_IP_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "the public IP address id of the load balancer rule ") + @Parameter(name = ApiConstants.PUBLIC_IP_ID, + type = CommandType.UUID, + entityType = IPAddressResponse.class, + description = "the public IP address id of the load balancer rule ") private Long publicIpId; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java index cbdab714387..7f8118af3bc 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java @@ -16,21 +16,24 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import org.apache.cloudstack.api.response.FirewallRuleResponse; -import org.apache.cloudstack.api.response.SslCertResponse; -import com.cloud.network.lb.CertService; -import com.cloud.utils.exception.CloudRuntimeException; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SslCertResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; -import javax.inject.Inject; -import java.util.List; +import com.cloud.network.lb.CertService; +import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class) public class ListSslCertsCmd extends BaseCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java index 5dc52877154..e92d20801c4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java @@ -16,14 +16,25 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import com.cloud.event.EventTypes; -import com.cloud.exception.*; -import com.cloud.network.rules.LoadBalancer; -import com.cloud.user.Account; -import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; + +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.rules.LoadBalancer; +import com.cloud.user.Account; @APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a Load Balancer Rule", responseObject = SuccessResponse.class) public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd { @@ -32,12 +43,16 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd { private static final String s_name = "removeCertFromLoadBalancer"; - @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer rule") + @Parameter(name = ApiConstants.LBID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "the ID of the load balancer rule") Long lbRuleId; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { boolean result = _lbService.removeCertFromLoadBalancer(getLbRuleId()); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java index 1978ee18017..5027ad30fa5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; @@ -49,7 +49,11 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "The ID of the load balancer rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = FirewallRuleResponse.class, + required = true, + description = "The ID of the load balancer rule") private Long id; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_IDS, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java index dd7384bbda7..d68167d425d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.LoadBalancerResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java index 4c6db6eb31d..00bd01343dd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java @@ -16,14 +16,25 @@ // under the License. package org.apache.cloudstack.api.command.user.loadbalancer; -import org.apache.cloudstack.api.response.SslCertResponse; -import com.cloud.exception.*; -import com.cloud.network.lb.CertService; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.context.CallContext; +import javax.inject.Inject; + import org.apache.log4j.Logger; -import javax.inject.Inject; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.SslCertResponse; +import org.apache.cloudstack.context.CallContext; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.lb.CertService; @APICommand(name = "uploadSslCert", description = "Upload a certificate to cloudstack", responseObject = SslCertResponse.class) public class UploadSslCertCmd extends BaseCmd { @@ -75,8 +86,8 @@ public class UploadSslCertCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { SslCertResponse response = _certService.uploadSslCert(this); diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 69902d6eac9..0917d526b13 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.nat; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.IpForwardingRuleResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java index 17325d3040e..351d3ae2c2b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.nat; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientAddressCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java index 1b911731044..832cbc2d06d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.nat; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; @@ -45,27 +46,24 @@ public class EnableStaticNatCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IP_ADDRESS_ID, - type = CommandType.UUID, - entityType = IPAddressResponse.class, - required = true, - description = "the public IP " + "address id for which static nat feature is being enabled") + @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the public IP " + + "address id for which static nat feature is being enabled") private Long ipAddressId; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, - type = CommandType.UUID, - entityType = UserVmResponse.class, - required = true, - description = "the ID of " + "the virtual machine for enabling static nat feature") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of " + + "the virtual machine for enabling static nat feature") private Long virtualMachineId; @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network of the vm the static nat will be enabled for." - + " Required when public Ip address is not associated with any Guest network yet (VPC case)") + + " Required when public Ip address is not associated with any Guest network yet (VPC case)") private Long networkId; - @Parameter(name = ApiConstants.VM_GUEST_IP, type = CommandType.STRING, required = false, description = "VM guest nic Secondary ip address for the port forwarding rule") + @Parameter(name = ApiConstants.VM_GUEST_IP, + type = CommandType.STRING, + required = false, + description = "VM guest nic Secondary ip address for the port forwarding rule") private String vmSecondaryIp; ///////////////////////////////////////////////////// @@ -104,7 +102,7 @@ public class EnableStaticNatCmd extends BaseCmd { if (ntwkId == null) { throw new InvalidParameterValueException("Unable to enable static nat for the ipAddress id=" + ipAddressId + - " as ip is not associated with any network and no networkId is passed in"); + " as ip is not associated with any network and no networkId is passed in"); } return ntwkId; } diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java index 08d45f7a49d..dca1c2379e5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.nat; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.IpForwardingRuleResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.StaticNatRule; @@ -44,13 +45,19 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "list the rule belonging to this public ip address") + @Parameter(name = ApiConstants.IP_ADDRESS_ID, + type = CommandType.UUID, + entityType = IPAddressResponse.class, + description = "list the rule belonging to this public ip address") private Long publicIpAddressId; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.") private Long id; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "Lists all rules applied to the specified Vm.") + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + entityType = UserVmResponse.class, + description = "Lists all rules applied to the specified Vm.") private Long vmId; ///////////////////////////////////////////////////// @@ -79,8 +86,9 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources @Override public void execute() { - Pair, Integer> result = _rulesService.searchStaticNatRules(publicIpAddressId, id, vmId, this.getStartIndex(), this.getPageSizeVal(), - this.getAccountName(), this.getDomainId(), this.getProjectId(), this.isRecursive(), this.listAll()); + Pair, Integer> result = + _rulesService.searchStaticNatRules(publicIpAddressId, id, vmId, this.getStartIndex(), this.getPageSizeVal(), this.getAccountName(), this.getDomainId(), + this.getProjectId(), this.isRecursive(), this.listAll()); ListResponse response = new ListResponse(); List ipForwardingResponses = new ArrayList(); for (FirewallRule rule : result.first()) { diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 8d2aa25ad10..9934a4fefcc 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java @@ -40,7 +40,9 @@ import com.cloud.network.vpc.NetworkACLItem; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; -@APICommand(name = "createNetworkACL", description = "Creates a ACL rule in the given network (the network has to belong to VPC)", responseObject = NetworkACLItemResponse.class) +@APICommand(name = "createNetworkACL", + description = "Creates a ACL rule in the given network (the network has to belong to VPC)", + responseObject = NetworkACLItemResponse.class) public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName()); @@ -71,14 +73,20 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this icmp message") private Integer icmpCode; - @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The network of the vm the ACL will be created for") + @Parameter(name = ApiConstants.NETWORK_ID, + type = CommandType.UUID, + entityType = NetworkResponse.class, + description = "The network of the vm the ACL will be created for") private Long networkId; - @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "The network of the vm the ACL will be created for") + @Parameter(name = ApiConstants.ACL_ID, + type = CommandType.UUID, + entityType = NetworkACLResponse.class, + description = "The network of the vm the ACL will be created for") private Long aclId; @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," - + "can be Ingress or Egress, defaulted to Ingress if not specified") + + "can be Ingress or Egress, defaulted to Ingress if not specified") private String trafficType; @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for") diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java index 3760337ef49..c1e56ebd638 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java @@ -75,18 +75,18 @@ public class CreateNetworkCmd extends BaseCmd { private Long physicalNetworkId; @Parameter(name = ApiConstants.GATEWAY, type = CommandType.STRING, description = "the gateway of the network. Required " - + "for Shared networks and Isolated networks when it belongs to VPC") + + "for Shared networks and Isolated networks when it belongs to VPC") private String gateway; @Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, description = "the netmask of the network. Required " - + "for Shared networks and Isolated networks when it belongs to VPC") + + "for Shared networks and Isolated networks when it belongs to VPC") private String netmask; @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the beginning IP address in the network IP range") private String startIp; @Parameter(name = ApiConstants.END_IP, type = CommandType.STRING, description = "the ending IP address in the network IP" - + " range. If not specified, will be defaulted to startIP") + + " range. If not specified, will be defaulted to startIP") private String endIp; @Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "the ID or VID of the network") @@ -98,10 +98,9 @@ public class CreateNetworkCmd extends BaseCmd { @Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "network domain") private String networkDomain; - @Parameter(name = ApiConstants.ACL_TYPE, - type = CommandType.STRING, - description = "Access control type; supported values" + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all Isolated networks" - + " - Account. Account means that only the account owner can use the network, domain - all accouns in the domain can use the network") + @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "Access control type; supported values" + + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all Isolated networks" + + " - Account. Account means that only the account owner can use the network, domain - all accouns in the domain can use the network") private String aclType; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the network") @@ -116,7 +115,7 @@ public class CreateNetworkCmd extends BaseCmd { @Parameter(name = ApiConstants.SUBDOMAIN_ACCESS, type = CommandType.BOOLEAN, description = "Defines whether to allow" - + " subdomains to use networks dedicated to their parent domain(s). Should be used with aclType=Domain, defaulted to allow.subdomain.network.access global config if not specified") + + " subdomains to use networks dedicated to their parent domain(s). Should be used with aclType=Domain, defaulted to allow.subdomain.network.access global config if not specified") private Boolean subdomainAccess; @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC network belongs to") @@ -129,13 +128,15 @@ public class CreateNetworkCmd extends BaseCmd { private String endIpv6; @Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING, description = "the gateway of the IPv6 network. Required " - + "for Shared networks and Isolated networks when it belongs to VPC") + + "for Shared networks and Isolated networks when it belongs to VPC") private String ip6Gateway; @Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING, description = "the CIDR of IPv6 network, must be at least /64") private String ip6Cidr; - @Parameter(name = ApiConstants.DISPLAY_NETWORK, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the network to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_NETWORK, + type = CommandType.BOOLEAN, + description = "an optional field, whether to the display the network to the end user or not.") private Boolean displayNetwork; @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "Network ACL Id associated for the network") diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java index 0fd5864017e..a48e01b0d36 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java index d2081fb970e..6dd59659116 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java @@ -16,8 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.user.network; -import com.cloud.network.vpc.NetworkACL; -import com.cloud.utils.Pair; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,10 +29,9 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkACLResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.List; +import com.cloud.network.vpc.NetworkACL; +import com.cloud.utils.Pair; @APICommand(name = "listNetworkACLLists", description = "Lists all network ACLs", responseObject = NetworkACLResponse.class) public class ListNetworkACLListsCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java index a538439b6d0..0aa319a6bfe 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java @@ -19,15 +19,19 @@ package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; -import com.cloud.network.vpc.NetworkACLItem; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.response.*; -import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkACLItemResponse; +import org.apache.cloudstack.api.response.NetworkACLResponse; +import org.apache.cloudstack.api.response.NetworkResponse; -import com.cloud.network.rules.FirewallRule; +import com.cloud.network.vpc.NetworkACLItem; import com.cloud.utils.Pair; @APICommand(name = "listNetworkACLs", description = "Lists all network ACL items", responseObject = NetworkACLItemResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java index 622e0808cbd..2c2b1e17a8f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkOfferingResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.offering.NetworkOffering; @@ -89,7 +90,9 @@ public class ListNetworkOfferingsCmd extends BaseListCmd { description = "true if need to list only netwok offerings where source nat is supported, false otherwise") private Boolean sourceNatSupported; - @Parameter(name = ApiConstants.SPECIFY_IP_RANGES, type = CommandType.BOOLEAN, description = "true if need to list only network offerings which support specifying ip ranges") + @Parameter(name = ApiConstants.SPECIFY_IP_RANGES, + type = CommandType.BOOLEAN, + description = "true if need to list only network offerings which support specifying ip ranges") private Boolean specifyIpRanges; @Parameter(name = ApiConstants.TAGS, type = CommandType.STRING, description = "list network offerings by tags", length = 4096) diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java index 80d7848d265..fa27a4ad212 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.Network; @@ -52,16 +53,24 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.IS_SYSTEM, type = CommandType.BOOLEAN, description = "true if network is system, false otherwise") private Boolean isSystem; - @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "list networks by ACL (access control list) type. Supported values are Account and Domain") + @Parameter(name = ApiConstants.ACL_TYPE, + type = CommandType.STRING, + description = "list networks by ACL (access control list) type. Supported values are Account and Domain") private String aclType; @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "type of the traffic") private String trafficType; - @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, description = "list networks by physical network id") + @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, + type = CommandType.UUID, + entityType = PhysicalNetworkResponse.class, + description = "list networks by physical network id") private Long physicalNetworkId; - @Parameter(name = ApiConstants.SUPPORTED_SERVICES, type = CommandType.LIST, collectionType = CommandType.STRING, description = "list networks supporting certain services") + @Parameter(name = ApiConstants.SUPPORTED_SERVICES, + type = CommandType.LIST, + collectionType = CommandType.STRING, + description = "list networks supporting certain services") private List supportedServices; @Parameter(name = ApiConstants.RESTART_REQUIRED, type = CommandType.BOOLEAN, description = "list networks by restartRequired") diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java index dc4cf647ce9..de1f163ae0b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java @@ -16,21 +16,23 @@ // under the License. package org.apache.cloudstack.api.command.user.network; -import com.cloud.event.EventTypes; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.vpc.NetworkACL; -import com.cloud.network.vpc.Vpc; -import com.cloud.user.Account; +import org.apache.log4j.Logger; -import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkACLResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.PrivateGatewayResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; +import com.cloud.event.EventTypes; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; @APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a Network or private gateway", responseObject = SuccessResponse.class) public class ReplaceNetworkACLListCmd extends BaseAsyncCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java index 8caf07632e4..cd508ffbb11 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -106,6 +107,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd { return id; } + @Override public String getEventDescription() { return "Restarting network: " + getNetworkId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java index 2e38e492836..1e559c2da7d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java @@ -16,23 +16,23 @@ // under the License. package org.apache.cloudstack.api.command.user.network; -import com.cloud.event.EventTypes; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.vpc.NetworkACLItem; -import com.cloud.user.Account; -import com.cloud.utils.net.NetUtils; - -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.NetworkACLItemResponse; -import org.apache.cloudstack.api.response.NetworkACLResponse; -import org.apache.cloudstack.api.response.NetworkResponse; -import org.apache.cloudstack.context.CallContext; +import java.util.List; import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.List; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.NetworkACLItemResponse; +import org.apache.cloudstack.context.CallContext; + +import com.cloud.event.EventTypes; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.vpc.NetworkACLItem; +import com.cloud.user.Account; @APICommand(name = "updateNetworkACLItem", description = "Updates ACL Item with specified Id", responseObject = NetworkACLItemResponse.class) public class UpdateNetworkACLItemCmd extends BaseAsyncCmd { @@ -44,10 +44,16 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkACLItemResponse.class, required = true, description = "the ID of the network ACL Item") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = NetworkACLItemResponse.class, + required = true, + description = "the ID of the network ACL Item") private Long id; - @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") + @Parameter(name = ApiConstants.PROTOCOL, + type = CommandType.STRING, + description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number") private String protocol; @Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "the starting port of ACL") @@ -66,7 +72,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd { private Integer icmpCode; @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL," - + "can be Ingress or Egress, defaulted to Ingress if not specified") + + "can be Ingress or Egress, defaulted to Ingress if not specified") private String trafficType; @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for") @@ -157,8 +163,9 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCmd { @Override public void execute() throws ResourceUnavailableException { CallContext.current().setEventDetails("Rule Id: " + getId()); - NetworkACLItem aclItem = _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(), - getSourcePortStart(), getSourcePortEnd(), getIcmpCode(), getIcmpType()); + NetworkACLItem aclItem = + _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(), getSourcePortStart(), + getSourcePortEnd(), getIcmpCode(), getIcmpType()); if (aclItem == null) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network ACL Item"); } diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java index 33e8a3c9b07..2091102f40c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.network; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.NetworkOfferingResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -67,7 +67,9 @@ public class UpdateNetworkCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.GUEST_VM_CIDR, type = CommandType.STRING, description = "CIDR for Guest VMs,Cloudstack allocates IPs to Guest VMs only from this CIDR") private String guestVmCidr; - @Parameter(name = ApiConstants.DISPLAY_NETWORK, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the network to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_NETWORK, + type = CommandType.BOOLEAN, + description = "an optional field, whether to the display the network to the end user or not.") private Boolean displayNetwork; ///////////////////////////////////////////////////// @@ -137,8 +139,9 @@ public class UpdateNetworkCmd extends BaseAsyncCmd { throw new InvalidParameterValueException("Couldn't find network by id"); } - Network result = _networkService.updateGuestNetwork(getId(), getNetworkName(), getDisplayText(), callerAccount, callerUser, getNetworkDomain(), getNetworkOfferingId(), - getChangeCidr(), getGuestVmCidr(), getDisplayNetwork()); + Network result = + _networkService.updateGuestNetwork(getId(), getNetworkName(), getDisplayText(), callerAccount, callerUser, getNetworkDomain(), getNetworkOfferingId(), + getChangeCidr(), getGuestVmCidr(), getDisplayNetwork()); if (result != null) { NetworkResponse response = _responseGenerator.createNetworkResponse(result); diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java index 6b9a5e2ff3d..954b64e2a41 100644 --- a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java @@ -16,20 +16,15 @@ // under the License. package org.apache.cloudstack.api.command.user.offering; -import java.util.ArrayList; -import java.util.List; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.response.AsyncJobResponse; import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; - -import com.cloud.offering.DiskOffering; @APICommand(name = "listDiskOfferings", description = "Lists all available disk offerings.", responseObject = DiskOfferingResponse.class) public class ListDiskOfferingsCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index 4c1f5e6b676..08c69e830c2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java @@ -16,10 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.offering; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -29,9 +26,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; - -import com.cloud.exception.InvalidParameterValueException; @APICommand(name = "listServiceOfferings", description = "Lists all available service offerings.", responseObject = ServiceOfferingResponse.class) public class ListServiceOfferingsCmd extends BaseListCmd { @@ -55,7 +49,10 @@ public class ListServiceOfferingsCmd extends BaseListCmd { description = "the ID of the virtual machine. Pass this in if you want to see the available service offering that a virtual machine can be changed to.") private Long virtualMachineId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain associated with the service offering") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "the ID of the domain associated with the service offering") private Long domainId; @Parameter(name = ApiConstants.IS_SYSTEM_OFFERING, type = CommandType.BOOLEAN, description = "is this a system vm offering") diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java index 75e469ddeab..66c64a6e3f9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java index ecd33ac10fc..dcb83a89031 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java index 1b87ac65903..88205e856bc 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java index ba3fc19eda5..9d4d8383283 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectInvitationResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java index 41d0975f1df..0e9e7ae4aeb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProjectInvitationResponse; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; @APICommand(name = "listProjectInvitations", description = "Lists projects and provides detailed information for listed projects", diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java index 99d5421126e..2cf610634b7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java @@ -21,17 +21,21 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; -@APICommand(name = "listProjects", description = "Lists projects and provides detailed information for listed projects", responseObject = ProjectResponse.class, since = "3.0.0") +@APICommand(name = "listProjects", + description = "Lists projects and provides detailed information for listed projects", + responseObject = ProjectResponse.class, + since = "3.0.0") public class ListProjectsCmd extends BaseListAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListProjectsCmd.class.getName()); private static final String s_name = "listprojectsresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java index c1d073af9b0..c2a1885472d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java index e02ef67f203..78903bf80e2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java index 3b8131f3391..dda7b5400ba 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.project; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -45,7 +45,9 @@ public class UpdateProjectInvitationCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account that is joining the project") private String accountName; - @Parameter(name = ApiConstants.TOKEN, type = CommandType.STRING, description = "list invitations for specified account; this parameter has to be specified with domainId") + @Parameter(name = ApiConstants.TOKEN, + type = CommandType.STRING, + description = "list invitations for specified account; this parameter has to be specified with domainId") private String token; @Parameter(name = ApiConstants.ACCEPT, type = CommandType.BOOLEAN, description = "if true, accept the invitation, decline if false. True by default") diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java index f4af27f4129..c369b9cf6f3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.RegionService; -import org.apache.log4j.Logger; @APICommand(name = "listRegions", description = "Lists Regions", responseObject = RegionResponse.class) public class ListRegionsCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java index aedbe4a44c4..1fe73b555e1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java @@ -17,6 +17,27 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; + import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; @@ -26,23 +47,6 @@ import com.cloud.user.Account; import com.cloud.utils.StringUtils; import com.cloud.utils.db.EntityManager; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.FirewallRuleResponse; -import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; - -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.UUID; - @APICommand(name = "assignToGlobalLoadBalancerRule", description = "Assign load balancer rule or list of load " + "balancer rules to a global load balancer rules.", responseObject = SuccessResponse.class) @@ -77,7 +81,7 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.GSLB_LBRULE_WEIGHT_MAP, type = CommandType.MAP, description = "Map of LB rule id's and corresponding weights (between 1-100) in the GSLB rule, if not specified weight of " - + "a LB rule is defaulted to 1. Specified as 'gslblbruleweightsmap[0].loadbalancerid=UUID" + "&gslblbruleweightsmap[0].weight=10'", + + "a LB rule is defaulted to 1. Specified as 'gslblbruleweightsmap[0].loadbalancerid=UUID" + "&gslblbruleweightsmap[0].weight=10'", required = false) private Map gslbLbRuleWieghtMap; @@ -156,7 +160,8 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() { - CallContext.current().setEventDetails("Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ",")); + CallContext.current().setEventDetails( + "Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ",")); boolean result = _gslbService.assignToGlobalLoadBalancerRule(this); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java index d67dd0d3192..bf2d86f50c9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java @@ -17,21 +17,27 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; -import com.cloud.event.EventTypes; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.region.ha.GlobalLoadBalancerRule; -import com.cloud.region.ha.GlobalLoadBalancingRulesService; +import javax.inject.Inject; -import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiCommandJobType; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCreateCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - -import javax.inject.Inject; +import com.cloud.event.EventTypes; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.region.ha.GlobalLoadBalancerRule; +import com.cloud.region.ha.GlobalLoadBalancingRulesService; @APICommand(name = "createGlobalLoadBalancerRule", description = "Creates a global load balancer rule", responseObject = GlobalLoadBalancerResponse.class) public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd { @@ -69,7 +75,7 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd { type = CommandType.STRING, required = false, description = "load balancer algorithm (roundrobin, leastconn, proximity) " - + "that method is used to distribute traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'") + + "that method is used to distribute traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'") private String algorithm; @Parameter(name = ApiConstants.GSLB_STICKY_SESSION_METHOD, diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java index 4401a5dda33..2e96965bdce 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java @@ -17,19 +17,25 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; -import com.cloud.event.EventTypes; -import com.cloud.region.ha.GlobalLoadBalancerRule; -import com.cloud.region.ha.GlobalLoadBalancingRulesService; -import com.cloud.user.Account; +import javax.inject.Inject; -import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiCommandJobType; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - -import javax.inject.Inject; +import com.cloud.event.EventTypes; +import com.cloud.region.ha.GlobalLoadBalancerRule; +import com.cloud.region.ha.GlobalLoadBalancingRulesService; +import com.cloud.user.Account; @APICommand(name = "deleteGlobalLoadBalancerRule", description = "Deletes a global load balancer rule.", responseObject = SuccessResponse.class) public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java index ab62a412765..f37aba2ac09 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java @@ -17,8 +17,13 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; -import com.cloud.region.ha.GlobalLoadBalancerRule; -import com.cloud.region.ha.GlobalLoadBalancingRulesService; +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; @@ -26,11 +31,9 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.RegionResponse; -import org.apache.log4j.Logger; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; +import com.cloud.region.ha.GlobalLoadBalancerRule; +import com.cloud.region.ha.GlobalLoadBalancingRulesService; @APICommand(name = "listGlobalLoadBalancerRules", description = "Lists load balancer rules.", responseObject = GlobalLoadBalancerResponse.class) public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java index 2374a5d7579..b30f4d8d546 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java @@ -17,6 +17,23 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; + import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.region.ha.GlobalLoadBalancerRule; @@ -24,18 +41,6 @@ import com.cloud.region.ha.GlobalLoadBalancingRulesService; import com.cloud.user.Account; import com.cloud.utils.StringUtils; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.FirewallRuleResponse; -import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; - -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -import java.util.List; - @APICommand(name = "removeFromGlobalLoadBalancerRule", description = "Removes a load balancer rule association with" + " global load balancer rule", responseObject = SuccessResponse.class) @@ -48,7 +53,11 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GlobalLoadBalancerResponse.class, required = true, description = "The ID of the load balancer rule") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = GlobalLoadBalancerResponse.class, + required = true, + description = "The ID of the load balancer rule") private Long id; @Parameter(name = ApiConstants.LOAD_BALANCER_RULE_LIST, @@ -104,7 +113,8 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() { - CallContext.current().setEventDetails("Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ",")); + CallContext.current().setEventDetails( + "Global Load balancer rule Id: " + getGlobalLoadBalancerRuleId() + " VmIds: " + StringUtils.join(getLoadBalancerRulesIds(), ",")); boolean result = _gslbService.removeFromGlobalLoadBalancerRule(this); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java index 015d97df427..e8c5326c604 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java @@ -17,16 +17,22 @@ package org.apache.cloudstack.api.command.user.region.ha.gslb; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; + import com.cloud.event.EventTypes; import com.cloud.region.ha.GlobalLoadBalancerRule; import com.cloud.region.ha.GlobalLoadBalancingRulesService; import com.cloud.user.Account; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; -import org.apache.cloudstack.api.response.LoadBalancerResponse; -import org.apache.log4j.Logger; - -import javax.inject.Inject; @APICommand(name = "updateGlobalLoadBalancerRule", description = "update global load balancer rules.", responseObject = GlobalLoadBalancerResponse.class) public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @@ -52,7 +58,7 @@ public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { type = CommandType.STRING, required = false, description = "load balancer algorithm (roundrobin, leastconn, proximity) " - + "that is used to distributed traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'") + + "that is used to distributed traffic across the zones participating in global server load balancing, if not specified defaults to 'round robin'") private String algorithm; @Parameter(name = ApiConstants.GSLB_STICKY_SESSION_METHOD, diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java index 181f804ea9a..ccaca2dbbcc 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.resource; import java.util.ArrayList; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.CloudIdentifierResponse; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -39,7 +40,11 @@ public class GetCloudIdentifierCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.USER_ID, type = CommandType.UUID, entityType = UserResponse.class, required = true, description = "the user ID for the cloud identifier") + @Parameter(name = ApiConstants.USER_ID, + type = CommandType.UUID, + entityType = UserResponse.class, + required = true, + description = "the user ID for the cloud identifier") private Long userid; ///////////////////////////////////////////////////// @@ -54,6 +59,7 @@ public class GetCloudIdentifierCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java index a2c84dedcca..5e546f4dd11 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.resource; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import org.apache.cloudstack.api.response.HypervisorResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java index 6c35387d516..ba3cfc8d951 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java @@ -19,16 +19,16 @@ package org.apache.cloudstack.api.command.user.resource; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ResourceLimitResponse; -import org.apache.log4j.Logger; import com.cloud.configuration.ResourceLimit; -import com.cloud.configuration.Resource.ResourceOwnerType; @APICommand(name = "listResourceLimits", description = "Lists resource limits.", responseObject = ResourceLimitResponse.class) public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd { @@ -43,16 +43,14 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd @Parameter(name = ApiConstants.ID, type = CommandType.LONG, description = "Lists resource limits by ID.") private Long id; - @Parameter(name = ApiConstants.RESOURCE_TYPE, - type = CommandType.INTEGER, - description = "Type of resource to update. Values are 0, 1, 2, 3, and 4." + "0 - Instance. Number of instances a user can create. " - + "1 - IP. Number of public IP addresses an account can own. " + "2 - Volume. Number of disk volumes an account can own." - + "3 - Snapshot. Number of snapshots an account can own." + "4 - Template. Number of templates an account can register/create." - + "5 - Project. Number of projects an account can own." + "6 - Network. Number of networks an account can own." - + "7 - VPC. Number of VPC an account can own." + "8 - CPU. Number of CPU an account can allocate for his resources." - + "9 - Memory. Amount of RAM an account can allocate for his resources." - + "10 - Primary Storage. Amount of Primary storage an account can allocate for his resoruces." - + "11 - Secondary Storage. Amount of Secondary storage an account can allocate for his resources.") + @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.INTEGER, description = "Type of resource to update. Values are 0, 1, 2, 3, and 4." + + "0 - Instance. Number of instances a user can create. " + "1 - IP. Number of public IP addresses an account can own. " + + "2 - Volume. Number of disk volumes an account can own." + "3 - Snapshot. Number of snapshots an account can own." + + "4 - Template. Number of templates an account can register/create." + "5 - Project. Number of projects an account can own." + + "6 - Network. Number of networks an account can own." + "7 - VPC. Number of VPC an account can own." + + "8 - CPU. Number of CPU an account can allocate for his resources." + "9 - Memory. Amount of RAM an account can allocate for his resources." + + "10 - Primary Storage. Amount of Primary storage an account can allocate for his resoruces." + + "11 - Secondary Storage. Amount of Secondary storage an account can allocate for his resources.") private Integer resourceType; ///////////////////////////////////////////////////// @@ -78,8 +76,9 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd @Override public void execute() { - List result = _resourceLimitService.searchForLimits(id, finalyzeAccountId(this.getAccountName(), this.getDomainId(), this.getProjectId(), false), - this.getDomainId(), resourceType, this.getStartIndex(), this.getPageSizeVal()); + List result = + _resourceLimitService.searchForLimits(id, finalyzeAccountId(this.getAccountName(), this.getDomainId(), this.getProjectId(), false), this.getDomainId(), + resourceType, this.getStartIndex(), this.getPageSizeVal()); ListResponse response = new ListResponse(); List limitResponses = new ArrayList(); for (ResourceLimit limit : result) { diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java index 351181a77fd..bd4f9956442 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.resource; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.ResourceCountResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.configuration.ResourceCount; import com.cloud.user.Account; @@ -46,7 +46,9 @@ public class UpdateResourceCountCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "Update resource count for a specified account. Must be used with the domainId parameter.") + @Parameter(name = ApiConstants.ACCOUNT, + type = CommandType.STRING, + description = "Update resource count for a specified account. Must be used with the domainId parameter.") private String accountName; @Parameter(name = ApiConstants.DOMAIN_ID, @@ -59,13 +61,18 @@ public class UpdateResourceCountCmd extends BaseCmd { @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.INTEGER, description = "Type of resource to update. If specifies valid values are 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 11. If not specified will update all resource counts" - + "0 - Instance. Number of instances a user can create. " + "1 - IP. Number of public IP addresses a user can own. " - + "2 - Volume. Number of disk volumes a user can create." + "3 - Snapshot. Number of snapshots a user can create." - + "4 - Template. Number of templates that a user can register/create." + "5 - Project. Number of projects that a user can create." - + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create." - + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use." - + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." - + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") + + "0 - Instance. Number of instances a user can create. " + + "1 - IP. Number of public IP addresses a user can own. " + + "2 - Volume. Number of disk volumes a user can create." + + "3 - Snapshot. Number of snapshots a user can create." + + "4 - Template. Number of templates that a user can register/create." + + "5 - Project. Number of projects that a user can create." + + "6 - Network. Number of guest network a user can create." + + "7 - VPC. Number of VPC a user can create." + + "8 - CPU. Total number of CPU cores a user can use." + + "9 - Memory. Total Memory (in MB) a user can use." + + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." + + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") private Integer resourceType; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Update resource limits for project") @@ -117,8 +124,8 @@ public class UpdateResourceCountCmd extends BaseCmd { @Override public void execute() { - List result = _resourceLimitService.recalculateResourceCount(finalyzeAccountId(accountName, domainId, projectId, true), getDomainId(), - getResourceType()); + List result = + _resourceLimitService.recalculateResourceCount(finalyzeAccountId(accountName, domainId, projectId, true), getDomainId(), getResourceType()); if ((result != null) && (result.size() > 0)) { ListResponse response = new ListResponse(); diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java index f29b8287f71..c33a9e71cc8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.resource; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.ResourceLimitResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.configuration.ResourceLimit; @APICommand(name = "updateResourceLimit", description = "Updates resource limits for an account or domain.", responseObject = ResourceLimitResponse.class) @@ -60,12 +60,12 @@ public class UpdateResourceLimitCmd extends BaseCmd { type = CommandType.INTEGER, required = true, description = "Type of resource to update. Values are 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 and 11. 0 - Instance. Number of instances a user can create. " - + "1 - IP. Number of public IP addresses a user can own. " + "2 - Volume. Number of disk volumes a user can create." - + "3 - Snapshot. Number of snapshots a user can create." + "4 - Template. Number of templates that a user can register/create." - + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create." - + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use." - + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." - + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") + + "1 - IP. Number of public IP addresses a user can own. " + "2 - Volume. Number of disk volumes a user can create." + + "3 - Snapshot. Number of snapshots a user can create." + "4 - Template. Number of templates that a user can register/create." + + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create." + + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use." + + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." + + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") private Integer resourceType; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index d10c37e6a71..6a054a4dbdf 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java @@ -22,6 +22,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -35,8 +37,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.security.SecurityRule; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 9f01dd6d38e..be91959b3eb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java @@ -22,6 +22,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -35,15 +37,14 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.security.SecurityRule; import com.cloud.utils.StringUtils; -import com.cloud.utils.net.NetUtils; -@APICommand(name = "authorizeSecurityGroupIngress", responseObject = SecurityGroupRuleResponse.class, description = "Authorizes a particular ingress rule for this security group") +@APICommand(name = "authorizeSecurityGroupIngress", + responseObject = SecurityGroupRuleResponse.class, + description = "Authorizes a particular ingress rule for this security group") @SuppressWarnings("rawtypes") public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java index 00b235ac720..3b16821d46d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.securitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java index 3e6581108f5..0bcc144af4f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.securitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; @@ -45,7 +45,10 @@ public class DeleteSecurityGroupCmd extends BaseCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account of the security group. Must be specified with domain ID") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "the domain ID of account owning the security group", entityType = DomainResponse.class) + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + description = "the domain ID of account owning the security group", + entityType = DomainResponse.class) private Long domainId; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, description = "the project of the security group", entityType = ProjectResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java index 950dd809d50..ae745b30e57 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.securitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; @APICommand(name = "listSecurityGroups", description = "Lists security groups", responseObject = SecurityGroupResponse.class) public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd { @@ -39,7 +40,10 @@ public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.SECURITY_GROUP_NAME, type = CommandType.STRING, description = "lists security groups by name") private String securityGroupName; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, description = "lists security groups by virtual machine id", entityType = UserVmResponse.class) + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, + type = CommandType.UUID, + description = "lists security groups by virtual machine id", + entityType = UserVmResponse.class) private Long virtualMachineId; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the security group by the id provided", entityType = SecurityGroupResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java index 79521cf29c5..006aa7d7947 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.securitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,14 +27,16 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.security.SecurityGroup; import com.cloud.network.security.SecurityRule; import com.cloud.user.Account; -@APICommand(name = "revokeSecurityGroupEgress", responseObject = SuccessResponse.class, description = "Deletes a particular egress rule from this security group", since = "3.0.0") +@APICommand(name = "revokeSecurityGroupEgress", + responseObject = SuccessResponse.class, + description = "Deletes a particular egress rule from this security group", + since = "3.0.0") public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupEgressCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java index 9433a3e4732..08585784fff 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.securitygroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.security.SecurityGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java index 233d4c40d74..a0f307ba07a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.snapshot; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -30,8 +32,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; @@ -50,7 +50,9 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "The account of the snapshot. The account parameter must be used with the domainId parameter.") + @Parameter(name = ApiConstants.ACCOUNT, + type = CommandType.STRING, + description = "The account of the snapshot. The account parameter must be used with the domainId parameter.") private String accountName; @Parameter(name = ApiConstants.DOMAIN_ID, @@ -139,7 +141,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { Project project = _projectService.findByProjectAccountId(volume.getAccountId()); if (project.getState() != Project.State.Active) { - throw new PermissionDeniedException("Can't add resources to the project id=" + project.getId() + " in state=" + project.getState() + " as it's no longer active"); + throw new PermissionDeniedException("Can't add resources to the project id=" + project.getId() + " in state=" + project.getState() + + " as it's no longer active"); } } else if (account.getState() == Account.State.disabled) { throw new PermissionDeniedException("The owner of template is disabled: " + account); @@ -180,7 +183,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { CallContext.current().setEventDetails("Volume Id: " + getVolumeId()); Snapshot snapshot; try { - snapshot = _volumeService.takeSnapshot(this.getVolumeId(), this.getPolicyId(), this.getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm()); + snapshot = + _volumeService.takeSnapshot(this.getVolumeId(), this.getPolicyId(), this.getEntityId(), _accountService.getAccount(getEntityOwnerId()), getQuiescevm()); if (snapshot != null) { SnapshotResponse response = _responseGenerator.createSnapshotResponse(snapshot); response.setResponseName(getCommandName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java index 01c19b8fc81..5ecbaaa2bc9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.snapshot; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SnapshotPolicyResponse; import org.apache.cloudstack.api.response.VolumeResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; @@ -50,8 +51,7 @@ public class CreateSnapshotPolicyCmd extends BaseCmd { private Integer maxSnaps; @Parameter(name = ApiConstants.SCHEDULE, type = CommandType.STRING, required = true, description = "time the snapshot is scheduled to be taken. " + "Format is:" - + "* if HOURLY, MM" + "* if DAILY, MM:HH" + "* if WEEKLY, MM:HH:DD (1-7)" - + "* if MONTHLY, MM:HH:DD (1-28)") + + "* if HOURLY, MM" + "* if DAILY, MM:HH" + "* if WEEKLY, MM:HH:DD (1-7)" + "* if MONTHLY, MM:HH:DD (1-28)") private String schedule; @Parameter(name = ApiConstants.TIMEZONE, @@ -108,8 +108,8 @@ public class CreateSnapshotPolicyCmd extends BaseCmd { if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { Project project = _projectService.findByProjectAccountId(volume.getAccountId()); if (project.getState() != Project.State.Active) { - PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + - " as it's no longer active"); + PermissionDeniedException ex = + new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + " as it's no longer active"); ex.addProxyObject(project.getUuid(), "projectId"); throw ex; } diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java index d8bd46f06ae..35caaff8e10 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.snapshot; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.SnapshotResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot; import com.cloud.user.Account; @@ -82,10 +82,12 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { return "deleting snapshot: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Snapshot; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java index 2e29d26809a..bcccf8b4f3e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.snapshot; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SnapshotPolicyResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java index 077ed84c8a8..7c2899fe67c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.snapshot; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.SnapshotPolicyResponse; import org.apache.cloudstack.api.response.VolumeResponse; -import org.apache.log4j.Logger; import com.cloud.storage.snapshot.SnapshotPolicy; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java index 040cb057cf5..e4d566a3c5a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.snapshot; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.SnapshotResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.storage.Snapshot; import com.cloud.utils.Pair; @@ -98,6 +99,7 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Snapshot; } diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java index b790efaf2ba..1fc9d13fde1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.ssh; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.user.SSHKeyPair; @APICommand(name = "createSSHKeyPair", description = "Create a new keypair and returns the private key", responseObject = CreateSSHKeyPairResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java index 4a58ee51d61..a638eb9d771 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.ssh; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.user.Account; @APICommand(name = "deleteSSHKeyPair", description = "Deletes a keypair by name", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java index 0136717f60b..52fca5f031b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.ssh; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.SSHKeyPairResponse; -import org.apache.log4j.Logger; import com.cloud.user.SSHKeyPair; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java index 9bb3654af57..8ed5cbd5605 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.ssh; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SSHKeyPairResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.user.SSHKeyPair; @APICommand(name = "registerSSHKeyPair", description = "Register a public key in a keypair under a certain name", responseObject = SSHKeyPairResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java index 346173c8936..ee0add438a7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java @@ -23,6 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag; @@ -60,7 +61,7 @@ public class CreateTagsCmd extends BaseAsyncCmd { private List resourceIds; @Parameter(name = ApiConstants.CUSTOMER, type = CommandType.STRING, description = "identifies client specific tag. " - + "When the value is not null, the tag can't be used by cloudStack code internally") + + "When the value is not null, the tag can't be used by cloudStack code internally") private String customer; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java index 1eaa9a35c0b..3ee7c06469a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java @@ -23,6 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -30,7 +32,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag.ResourceObjectType; @@ -51,7 +52,11 @@ public class DeleteTagsCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Delete tag by resource type") private String resourceType; - @Parameter(name = ApiConstants.RESOURCE_IDS, type = CommandType.LIST, required = true, collectionType = CommandType.STRING, description = "Delete tags for resource id(s)") + @Parameter(name = ApiConstants.RESOURCE_IDS, + type = CommandType.LIST, + required = true, + collectionType = CommandType.STRING, + description = "Delete tags for resource id(s)") private List resourceIds; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java index 83fd4e7476a..78bfc186d1c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.template; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,12 +28,9 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.StorageUnavailableException; @@ -114,10 +113,12 @@ public class CopyTemplateCmd extends BaseAsyncCmd { return "copying template: " + getId() + " from zone: " + getSourceZoneId() + " to zone: " + getDestinationZoneId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Template; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java index 3f05f6ce422..0030a7e9ce8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java @@ -16,15 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.user.template; -import com.cloud.event.EventTypes; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.PermissionDeniedException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.projects.Project; -import com.cloud.storage.Snapshot; -import com.cloud.storage.Volume; -import com.cloud.template.VirtualMachineTemplate; -import com.cloud.user.Account; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -40,16 +36,19 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; +import com.cloud.event.EventTypes; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.PermissionDeniedException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.projects.Project; +import com.cloud.storage.Snapshot; +import com.cloud.storage.Volume; +import com.cloud.template.VirtualMachineTemplate; +import com.cloud.user.Account; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -@APICommand(name = "createTemplate", - responseObject = TemplateResponse.class, - description = "Creates a template of a virtual machine. " + "The virtual machine must be in a STOPPED state. " - + "A template created from this command is automatically designated as a private template visible to the account that created it.") +@APICommand(name = "createTemplate", responseObject = TemplateResponse.class, description = "Creates a template of a virtual machine. " + + "The virtual machine must be in a STOPPED state. " + + "A template created from this command is automatically designated as a private template visible to the account that created it.") public class CreateTemplateCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateTemplateCmd.class.getName()); private static final String s_name = "createtemplateresponse"; @@ -84,7 +83,9 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { description = "the ID of the OS Type that best represents the OS of this template.") private Long osTypeId; - @Parameter(name = ApiConstants.PASSWORD_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the password reset feature; default is false") + @Parameter(name = ApiConstants.PASSWORD_ENABLED, + type = CommandType.BOOLEAN, + description = "true if the template supports the password reset feature; default is false") private Boolean passwordEnabled; @Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requres HVM, false otherwise") @@ -108,7 +109,9 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { description = "Optional, VM ID. If this presents, it is going to create a baremetal template for VM this ID refers to. This is only for VM whose hypervisor type is BareMetal") private Long vmId; - @Parameter(name = ApiConstants.URL, type = CommandType.STRING, description = "Optional, only for baremetal hypervisor. The directory name where template stored on CIFS server") + @Parameter(name = ApiConstants.URL, + type = CommandType.STRING, + description = "Optional, only for baremetal hypervisor. The directory name where template stored on CIFS server") private String url; @Parameter(name = ApiConstants.TEMPLATE_TAG, type = CommandType.STRING, description = "the tag for this template.") @@ -231,8 +234,8 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { Project project = _projectService.findByProjectAccountId(accountId); if (project.getState() != Project.State.Active) { - PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + - " as it's no longer active"); + PermissionDeniedException ex = + new PermissionDeniedException("Can't add resources to the specified project id in state=" + project.getState() + " as it's no longer active"); ex.addProxyObject(project.getUuid(), "projectId"); } } else if (account.getState() == Account.State.disabled) { diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index 043eb9f31c3..890af70330f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; @@ -96,10 +96,12 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { return "Deleting template " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Template; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java index 69c304f9cd0..082f46a5abf 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,10 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InternalErrorException; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; -import com.cloud.utils.Pair; @APICommand(name = "extractTemplate", description = "Extracts a template", responseObject = ExtractResponse.class) public class ExtractTemplateCmd extends BaseAsyncCmd { @@ -116,10 +115,12 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { return "extracting template: " + getId() + " from zone: " + getZoneId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Template; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java index c739bbaad7d..08acf632a4c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd; import org.apache.cloudstack.api.response.TemplatePermissionsResponse; -import org.apache.log4j.Logger; import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; @@ -42,6 +43,7 @@ public class ListTemplatePermissionsCmd extends BaseListTemplateOrIsoPermissions return Logger.getLogger(ListTemplatePermissionsCmd.class.getName()); } + @Override protected boolean templateIsCorrectType(VirtualMachineTemplate template) { return !template.getFormat().equals(ImageFormat.ISO); } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index aa1e6b3159a..7e347f3e32f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -16,9 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.template; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -27,15 +25,11 @@ import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.template.VirtualMachineTemplate.TemplateFilter; import com.cloud.user.Account; -import com.cloud.utils.Pair; @APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class) public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { @@ -60,12 +54,12 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { type = CommandType.STRING, required = true, description = "possible values are \"featured\", \"self\", \"selfexecutable\",\"sharedexecutable\",\"executable\", and \"community\". " - + "* featured : templates that have been marked as featured and public. " - + "* self : templates that have been registered or created by the calling user. " - + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. " - + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. " - + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. " - + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).") + + "* featured : templates that have been marked as featured and public. " + + "* self : templates that have been registered or created by the calling user. " + + "* selfexecutable : same as self, but only returns templates that can be used to deploy a new VM. " + + "* sharedexecutable : templates ready to be deployed that have been granted to the calling user by another user. " + + "* executable : templates that are owned by the calling user, or public templates, that can be used to deploy a VM. " + + "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).") private String templateFilter; @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "list templates by zoneId") @@ -102,9 +96,9 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { boolean isAccountSpecific = (account == null || isAdmin(account.getType())) && (getAccountName() != null) && (getDomainId() != null); // Show only those that are downloaded. TemplateFilter templateFilter = TemplateFilter.valueOf(getTemplateFilter()); - boolean onlyReady = (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || - (templateFilter == TemplateFilter.sharedexecutable) || (templateFilter == TemplateFilter.executable && isAccountSpecific) || - (templateFilter == TemplateFilter.community); + boolean onlyReady = + (templateFilter == TemplateFilter.featured) || (templateFilter == TemplateFilter.selfexecutable) || (templateFilter == TemplateFilter.sharedexecutable) || + (templateFilter == TemplateFilter.executable && isAccountSpecific) || (templateFilter == TemplateFilter.community); return onlyReady; } @@ -117,6 +111,7 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Template; } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index d31ae034da8..48ed6ea6aac 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -21,6 +21,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -36,8 +38,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.ResourceAllocationException; import com.cloud.template.VirtualMachineTemplate; @@ -61,7 +61,10 @@ public class RegisterTemplateCmd extends BaseCmd { length = 4096) private String displayText; - @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, required = true, description = "the format for the template. Possible values include QCOW2, RAW, and VHD.") + @Parameter(name = ApiConstants.FORMAT, + type = CommandType.STRING, + required = true, + description = "the format for the template. Possible values include QCOW2, RAW, and VHD.") private String format; @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, required = true, description = "the target hypervisor for the template") @@ -83,7 +86,9 @@ public class RegisterTemplateCmd extends BaseCmd { description = "the ID of the OS Type that best represents the OS of this template.") private Long osTypeId; - @Parameter(name = ApiConstants.PASSWORD_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the password reset feature; default is false") + @Parameter(name = ApiConstants.PASSWORD_ENABLED, + type = CommandType.BOOLEAN, + description = "true if the template supports the password reset feature; default is false") private Boolean passwordEnabled; @Parameter(name = ApiConstants.SSHKEY_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the sshkey upload feature; default is false") diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java index eb26d250003..f80a4ee3062 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.log4j.Logger; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java index 610001f1ffc..96d1f55751a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java @@ -16,24 +16,25 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoPermissionsCmd; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; -@APICommand(name = "updateTemplatePermissions", - responseObject = SuccessResponse.class, - description = "Updates a template visibility permissions. " + "A public template is visible to all accounts within the same domain. " - + "A private template is visible only to the owner of the template. " + "A priviledged template is a private template with account permissions added. " - + "Only accounts specified under the template permissions are visible to them.") +@APICommand(name = "updateTemplatePermissions", responseObject = SuccessResponse.class, description = "Updates a template visibility permissions. " + + "A public template is visible to all accounts within the same domain. " + "A private template is visible only to the owner of the template. " + + "A priviledged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.") public class UpdateTemplatePermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd { + @Override protected String getResponseName() { return "updatetemplatepermissionsresponse"; } + @Override protected Logger getLogger() { return Logger.getLogger(UpdateTemplatePermissionsCmd.class.getName()); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java index 76bc5cf9f8b..09a912293db 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; -import com.cloud.vm.NicSecondaryIp; - import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; @@ -44,6 +42,7 @@ import com.cloud.network.Network; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; import com.cloud.vm.Nic; +import com.cloud.vm.NicSecondaryIp; @APICommand(name = "addIpToNic", description = "Assigns secondary IP to NIC", responseObject = NicSecondaryIpResponse.class) public class AddIpToVmNicCmd extends BaseAsyncCmd { @@ -167,7 +166,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd { if (getNetworkType() == NetworkType.Basic) { // add security group rules for the secondary ip addresses boolean success = false; - success = _securityGroupService.securityGroupRulesForVmSecIp(getNicId(), getNetworkId(), secondaryIp, (boolean)true); + success = _securityGroupService.securityGroupRulesForVmSecIp(getNicId(), getNetworkId(), secondaryIp, true); if (success == false) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to set security group rules for the secondary ip"); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java index aeac82b17dc..43efe166895 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java @@ -21,17 +21,18 @@ import java.util.EnumSet; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index c12b9393233..7180f4ea3d5 100755 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -78,7 +78,11 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "availability zone for the virtual machine") + @Parameter(name = ApiConstants.ZONE_ID, + type = CommandType.UUID, + entityType = ZoneResponse.class, + required = true, + description = "availability zone for the virtual machine") private Long zoneId; @ACL @@ -128,10 +132,10 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { type = CommandType.UUID, entityType = DiskOfferingResponse.class, description = "the ID of the disk offering for the virtual machine. If the template is of ISO format," - + " the diskOfferingId is for the root disk volume. Otherwise this parameter is used to indicate the " - + "offering for the data disk volume. If the templateId parameter passed is from a Template object," - + " the diskOfferingId refers to a DATA Disk Volume created. If the templateId parameter passed is " - + "from an ISO object, the diskOfferingId refers to a ROOT Disk Volume created.") + + " the diskOfferingId is for the root disk volume. Otherwise this parameter is used to indicate the " + + "offering for the data disk volume. If the templateId parameter passed is from a Template object," + + " the diskOfferingId refers to a DATA Disk Volume created. If the templateId parameter passed is " + + "from an ISO object, the diskOfferingId refers to a ROOT Disk Volume created.") private Long diskOfferingId; @Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, description = "the arbitrary size for the DATADISK volume. Mutually exclusive with diskOfferingId") @@ -164,7 +168,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { collectionType = CommandType.UUID, entityType = SecurityGroupResponse.class, description = "comma separated list of security groups id that going to be applied to the virtual machine. " - + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter") + + "Should be passed only when vm is created from a zone with Basic Network support." + " Mutually exclusive with securitygroupnames parameter") private List securityGroupIdList; @ACL @@ -173,13 +177,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { collectionType = CommandType.STRING, entityType = SecurityGroupResponse.class, description = "comma separated list of security groups names that going to be applied to the virtual machine." - + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter") + + " Should be passed only when vm is created from a zone with Basic Network support. " + "Mutually exclusive with securitygroupids parameter") private List securityGroupNameList; @Parameter(name = ApiConstants.IP_NETWORK_LIST, type = CommandType.MAP, description = "ip to network mapping. Can't be specified with networkIds parameter." - + " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].ipv6=fc00:1234:5678::abcd&iptonetworklist[0].networkid=uuid - requests to use ip 10.10.10.11 in network id=uuid") + + " Example: iptonetworklist[0].ip=10.10.10.11&iptonetworklist[0].ipv6=fc00:1234:5678::abcd&iptonetworklist[0].networkid=uuid - requests to use ip 10.10.10.11 in network id=uuid") private Map ipToNetworkList; @Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "the ip address for default vm's network") @@ -196,7 +200,9 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project") private Long projectId; - @Parameter(name = ApiConstants.START_VM, type = CommandType.BOOLEAN, description = "true if network offering supports specifying ip ranges; defaulted to true if not specified") + @Parameter(name = ApiConstants.START_VM, + type = CommandType.BOOLEAN, + description = "true if network offering supports specifying ip ranges; defaulted to true if not specified") private Boolean startVm; @ACL @@ -205,7 +211,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine." - + " Mutually exclusive with affinitygroupnames parameter") + + " Mutually exclusive with affinitygroupnames parameter") private List affinityGroupIdList; @ACL @@ -214,10 +220,13 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { collectionType = CommandType.STRING, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups names that are going to be applied to the virtual machine." - + "Mutually exclusive with affinitygroupids parameter") + + "Mutually exclusive with affinitygroupids parameter") private List affinityGroupNameList; - @Parameter(name = ApiConstants.DISPLAY_VM, type = CommandType.BOOLEAN, since = "4.2", description = "an optional field, whether to the display the vm to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_VM, + type = CommandType.BOOLEAN, + since = "4.2", + description = "an optional field, whether to the display the vm to the end user or not.") private Boolean displayVm; @Parameter(name = ApiConstants.CPU_SPEED, @@ -226,7 +235,10 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { description = "optional field to specify the cpu speed when using dynamic compute offering.") private Integer cpuSpeed; - @Parameter(name = ApiConstants.MEMORY, type = CommandType.INTEGER, since = "4.3", description = "optional field to specify the memory when using dynamic compute offering") + @Parameter(name = ApiConstants.MEMORY, + type = CommandType.INTEGER, + since = "4.3", + description = "optional field to specify the memory when using dynamic compute offering") private Integer memory; @Parameter(name = ApiConstants.CPU_NUMBER, @@ -561,23 +573,26 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { if (getNetworkIds() != null) { throw new InvalidParameterValueException("Can't specify network Ids in Basic zone"); } else { - vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name, displayName, diskOfferingId, - size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(), - cpuSpeed, memory, cpuNumber, rootdisksize); + vm = + _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name, displayName, + diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, + getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize); } } else { if (zone.isSecurityGroupEnabled()) { - vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(), owner, name, - displayName, diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, - getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize); + vm = + _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(), owner, name, + displayName, diskOfferingId, size, group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, + keyboard, getAffinityGroupIdList(), cpuSpeed, memory, cpuNumber, rootdisksize); } else { if (getSecurityGroupIdList() != null && !getSecurityGroupIdList().isEmpty()) { throw new InvalidParameterValueException("Can't create vm with security groups; security group feature is not enabled per zone"); } - vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName, diskOfferingId, size, group, - getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(), cpuSpeed, memory, - cpuNumber, rootdisksize); + vm = + _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName, diskOfferingId, size, + group, getHypervisor(), getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, displayVm, keyboard, getAffinityGroupIdList(), + cpuSpeed, memory, cpuNumber, rootdisksize); } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java index 13a6e5f764b..3c63e8d3402 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.vm; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -100,10 +101,12 @@ public class DestroyVMCmd extends BaseAsyncCmd { return "destroying vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java index 8c09c28b8af..d0503d16201 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.command.user.vm; import java.security.InvalidParameterException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.GetVMPasswordResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java index 0e32c5872e3..8cb95756367 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java @@ -39,7 +39,6 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.vm.Nic; -import com.cloud.vm.NicSecondaryIp; @APICommand(name = "listNics", description = "list the vm nics IP to NIC", responseObject = NicResponse.class) public class ListNicsCmd extends BaseListCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java index 885c21be9f8..3f161c1698d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -38,7 +40,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; @@ -84,15 +85,18 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "the target hypervisor for the template") private String hypervisor; - @Parameter(name = ApiConstants.STORAGE_ID, type = CommandType.UUID, entityType = StoragePoolResponse.class, description = "the storage ID where vm's volumes belong to") + @Parameter(name = ApiConstants.STORAGE_ID, + type = CommandType.UUID, + entityType = StoragePoolResponse.class, + description = "the storage ID where vm's volumes belong to") private Long storageId; @Parameter(name = ApiConstants.DETAILS, type = CommandType.LIST, collectionType = CommandType.STRING, description = "comma separated list of host details requested, " - + "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp]." - + " If no parameter is passed in, the details will be defaulted to all") + + "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp]." + + " If no parameter is passed in, the details will be defaulted to all") private List viewDetails; @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list vms by template") diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java index 77f37215614..7ac913888de 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,12 +28,9 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @@ -84,10 +83,12 @@ public class RebootVMCmd extends BaseAsyncCmd { return "rebooting user vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java index 1a1220af8d0..6cbb78b0dd2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java @@ -32,11 +32,9 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.event.EventTypes; -import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; import com.cloud.user.Account; -import com.cloud.vm.Nic; import com.cloud.vm.NicSecondaryIp; @APICommand(name = "removeIpFromNic", description = "Assigns secondary IP to NIC.", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java index 1b01f0612bb..92becb77ae4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java @@ -21,17 +21,18 @@ import java.util.EnumSet; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NicResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java index 7ea20b0e184..df341205cf3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,18 +28,14 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -@APICommand(name = "resetPasswordForVirtualMachine", - responseObject = UserVmResponse.class, - description = "Resets the password for virtual machine. " + "The virtual machine must be in a \"Stopped\" state and the template must already " - + "support this feature for this command to take effect. [async]") +@APICommand(name = "resetPasswordForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the password for virtual machine. " + + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]") public class ResetVMPasswordCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmd.class.getName()); @@ -99,10 +97,12 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { return "resetting password for vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java index ece0eba99a0..7436e3de4cb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java @@ -19,27 +19,26 @@ package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import com.cloud.user.Account; -import com.cloud.uservm.UserVm; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +import com.cloud.uservm.UserVm; @APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. " - + "The virtual machine must be in a \"Stopped\" state. [async]") + + "The virtual machine must be in a \"Stopped\" state. [async]") public class ResetVMSSHKeyCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmd.class.getName()); @@ -107,6 +106,7 @@ public class ResetVMSSHKeyCmd extends BaseAsyncCmd { return "resetting SSHKey for vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } @@ -126,6 +126,7 @@ public class ResetVMSSHKeyCmd extends BaseAsyncCmd { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java index 6d1348d2b77..b69b364a031 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -36,7 +36,10 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0") +@APICommand(name = "restoreVirtualMachine", + description = "Restore a VM to original template/ISO or new template/ISO", + responseObject = UserVmResponse.class, + since = "3.0.0") public class RestoreVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RestoreVMCmd.class); private static final String s_name = "restorevmresponse"; @@ -61,7 +64,8 @@ public class RestoreVMCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { UserVm result; CallContext.current().setEventDetails("Vm Id: " + getVmId()); result = _userVmService.restoreVM(this); diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java index a2d0ae411d7..6cb49c165e4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java @@ -16,20 +16,28 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; -import com.cloud.event.EventTypes; -import com.cloud.exception.*; -import com.cloud.user.Account; -import com.cloud.uservm.UserVm; - -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.ServiceOfferingResponse; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.context.CallContext; +import java.util.List; import org.apache.log4j.Logger; -import java.util.List; +import org.apache.cloudstack.api.ACL; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.UserVmResponse; + +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ManagementServerException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.VirtualMachineMigrationException; +import com.cloud.user.Account; +import com.cloud.uservm.UserVm; @APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class) public class ScaleVMCmd extends BaseAsyncCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java index 9316c217369..4239a6471af 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -106,10 +106,12 @@ public class StartVMCmd extends BaseAsyncCmd { return "starting user vm: " + getId(); } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.VirtualMachine; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java index 420c318f96b..17f12f97f54 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ACL; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -27,11 +29,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @@ -49,10 +48,8 @@ public class StopVMCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine") private Long id; - @Parameter(name = ApiConstants.FORCED, - type = CommandType.BOOLEAN, - required = false, - description = "Force stop the VM " + "(vm is marked as Stopped even when command fails to be send to the backend). The caller knows the VM is stopped.") + @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, required = false, description = "Force stop the VM " + + "(vm is marked as Stopped even when command fails to be send to the backend). The caller knows the VM is stopped.") private Boolean forced; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java index b26b450bc72..f699cce4a1f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java @@ -21,17 +21,18 @@ import java.util.EnumSet; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.NicResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java index adca765ea39..fbb785f2c33 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,16 +28,14 @@ import org.apache.cloudstack.api.response.GuestOSResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @APICommand(name = "updateVirtualMachine", description = "Updates properties of a virtual machine. The VM has to be stopped and restarted for the " - + "new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. " - + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class) + + "new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. " + + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class) public class UpdateVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName()); private static final String s_name = "updatevirtualmachineresponse"; @@ -56,7 +56,10 @@ public class UpdateVMCmd extends BaseCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "The ID of the virtual machine") private Long id; - @Parameter(name = ApiConstants.OS_TYPE_ID, type = CommandType.UUID, entityType = GuestOSResponse.class, description = "the ID of the OS type that best represents this VM.") + @Parameter(name = ApiConstants.OS_TYPE_ID, + type = CommandType.UUID, + entityType = GuestOSResponse.class, + description = "the ID of the OS type that best represents this VM.") private Long osTypeId; @Parameter(name = ApiConstants.USER_DATA, diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java index 4816bbedbf1..3dfcdf9f158 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java @@ -35,8 +35,7 @@ import com.cloud.user.Account; import com.cloud.uservm.UserVm; @APICommand(name = "changeServiceForVirtualMachine", responseObject = UserVmResponse.class, description = "Changes the service offering for a virtual machine. " - + "The virtual machine must be in a \"Stopped\" state for " - + "this command to take effect.") + + "The virtual machine must be in a \"Stopped\" state for " + "this command to take effect.") public class UpgradeVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName()); private static final String s_name = "changeserviceforvirtualmachineresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java index e8782f0f0ab..937fca381a8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vmgroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,9 +26,8 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; -import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; +import org.apache.cloudstack.context.CallContext; import com.cloud.vm.InstanceGroup; @@ -48,7 +49,10 @@ public class CreateVMGroupCmd extends BaseCmd { description = "the account of the instance group. The account parameter must be used with the domainId parameter.") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID of account owning the instance group") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "the domain ID of account owning the instance group") private Long domainId; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "The project of the instance group") diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java index 0b503158023..fbfb85a86c0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vmgroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java index 7ac2a669b61..fda3e884365 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.user.vmgroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; @APICommand(name = "listInstanceGroups", description = "Lists vm groups", responseObject = InstanceGroupResponse.class) public class ListVMGroupsCmd extends BaseListProjectAndAccountResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java index 0399f304c89..1930bd837e6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vmgroup; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.InstanceGroupResponse; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java index af4f2e57b84..d29ff051251 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.api.command.user.vmsnapshot; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VMSnapshotResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.vm.snapshot.VMSnapshot; @@ -38,7 +38,11 @@ public class DeleteVMSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVMSnapshotCmd.class.getName()); private static final String s_name = "deletevmsnapshotresponse"; - @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, type = CommandType.UUID, entityType = VMSnapshotResponse.class, required = true, description = "The ID of the VM snapshot") + @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, + type = CommandType.UUID, + entityType = VMSnapshotResponse.class, + required = true, + description = "The ID of the VM snapshot") private Long id; public Long getId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java index 5b6097ca7e6..cec2154596a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java @@ -42,7 +42,11 @@ public class RevertToVMSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevertToVMSnapshotCmd.class.getName()); private static final String s_name = "reverttovmsnapshotresponse"; - @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, type = CommandType.UUID, required = true, entityType = VMSnapshotResponse.class, description = "The ID of the vm snapshot") + @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, + type = CommandType.UUID, + required = true, + entityType = VMSnapshotResponse.class, + description = "The ID of the vm snapshot") private Long vmSnapShotId; public Long getVmSnapShotId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java index db6727675d7..cd1e1ed64bc 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.storage.Volume; import com.cloud.user.Account; @@ -43,10 +43,8 @@ public class AttachVolumeCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Parameter(name = ApiConstants.DEVICE_ID, type = CommandType.LONG, description = "the ID of the device to map the volume to within the guest OS. " - + "If no deviceId is passed in, the next available deviceId will be chosen. " - + "Possible values for a Linux OS are:" + "* 1 - /dev/xvdb" + "* 2 - /dev/xvdc" - + "* 4 - /dev/xvde" + "* 5 - /dev/xvdf" + "* 6 - /dev/xvdg" + "* 7 - /dev/xvdh" - + "* 8 - /dev/xvdi" + "* 9 - /dev/xvdj") + + "If no deviceId is passed in, the next available deviceId will be chosen. " + "Possible values for a Linux OS are:" + "* 1 - /dev/xvdb" + "* 2 - /dev/xvdc" + + "* 4 - /dev/xvde" + "* 5 - /dev/xvdf" + "* 6 - /dev/xvdg" + "* 7 - /dev/xvdh" + "* 8 - /dev/xvdi" + "* 9 - /dev/xvdj") private Long deviceId; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VolumeResponse.class, required = true, description = "the ID of the disk volume") @@ -84,10 +82,12 @@ public class AttachVolumeCmd extends BaseAsyncCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Volume; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java index 0d1cf902951..eb4ac88a835 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -31,8 +33,6 @@ import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.storage.Snapshot; @@ -49,7 +49,9 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the disk volume. Must be used with the domainId parameter.") + @Parameter(name = ApiConstants.ACCOUNT, + type = CommandType.STRING, + description = "the account associated with the disk volume. Must be used with the domainId parameter.") private String accountName; @Parameter(name = ApiConstants.PROJECT_ID, @@ -62,7 +64,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the disk offering. If used with the account parameter" - + " returns the disk volume associated with the account for the specified domain.") + + " returns the disk volume associated with the account for the specified domain.") private Long domainId; @Parameter(name = ApiConstants.DISK_OFFERING_ID, diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java index 71341c5a6cb..550adb9e524 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java index 8368c10fcfd..70283ff6679 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.storage.Volume; import com.cloud.user.Account; @@ -84,10 +84,12 @@ public class DetachVolumeCmd extends BaseAsyncCmd { return "volume"; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Volume; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java index ad4becba976..d73143a112e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; -import java.net.URISyntaxException; +import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -30,8 +30,6 @@ import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.dc.DataCenter; import com.cloud.event.EventTypes; import com.cloud.storage.Upload; @@ -97,10 +95,12 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Volume; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java index 2c04888c130..aed0ae02f63 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java @@ -44,7 +44,7 @@ public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCm private String key; @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "if set to true, only details marked with display=true, are returned." - + " Always false is the call is made by the regular user", since = "4.3") + + " Always false is the call is made by the regular user", since = "4.3") private Boolean forDisplay; public String getResourceId() { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java index ed6085d5072..4ebe3bf5065 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; @APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class) public class ListVolumesCmd extends BaseListTaggedResourcesCmd { diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java index 3d7d0c999d2..fa6ac6948f6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java index 3c43523abd5..c4c7554dbdb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag; @@ -42,7 +43,11 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Delete detail by resource type") private String resourceType; - @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, collectionType = CommandType.STRING, description = "Delete details for resource id") + @Parameter(name = ApiConstants.RESOURCE_ID, + type = CommandType.STRING, + required = true, + collectionType = CommandType.STRING, + description = "Delete details for resource id") private String resourceId; ///////////////////////////////////////////////////// @@ -70,6 +75,7 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Volume; } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java index 6d609916ad3..0cc8039200d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; @@ -56,7 +56,11 @@ public class ResizeVolumeCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.SHRINK_OK, type = CommandType.BOOLEAN, required = false, description = "Verify OK to Shrink") private boolean shrinkOk; - @Parameter(name = ApiConstants.DISK_OFFERING_ID, entityType = DiskOfferingResponse.class, type = CommandType.UUID, required = false, description = "new disk offering id") + @Parameter(name = ApiConstants.DISK_OFFERING_ID, + entityType = DiskOfferingResponse.class, + type = CommandType.UUID, + required = false, + description = "new disk offering id") private Long newDiskOfferingId; ///////////////////////////////////////////////////// @@ -110,7 +114,8 @@ public class ResizeVolumeCmd extends BaseAsyncCmd { if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { Project project = _projectService.findByProjectAccountId(volume.getAccountId()); if (project.getState() != Project.State.Active) { - throw new PermissionDeniedException("Can't add resources to project id=" + project.getId() + " in state=" + project.getState() + " as it's no longer active"); + throw new PermissionDeniedException("Can't add resources to project id=" + project.getId() + " in state=" + project.getState() + + " as it's no longer active"); } } else if (account.getState() == Account.State.disabled) { throw new PermissionDeniedException("The owner of volume " + id + " is disabled: " + account); diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java index 89cbc2c8157..f12cef844f0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; @@ -57,7 +58,9 @@ public class UpdateVolumeCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "The state of the volume", since = "4.3") private String state; - @Parameter(name = ApiConstants.DISPLAY_VOLUME, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the volume to the end user or not.") + @Parameter(name = ApiConstants.DISPLAY_VOLUME, + type = CommandType.BOOLEAN, + description = "an optional field, whether to the display the volume to the end user or not.") private Boolean displayVolume; ///////////////////////////////////////////////////// @@ -93,10 +96,12 @@ public class UpdateVolumeCmd extends BaseAsyncCmd { return s_name; } + @Override public ApiCommandJobType getInstanceType() { return ApiCommandJobType.Volume; } + @Override public Long getInstanceId() { return getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java index 832b34db08d..991cfc1bd37 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java @@ -16,21 +16,20 @@ // under the License. package org.apache.cloudstack.api.command.user.volume; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -48,7 +47,10 @@ public class UploadVolumeCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, required = true, description = "the format for the volume. Possible values include QCOW2, OVA, and VHD.") + @Parameter(name = ApiConstants.FORMAT, + type = CommandType.STRING, + required = true, + description = "the format for the volume. Possible values include QCOW2, OVA, and VHD.") private String format; @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the volume") @@ -126,8 +128,8 @@ public class UploadVolumeCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { Volume volume = _volumeService.uploadVolume(this); if (volume != null) { diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java index 19f9b5bd9a8..0aafa399d08 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java @@ -47,13 +47,12 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the VPC. " + "Must be used with the domainId parameter.") + @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the VPC. " + + "Must be used with the domainId parameter.") private String accountName; - @Parameter(name = ApiConstants.DOMAIN_ID, - type = CommandType.UUID, - entityType = DomainResponse.class, - description = "the domain ID associated with the VPC. " + "If used with the account parameter returns the VPC associated with the account for the specified domain.") + @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the VPC. " + + "If used with the account parameter returns the VPC associated with the account for the specified domain.") private Long domainId; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "create VPC for the project") @@ -69,10 +68,14 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd { private String displayText; @Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, required = true, description = "the cidr of the VPC. All VPC " - + "guest networks' cidrs should be within this CIDR") + + "guest networks' cidrs should be within this CIDR") private String cidr; - @Parameter(name = ApiConstants.VPC_OFF_ID, type = CommandType.UUID, entityType = VpcOfferingResponse.class, required = true, description = "the ID of the VPC offering") + @Parameter(name = ApiConstants.VPC_OFF_ID, + type = CommandType.UUID, + entityType = VpcOfferingResponse.class, + required = true, + description = "the ID of the VPC offering") private Long vpcOffering; @Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "VPC network domain. All networks inside the VPC will belong to this domain") diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java index 87e5c300147..937341e5b6d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; import org.apache.cloudstack.api.ApiConstants; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.StaticRouteResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java index a2f20ef79c3..14f21ba7806 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java index a6789fcad1c..7870673f4b6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PrivateGatewayResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.network.vpc.PrivateGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java index 9e35944823b..85051cfdf61 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.VpcOfferingResponse; -import org.apache.log4j.Logger; import com.cloud.network.vpc.VpcOffering; @@ -49,7 +50,10 @@ public class ListVPCOfferingsCmd extends BaseListCmd { @Parameter(name = ApiConstants.IS_DEFAULT, type = CommandType.BOOLEAN, description = "true if need to list only default " + "VPC offerings. Default value is false") private Boolean isDefault; - @Parameter(name = ApiConstants.SUPPORTED_SERVICES, type = CommandType.LIST, collectionType = CommandType.STRING, description = "list VPC offerings supporting certain services") + @Parameter(name = ApiConstants.SUPPORTED_SERVICES, + type = CommandType.LIST, + collectionType = CommandType.STRING, + description = "list VPC offerings supporting certain services") private List supportedServices; @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "list VPC offerings by state") @@ -88,8 +92,9 @@ public class ListVPCOfferingsCmd extends BaseListCmd { @Override public void execute() { - List offerings = _vpcProvSvc.listVpcOfferings(getId(), getVpcOffName(), getDisplayText(), getSupportedServices(), isDefault, this.getKeyword(), - getState(), this.getStartIndex(), this.getPageSizeVal()); + List offerings = + _vpcProvSvc.listVpcOfferings(getId(), getVpcOffName(), getDisplayText(), getSupportedServices(), isDefault, this.getKeyword(), getState(), + this.getStartIndex(), this.getPageSizeVal()); ListResponse response = new ListResponse(); List offeringResponses = new ArrayList(); for (VpcOffering offering : offerings) { diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java index 22ee57189db..45ab863dcbb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java @@ -19,16 +19,16 @@ package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.VpcOfferingResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.network.vpc.Vpc; @@ -52,7 +52,8 @@ public class ListVPCsCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "List by display text of " + "the VPC") private String displayText; - @Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, description = "list by cidr of the VPC. All VPC " + "guest networks' cidrs should be within this CIDR") + @Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, description = "list by cidr of the VPC. All VPC " + + "guest networks' cidrs should be within this CIDR") private String cidr; @Parameter(name = ApiConstants.VPC_OFF_ID, type = CommandType.UUID, entityType = VpcOfferingResponse.class, description = "list by ID of the VPC offering") @@ -113,9 +114,10 @@ public class ListVPCsCmd extends BaseListTaggedResourcesCmd { @Override public void execute() { - List vpcs = _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), - getDomainId(), this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getZoneId(), this.isRecursive(), this.listAll(), getRestartRequired(), getTags(), - getProjectId()); + List vpcs = + _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), getDomainId(), + this.getKeyword(), this.getStartIndex(), this.getPageSizeVal(), getZoneId(), this.isRecursive(), this.listAll(), getRestartRequired(), getTags(), + getProjectId()); ListResponse response = new ListResponse(); List offeringResponses = new ArrayList(); for (Vpc vpc : vpcs) { diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java index 8b9a92537e1..ce144512f39 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java index 72ee1cff15a..73585247976 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpc; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.vpc.Vpc; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java index a704d621828..7c581178e4d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.VpnUsersResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.domain.Domain; import com.cloud.event.EventTypes; import com.cloud.network.VpnUser; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java index 027a341bae7..9277c498bae 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java index 6efea4a9148..821a4b02fd6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; @@ -58,10 +58,16 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ESP_POLICY, type = CommandType.STRING, required = true, description = "ESP policy of the customer gateway") private String espPolicy; - @Parameter(name = ApiConstants.IKE_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds") + @Parameter(name = ApiConstants.IKE_LIFETIME, + type = CommandType.LONG, + required = false, + description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds") private Long ikeLifetime; - @Parameter(name = ApiConstants.ESP_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds") + @Parameter(name = ApiConstants.ESP_LIFETIME, + type = CommandType.LONG, + required = false, + description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds") private Long espLifetime; @Parameter(name = ApiConstants.DPD, type = CommandType.BOOLEAN, required = false, description = "If DPD is enabled for VPN connection") @@ -74,7 +80,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd { type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the gateway. If used with the account parameter returns the " - + "gateway associated with the account for the specified domain.") + + "gateway associated with the account for the specified domain.") private Long domainId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java index f81a4ad1078..8955c8e9bd3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java @@ -40,7 +40,11 @@ public class CreateVpnGatewayCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, required = true, description = "public ip address id of the vpn gateway") + @Parameter(name = ApiConstants.VPC_ID, + type = CommandType.UUID, + entityType = VpcResponse.class, + required = true, + description = "public ip address id of the vpn gateway") private Long vpcId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java index 44daf35b699..41a8f1eaa0c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; @@ -25,8 +27,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java index 523b6e49608..c86cc59f104 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java index b979a05c03b..4c777d771a1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; @@ -39,7 +40,11 @@ public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = Site2SiteCustomerGatewayResponse.class, required = true, description = "id of customer gateway") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = Site2SiteCustomerGatewayResponse.class, + required = true, + description = "id of customer gateway") private Long id; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java index 0d53abb15e7..85f40049430 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteVpnGateway; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java index 7a031dc81c7..01e6d37fbb7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; -import org.apache.log4j.Logger; import com.cloud.network.RemoteAccessVpn; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java index 3b0308fdb68..8de60592ade 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java index 446d502671b..5cd4bfb98ed 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; -import org.apache.log4j.Logger; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java index 4d8108cec4e..75a5e810294 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.log4j.Logger; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java index ec53bec9a0b..5136633f5c1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.VpnUsersResponse; -import org.apache.log4j.Logger; import com.cloud.network.VpnUser; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java index cee7302779b..4eeef678154 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java index ff0c84dd8fb..efe6db8589c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteVpnConnection; diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java index 64ab1e34c82..5694a747cd6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.command.user.vpn; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -26,8 +28,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; @@ -40,7 +40,11 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = Site2SiteCustomerGatewayResponse.class, required = true, description = "id of customer gateway") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = Site2SiteCustomerGatewayResponse.class, + required = true, + description = "id of customer gateway") private Long id; @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "name of this customer gateway") @@ -61,10 +65,16 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ESP_POLICY, type = CommandType.STRING, required = true, description = "ESP policy of the customer gateway") private String espPolicy; - @Parameter(name = ApiConstants.IKE_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds") + @Parameter(name = ApiConstants.IKE_LIFETIME, + type = CommandType.LONG, + required = false, + description = "Lifetime of phase 1 VPN connection to the customer gateway, in seconds") private Long ikeLifetime; - @Parameter(name = ApiConstants.ESP_LIFETIME, type = CommandType.LONG, required = false, description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds") + @Parameter(name = ApiConstants.ESP_LIFETIME, + type = CommandType.LONG, + required = false, + description = "Lifetime of phase 2 VPN connection to the customer gateway, in seconds") private Long espLifetime; @Parameter(name = ApiConstants.DPD, type = CommandType.BOOLEAN, required = false, description = "If DPD is enabled for VPN connection") @@ -77,7 +87,7 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd { type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the gateway. If used with the account parameter returns the " - + "gateway associated with the account for the specified domain.") + + "gateway associated with the account for the specified domain.") private Long domainId; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java index 8a50cbde1f9..471e6d684c0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java @@ -21,6 +21,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; @@ -47,7 +48,7 @@ public class ListZonesByCmd extends BaseListCmd { @Parameter(name = ApiConstants.AVAILABLE, type = CommandType.BOOLEAN, description = "true if you want to retrieve all available Zones. False if you only want to return the Zones" - + " from which you have at least one VM. Default is false.") + + " from which you have at least one VM. Default is false.") private Boolean available; @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain associated with the zone") diff --git a/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java b/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java index 0f339be4858..0725d40983a 100644 --- a/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AddIpToVmNicResponse.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.Date; -import java.util.List; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class AddIpToVmNicResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/org/apache/cloudstack/api/response/AlertResponse.java index 308ced57693..5a279157613 100644 --- a/api/src/org/apache/cloudstack/api/response/AlertResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AlertResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.alert.Alert; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Alert.class) @SuppressWarnings("unused") @@ -34,11 +35,12 @@ public class AlertResponse extends BaseResponse { private String id; @SerializedName(ApiConstants.TYPE) - @Param(description = "One of the following alert types: " + "MEMORY = 0, CPU = 1, STORAGE = 2, STORAGE_ALLOCATED = 3, PUBLIC_IP = 4, PRIVATE_IP = 5, HOST = 6, USERVM = 7, " - + "DOMAIN_ROUTER = 8, CONSOLE_PROXY = 9, ROUTING = 10: lost connection to default route (to the gateway), " - + "STORAGE_MISC = 11: lost connection to default route (to the gateway), " + "USAGE_SERVER = 12: lost connection to default route (to the gateway), " - + "MANAGMENT_NODE = 13: lost connection to default route (to the gateway), " - + "DOMAIN_ROUTER_MIGRATE = 14, CONSOLE_PROXY_MIGRATE = 15, USERVM_MIGRATE = 16, VLAN = 17, SSVM = 18, " + "USAGE_SERVER_RESULT = 19") + @Param(description = "One of the following alert types: " + + "MEMORY = 0, CPU = 1, STORAGE = 2, STORAGE_ALLOCATED = 3, PUBLIC_IP = 4, PRIVATE_IP = 5, HOST = 6, USERVM = 7, " + + "DOMAIN_ROUTER = 8, CONSOLE_PROXY = 9, ROUTING = 10: lost connection to default route (to the gateway), " + + "STORAGE_MISC = 11: lost connection to default route (to the gateway), " + "USAGE_SERVER = 12: lost connection to default route (to the gateway), " + + "MANAGMENT_NODE = 13: lost connection to default route (to the gateway), " + + "DOMAIN_ROUTER_MIGRATE = 14, CONSOLE_PROXY_MIGRATE = 15, USERVM_MIGRATE = 16, VLAN = 17, SSVM = 18, " + "USAGE_SERVER_RESULT = 19") private Short alertType; @SerializedName(ApiConstants.DESCRIPTION) diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java index bdbb954df03..edaac07b974 100644 --- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; /** * diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java index ef5c8d4c2ee..1e9f9c7ba30 100644 --- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java @@ -17,15 +17,14 @@ package org.apache.cloudstack.api.response; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; + +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class ApplicationLoadBalancerResponse extends BaseResponse implements ControlledEntityResponse { @@ -89,6 +88,7 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con @Param(description = "the list of resource tags associated with the Load Balancer", responseObject = ResourceTagResponse.class) private List tags; + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -98,6 +98,7 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java index 2de19b761ff..8af64276c9e 100644 --- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java @@ -17,11 +17,12 @@ package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; /** * Subobject of the load balancer container response diff --git a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java index 89920c19583..bf85d8b227f 100644 --- a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.as.AutoScalePolicy; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = AutoScalePolicy.class) public class AutoScalePolicyResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java index 4f4df48ad4e..a88325f98b0 100644 --- a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.as.AutoScaleVmGroup; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = AutoScaleVmGroup.class) public class AutoScaleVmGroupResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java index 9d84d93e68f..e1c33e7881b 100644 --- a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.BaseResponse; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter; import com.cloud.network.as.AutoScaleVmProfile; import com.cloud.serializer.Param; import com.cloud.utils.Pair; -import com.google.gson.annotations.SerializedName; @EntityReference(value = AutoScaleVmProfile.class) public class AutoScaleVmProfileResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java index c7074827007..6862a5541eb 100644 --- a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class CapabilityResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java index 65626525e89..460e4af8926 100644 --- a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class CapacityResponse extends BaseResponse { @SerializedName(ApiConstants.TYPE) diff --git a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java index 2847753115d..94520ef2f8f 100644 --- a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class CloudIdentifierResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java index d147b6b81f8..08903091eba 100644 --- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java @@ -16,15 +16,17 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.org.Cluster; -import com.cloud.serializer.Param; +import java.util.ArrayList; +import java.util.List; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.ArrayList; -import java.util.List; +import com.cloud.org.Cluster; +import com.cloud.serializer.Param; @EntityReference(value = Cluster.class) public class ClusterResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java index 732b25a8ea5..94175f34a99 100644 --- a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.as.Condition; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Condition.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java index 5de33507cb5..2d815deb286 100644 --- a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ConfigurationResponse extends BaseResponse { @SerializedName(ApiConstants.CATEGORY) diff --git a/api/src/org/apache/cloudstack/api/response/CounterResponse.java b/api/src/org/apache/cloudstack/api/response/CounterResponse.java index 5fe8e5643dd..a9bac00c8ac 100644 --- a/api/src/org/apache/cloudstack/api/response/CounterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CounterResponse.java @@ -17,13 +17,14 @@ package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.as.Counter; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = Counter.class) diff --git a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java index a640495f33d..4ed1b53173f 100644 --- a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java @@ -16,9 +16,10 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import com.cloud.serializer.Param; + public class CreateSSHKeyPairResponse extends SSHKeyPairResponse { @SerializedName("privatekey") diff --git a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java index c46356a4cce..44b73276918 100644 --- a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class CustomCertificateResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java index a37800fd650..c04af8d7db5 100644 --- a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class DeploymentPlannersResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java index e5a0abf780f..affa10652b0 100644 --- a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.offering.DiskOffering; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = DiskOffering.class) public class DiskOfferingResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/org/apache/cloudstack/api/response/DomainResponse.java index 87b170b37b7..0c0281e1e35 100644 --- a/api/src/org/apache/cloudstack/api/response/DomainResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.domain.Domain; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Domain.class) public class DomainResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java index 72c62014d30..ed160204619 100644 --- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java @@ -17,10 +17,11 @@ package org.apache.cloudstack.api.response; import java.util.Date; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -28,7 +29,6 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualMachine.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java b/api/src/org/apache/cloudstack/api/response/EventResponse.java index d362abc661c..5ce66edcd28 100644 --- a/api/src/org/apache/cloudstack/api/response/EventResponse.java +++ b/api/src/org/apache/cloudstack/api/response/EventResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.event.Event; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Event.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java index d50a0a903b7..45dc06b66a8 100644 --- a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class EventTypeResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) diff --git a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java index 5a2dfb76227..65d4ac33371 100644 --- a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java @@ -19,11 +19,12 @@ package org.apache.cloudstack.api.response; import java.util.ArrayList; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.cloud.utils.exception.ExceptionProxyObject; -import com.google.gson.annotations.SerializedName; public class ExceptionResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java index aee71b0e66e..b92288ddb3f 100644 --- a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ExternalFirewallResponse extends NetworkDeviceResponse { @@ -67,10 +68,12 @@ public class ExternalFirewallResponse extends NetworkDeviceResponse { @Param(description = "the timeout (in seconds) for requests to the external firewall") private String timeout; + @Override public String getId() { return id; } + @Override public void setId(String id) { this.id = id; } diff --git a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java index 770a6e27ea4..fe50b977428 100644 --- a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ExternalLoadBalancerResponse extends NetworkDeviceResponse { @@ -51,10 +52,12 @@ public class ExternalLoadBalancerResponse extends NetworkDeviceResponse { @Param(description = "the number of times to retry requests to the external load balancer") private String numRetries; + @Override public String getId() { return id; } + @Override public void setId(String id) { this.id = id; } diff --git a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java index 5aed086cd19..fa7488f15bf 100644 --- a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ExtractResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java index 6e154f966a5..e3aaec567e1 100644 --- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class FirewallResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java index 08d6823bc2c..71a3097688c 100644 --- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.rules.FirewallRule; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = FirewallRule.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java index 2dff790b3bf..c72031b8220 100644 --- a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class GetVMPasswordResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java index 504cfd9292f..aac7e29a173 100644 --- a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java @@ -16,14 +16,16 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.region.ha.GlobalLoadBalancerRule; -import com.cloud.serializer.Param; +import java.util.List; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.List; +import com.cloud.region.ha.GlobalLoadBalancerRule; +import com.cloud.serializer.Param; @EntityReference(value = GlobalLoadBalancerRule.class) public class GlobalLoadBalancerResponse extends BaseResponse implements ControlledEntityResponse { @@ -116,6 +118,7 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll this.gslbDomainName = domainName; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -135,6 +138,7 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java index 112c50f3966..7872bf22085 100644 --- a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.GuestOsCategory; -import com.google.gson.annotations.SerializedName; @EntityReference(value = GuestOsCategory.class) public class GuestOSCategoryResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java index 02bd177dc61..9737d6073ad 100644 --- a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.GuestOS; -import com.google.gson.annotations.SerializedName; @EntityReference(value = GuestOS.class) public class GuestOSResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java b/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java index 42ab66156b2..16ce223c08c 100644 --- a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.GuestVlan; +import com.cloud.serializer.Param; @EntityReference(value = GuestVlan.class) @SuppressWarnings("unused") @@ -67,14 +68,17 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn this.id = id; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } + @Override public void setDomainId(String domainId) { this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } @@ -83,10 +87,12 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn this.guestVlanRange = guestVlanRange; } + @Override public void setProjectId(String projectId) { this.projectId = projectId; } + @Override public void setProjectName(String projectName) { this.projectName = projectName; } diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java index 48dd9bf1eb7..6e2e745a448 100644 --- a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -26,7 +28,6 @@ import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Host.class) public class HostForMigrationResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java index 87884e9fe40..e2d8eb5c473 100644 --- a/api/src/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -26,7 +28,6 @@ import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Host.class) public class HostResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java index 75e54be4b50..d6f7c2e2e44 100644 --- a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorCapabilities; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = HypervisorCapabilities.class) public class HypervisorCapabilitiesResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java index 072a6b1c1c5..2915d7c979b 100644 --- a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class HypervisorResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java index 79831cab447..4889a5638c3 100644 --- a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.IpAddress; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = IpAddress.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java b/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java index 244539c2cf4..8863b632681 100644 --- a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ImageStoreDetailResponse extends BaseResponse { @SerializedName("name") diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java index ead90350176..bb44a01979c 100644 --- a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.response; import java.util.LinkedHashSet; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -26,7 +28,6 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.ImageStore; import com.cloud.storage.ScopeType; -import com.google.gson.annotations.SerializedName; @EntityReference(value = ImageStore.class) public class ImageStoreResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java index c105aece206..a2baf992f0e 100644 --- a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.vm.InstanceGroup; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = InstanceGroup.class) diff --git a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java b/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java index f1cd90a3007..15b17d88851 100644 --- a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java +++ b/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.VirtualRouterProvider; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualRouterProvider.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java index a1b107ddf3f..e9856c7af1a 100644 --- a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class IpForwardingRuleResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java index 58e25ab633d..204fdc8008c 100644 --- a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class IsoVmResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java b/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java index 6a7da98cefe..86fa0ffc3ae 100644 --- a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class IsolationMethodResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java index 5dd123c03a3..406a8dab0d1 100644 --- a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java @@ -16,10 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.BaseResponse; + import com.cloud.network.rules.HealthCheckPolicy; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.BaseResponse; public class LBHealthCheckPolicyResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java b/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java index ddb601a827c..cbd953d34a3 100644 --- a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java @@ -16,15 +16,16 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.network.rules.HealthCheckPolicy; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; +import java.util.List; + import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.List; -import java.util.UUID; +import com.cloud.network.rules.HealthCheckPolicy; +import com.cloud.serializer.Param; @EntityReference(value = HealthCheckPolicy.class) public class LBHealthCheckResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java index d18c18b1fc4..76c54cd4cde 100644 --- a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java @@ -20,12 +20,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.network.rules.StickinessPolicy; import com.cloud.serializer.Param; import com.cloud.utils.Pair; -import com.google.gson.annotations.SerializedName; public class LBStickinessPolicyResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java index 7cbd70f0fca..75c00acfab0 100644 --- a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.rules.StickinessPolicy; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = StickinessPolicy.class) public class LBStickinessResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java index 57fb5ece366..03946b90064 100644 --- a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class LoadBalancerResponse extends BaseResponse implements ControlledEntityResponse { @@ -134,6 +135,7 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti this.algorithm = algorithm; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -143,6 +145,7 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java index 50b74945f22..430422c17e6 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java @@ -18,14 +18,15 @@ package org.apache.cloudstack.api.response; import java.util.List; -import com.cloud.network.vpc.NetworkACLItem; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; - -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.EntityReference; +import com.cloud.network.vpc.NetworkACLItem; +import com.cloud.serializer.Param; + @EntityReference(value = NetworkACLItem.class) public class NetworkACLItemResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java index 57e71d59393..1ee9c33d2b0 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java @@ -16,14 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.network.vpc.NetworkACL; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.List; +import com.cloud.network.vpc.NetworkACL; +import com.cloud.serializer.Param; @EntityReference(value = NetworkACL.class) public class NetworkACLResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java index 8eb3987effa..a991c7ae2b0 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class NetworkDeviceResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java index f92307e2724..8219147726e 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java @@ -20,13 +20,14 @@ import java.util.Date; import java.util.List; import java.util.Map; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.offering.NetworkOffering; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = NetworkOffering.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java index 0f0ce9f7e29..58ec956e9bc 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.network.Network; import com.cloud.projects.ProjectAccount; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = {Network.class, ProjectAccount.class}) @@ -279,6 +280,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes this.type = type; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -312,6 +314,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes this.isSystem = isSystem; } + @Override public void setDomainName(String domain) { this.domain = domain; } diff --git a/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java b/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java index a48bc9ce3d8..152d101d315 100644 --- a/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NicDetailResponse.java @@ -16,17 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; -import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class NicDetailResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/NicResponse.java b/api/src/org/apache/cloudstack/api/response/NicResponse.java index 25f313bfa89..7089f884a51 100644 --- a/api/src/org/apache/cloudstack/api/response/NicResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NicResponse.java @@ -18,16 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; import com.cloud.vm.Nic; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.BaseResponse; -import org.apache.cloudstack.api.EntityReference; @SuppressWarnings("unused") @EntityReference(value = Nic.class) diff --git a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java b/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java index 39edfac7988..e0884c08df1 100644 --- a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java @@ -16,17 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.Date; -import java.util.List; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import com.cloud.network.rules.FirewallRule; import com.cloud.serializer.Param; import com.cloud.vm.NicSecondaryIp; -import com.google.gson.annotations.SerializedName; @EntityReference(value = NicSecondaryIp.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java index b8379ee2740..104005203fd 100644 --- a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.PhysicalNetwork; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = PhysicalNetwork.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java index 1d3015ee36a..7ff0bfc8bcb 100644 --- a/api/src/org/apache/cloudstack/api/response/PodResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.Pod; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Pod.class) public class PodResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java index a597ab0ca83..ddb2f9052d8 100644 --- a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java @@ -17,18 +17,17 @@ package org.apache.cloudstack.api.response; -import java.util.Date; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; - -import com.cloud.network.IpAddress; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.region.PortableIpRange; +import com.cloud.serializer.Param; + @EntityReference(value = PortableIpRange.class) public class PortableIpRangeResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java b/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java index b98c5dce388..73008b01ccd 100644 --- a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java @@ -18,17 +18,15 @@ package org.apache.cloudstack.api.response; import java.util.Date; -import java.util.List; + +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; - -import com.cloud.network.IpAddress; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.region.PortableIp; -import org.apache.cloudstack.region.PortableIpRange; + +import com.cloud.serializer.Param; @EntityReference(value = PortableIp.class) public class PortableIpResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java index 1cba39d07b5..413497fcd24 100644 --- a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.vpc.VpcGateway; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VpcGateway.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java index 6bff1218a88..7afad59096b 100644 --- a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.projects.ProjectAccount; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = ProjectAccount.class) @SuppressWarnings("unused") @@ -65,10 +66,12 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi @Param(description = "the list of users associated with account", responseObject = UserResponse.class) private List users; + @Override public void setProjectId(String projectId) { this.projectId = projectId; } + @Override public void setProjectName(String projectName) { this.projectName = projectName; } @@ -77,6 +80,7 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi this.accountId = id; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -85,10 +89,12 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi this.accountType = accountType; } + @Override public void setDomainId(String domainId) { this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java index 269319aa9d4..8768df71b87 100644 --- a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.projects.ProjectInvitation; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = ProjectInvitation.class) @SuppressWarnings("unused") @@ -63,22 +64,27 @@ public class ProjectInvitationResponse extends BaseResponse implements Controlle this.id = id; } + @Override public void setProjectId(String projectId) { this.projectId = projectId; } + @Override public void setProjectName(String projectName) { this.projectName = projectName; } + @Override public void setDomainId(String domainId) { this.domainId = domainId; } + @Override public void setDomainName(String domain) { this.domainName = domain; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java index 4d410837476..5d6ec0d5ca3 100644 --- a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = PhysicalNetworkServiceProvider.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/RegionResponse.java b/api/src/org/apache/cloudstack/api/response/RegionResponse.java index aa2f34dc3e2..6c74fa623ce 100644 --- a/api/src/org/apache/cloudstack/api/response/RegionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/RegionResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import org.apache.cloudstack.region.Region; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Region.class) public class RegionResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java index 271357d55c8..fd944b0e514 100644 --- a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class RegisterResponse extends BaseResponse { @SerializedName("apikey") diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java index d548702ec29..e09bd946994 100644 --- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java +++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.RemoteAccessVpn; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = RemoteAccessVpn.class) @SuppressWarnings("unused") @@ -84,6 +85,7 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE this.presharedKey = presharedKey; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -93,6 +95,7 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE this.domainId = domainId; } + @Override public void setDomainName(String name) { this.domainName = name; } diff --git a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java index aff3770dbf2..7173235608e 100644 --- a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java index 1eb88a7fd7e..3ebb9c737ec 100644 --- a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class ResourceDetailResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java index b62ccc20081..6890915fdde 100644 --- a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.configuration.ResourceLimit; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = ResourceLimit.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java index 4b05d29f2ac..839876e345e 100644 --- a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class ResourceTagResponse extends BaseResponse implements ControlledViewEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java index 2509a4077ff..4e1d3149951 100644 --- a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class SSHKeyPairResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java index 0eea19141b0..0be2ee137be 100644 --- a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java @@ -16,17 +16,17 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.security.SecurityGroup; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = SecurityGroup.class) @@ -103,6 +103,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie this.description = description; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -112,6 +113,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java index 1670cfc8567..e2d525a9746 100644 --- a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.security.SecurityRule; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = SecurityRule.class) public class SecurityGroupRuleResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java index 90732bcb7bc..7ec739eed00 100644 --- a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; import java.util.Map; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.offering.ServiceOffering; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = ServiceOffering.class) public class ServiceOfferingResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java index 99cbc1b2455..9f5acc13f8b 100644 --- a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java @@ -16,12 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; +import java.util.List; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; -import java.util.List; +import com.cloud.serializer.Param; @SuppressWarnings("unused") public class ServiceResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java index 18eb64d0e33..8a6ccd08b4e 100644 --- a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Site2SiteCustomerGateway.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java index 3616bbf1065..423b6cda71b 100644 --- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Site2SiteVpnConnection.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java index d9dc9203b6a..c0917c7e09f 100644 --- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Site2SiteVpnGateway.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java index 419d505ee41..913d2349d0e 100644 --- a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.snapshot.SnapshotPolicy; -import com.google.gson.annotations.SerializedName; @EntityReference(value = SnapshotPolicy.class) public class SnapshotPolicyResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java index 841f3f22a01..10cb202ba93 100644 --- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.Snapshot; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Snapshot.class) public class SnapshotResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java index 7934602227c..7bc8ee8cba2 100644 --- a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java @@ -18,10 +18,11 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class SnapshotScheduleResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java index 17cad57d5da..6fc7221a1d4 100644 --- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java @@ -16,14 +16,16 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.network.lb.SslCert; -import com.cloud.serializer.Param; +import java.util.List; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.List; +import com.cloud.network.lb.SslCert; +import com.cloud.serializer.Param; //import org.apache.cloudstack.api.EntityReference; diff --git a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java index 3ebe1e5d3e9..79c7f9040a1 100644 --- a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.vpc.StaticRoute; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = StaticRoute.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/StatusResponse.java b/api/src/org/apache/cloudstack/api/response/StatusResponse.java index 1cb4d8f221b..fa2b4b2020f 100644 --- a/api/src/org/apache/cloudstack/api/response/StatusResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StatusResponse.java @@ -16,10 +16,10 @@ // under the License. package org.apache.cloudstack.api.response; -import org.apache.cloudstack.api.BaseResponse; - import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; + public class StatusResponse extends BaseResponse { @SerializedName("status") private Boolean status; diff --git a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java index 1e4cad44e96..1dc60ce67f3 100644 --- a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = StorageNetworkIpRange.class) public class StorageNetworkIpRangeResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java index 1cc8f6f68f5..03a4f349ba0 100644 --- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java @@ -16,16 +16,18 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; -import com.cloud.storage.StoragePool; -import com.cloud.storage.StoragePoolStatus; +import java.util.Date; +import java.util.Map; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import java.util.Date; -import java.util.Map; +import com.cloud.serializer.Param; +import com.cloud.storage.StoragePool; +import com.cloud.storage.StoragePoolStatus; @EntityReference(value = StoragePool.class) public class StoragePoolResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java index 344f8e78fa1..d68979a5bcd 100644 --- a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java @@ -18,10 +18,11 @@ */ package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class StorageProviderResponse extends BaseResponse { @SerializedName("name") diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java index 815b837fd07..0dde6d0e423 100644 --- a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class SuccessResponse extends BaseResponse { @SerializedName("success") diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java index 94e404abe6c..5e0638080b9 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; /* * This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP)) diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java index c843d896f4f..8c27c185ebf 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.vm.VirtualMachine; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualMachine.class) public class SystemVmResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java index 2ff11ecf9f4..5f0b9a58c7c 100644 --- a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.template.VirtualMachineTemplate; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualMachineTemplate.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java index e7d81cfa737..3e21043e339 100644 --- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java @@ -21,6 +21,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualMachineTemplate.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java index cb1fd98ec72..f2e7725de03 100644 --- a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class TemplateZoneResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_ID) diff --git a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java index 2c2d0132cd0..b19c422a5af 100644 --- a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class TrafficMonitorResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java index 6532a3f2808..ebcd7c9a0d4 100644 --- a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class TrafficTypeImplementorResponse extends BaseResponse { @SerializedName(ApiConstants.TRAFFIC_TYPE) diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java index 7ab853263f5..69dd06211a8 100644 --- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.PhysicalNetworkTrafficType; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = PhysicalNetworkTrafficType.class) public class TrafficTypeResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java index b4910b43776..d89631ae428 100644 --- a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java @@ -16,18 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import org.apache.cloudstack.jobs.JobInfo; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.Set; +import com.cloud.serializer.Param; @EntityReference(value = JobInfo.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java index 09f33c9e1d3..c42b64bc726 100644 --- a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java @@ -18,11 +18,12 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class UpgradeVmResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java index abb955207ff..5e2e85dea4b 100644 --- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class UsageRecordResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java index 897035a5f15..83b97f00c15 100644 --- a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class UsageTypeResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java index f8211cbafcc..40e1561cb8d 100644 --- a/api/src/org/apache/cloudstack/api/response/UserResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java @@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.user.User; -import com.google.gson.annotations.SerializedName; @EntityReference(value = User.class) public class UserResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java index 3dccf9d288c..3ca2a1c81b1 100644 --- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java @@ -21,6 +21,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; @@ -30,7 +32,6 @@ import com.cloud.network.router.VirtualRouter; import com.cloud.serializer.Param; import com.cloud.uservm.UserVm; import com.cloud.vm.VirtualMachine; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = {VirtualMachine.class, UserVm.class, VirtualRouter.class}) diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java index 25ad686f718..168c5482213 100644 --- a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.vm.snapshot.VMSnapshot; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VMSnapshot.class) public class VMSnapshotResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java index 4189d641d6a..c3b46710f6f 100644 --- a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.VirtualRouterProvider; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VirtualRouterProvider.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java index aff486a85b3..59214847a92 100644 --- a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.Vlan; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Vlan.class) @SuppressWarnings("unused") @@ -131,14 +132,17 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit this.vlan = vlan; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } + @Override public void setDomainId(String domainId) { this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java index b4170a9a017..957fb48708f 100644 --- a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java @@ -16,18 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; -import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; -import com.cloud.storage.Volume; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") public class VolumeDetailResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java index 25fc553e31c..f511662993e 100644 --- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java @@ -20,13 +20,14 @@ import java.util.Date; import java.util.LinkedHashSet; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.storage.Volume; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Volume.class) @SuppressWarnings("unused") @@ -284,6 +285,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity this.created = created; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -293,6 +295,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity this.domainId = domainId; } + @Override public void setDomainName(String domainName) { this.domainName = domainName; } diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java index 7d555d7fbce..17e4dfdd0b6 100644 --- a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.vpc.VpcOffering; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VpcOffering.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java index aaa7d799bd4..fd9b710bc27 100644 --- a/api/src/org/apache/cloudstack/api/response/VpcResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.vpc.Vpc; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = Vpc.class) @SuppressWarnings("unused") diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java index 8b702908aaf..3a0e84285aa 100644 --- a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.VpnUser; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = VpnUser.class) @SuppressWarnings("unused") @@ -67,6 +68,7 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe this.userName = name; } + @Override public void setAccountName(String accountName) { this.accountName = accountName; } @@ -76,6 +78,7 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe this.domainId = domainId; } + @Override public void setDomainName(String name) { this.domainName = name; } diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java index 7f4687ad0f0..bbb9a7b4060 100644 --- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java @@ -21,13 +21,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.DataCenter; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") @EntityReference(value = DataCenter.class) diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java index 6f65091c3ef..7a0b2d00486 100644 --- a/api/src/org/apache/cloudstack/context/CallContext.java +++ b/api/src/org/apache/cloudstack/context/CallContext.java @@ -21,10 +21,11 @@ import java.util.Map; import java.util.Stack; import java.util.UUID; -import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal; import org.apache.log4j.Logger; import org.apache.log4j.NDC; +import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal; + import com.cloud.exception.CloudAuthenticationException; import com.cloud.user.Account; import com.cloud.user.User; @@ -288,6 +289,12 @@ public class CallContext { @Override public String toString() { - return new StringBuilder("CCtxt[acct=").append(getCallingAccountId()).append("; user=").append(getCallingUserId()).append("; id=").append(contextId).append("]").toString(); + return new StringBuilder("CCtxt[acct=").append(getCallingAccountId()) + .append("; user=") + .append(getCallingUserId()) + .append("; id=") + .append(contextId) + .append("]") + .toString(); } } diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java index 57131eeeb6e..792ed04c3da 100644 --- a/api/src/org/apache/cloudstack/query/QueryService.java +++ b/api/src/org/apache/cloudstack/query/QueryService.java @@ -16,12 +16,14 @@ // under the License. package org.apache.cloudstack.query; +import java.util.List; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd; import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; -import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd; import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd; +import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd; import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; import org.apache.cloudstack.api.command.admin.user.ListUsersCmd; import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; @@ -41,12 +43,31 @@ import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; import org.apache.cloudstack.api.command.user.volume.ListResourceDetailsCmd; import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd; import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd; -import org.apache.cloudstack.api.response.*; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ImageStoreResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.ProjectInvitationResponse; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ResourceDetailResponse; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.exception.PermissionDeniedException; -import java.util.List; - /** * Service used for list api query. * @@ -97,8 +118,8 @@ public interface QueryService { public ListResponse listIsos(ListIsosCmd cmd); - public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, String accountName, - Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize); + public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, + String accountName, Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize); public List listResourceDetails(ListResourceDetailsCmd cmd); diff --git a/api/src/org/apache/cloudstack/region/PortableIp.java b/api/src/org/apache/cloudstack/region/PortableIp.java index b7aa66c3e2b..f56bc2783ff 100644 --- a/api/src/org/apache/cloudstack/region/PortableIp.java +++ b/api/src/org/apache/cloudstack/region/PortableIp.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.region; import java.util.Date; -import com.cloud.utils.net.Ip; import org.apache.cloudstack.api.InternalIdentity; public interface PortableIp extends InternalIdentity { diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/test/com/cloud/network/NetworksTest.java index df2985f8f0e..849b1b4f73f 100644 --- a/api/test/com/cloud/network/NetworksTest.java +++ b/api/test/com/cloud/network/NetworksTest.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network; -import java.net.URI; import java.net.URISyntaxException; import org.junit.Assert; diff --git a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java index 02b392050bc..1e4bb326f7e 100644 --- a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java @@ -19,13 +19,15 @@ package org.apache.cloudstack.api.command.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.Matchers; import org.mockito.Mockito; +import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; import com.cloud.projects.ProjectService; @@ -38,6 +40,7 @@ public class ActivateProjectCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { @@ -54,7 +57,7 @@ public class ActivateProjectCmdTest extends TestCase { @Test public void testGetEntityOwnerIdForNullProject() { ProjectService projectService = Mockito.mock(ProjectService.class); - Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(null); + Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(null); activateProjectCmd._projectService = projectService; try { @@ -71,9 +74,9 @@ public class ActivateProjectCmdTest extends TestCase { ProjectService projectService = Mockito.mock(ProjectService.class); Account account = Mockito.mock(Account.class); Mockito.when(account.getId()).thenReturn(2L); - Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(project); + Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(project); - Mockito.when(projectService.getProjectOwner(Mockito.anyLong())).thenReturn(account); + Mockito.when(projectService.getProjectOwner(Matchers.anyLong())).thenReturn(account); activateProjectCmd._projectService = projectService; Assert.assertEquals(2L, activateProjectCmd.getEntityOwnerId()); diff --git a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java index f01c4d70bb6..199ee00551d 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java @@ -19,13 +19,15 @@ package org.apache.cloudstack.api.command.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.Matchers; import org.mockito.Mockito; +import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; import com.cloud.projects.ProjectService; @@ -38,6 +40,7 @@ public class AddAccountToProjectCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { addAccountToProjectCmd = new AddAccountToProjectCmd() { @@ -98,9 +101,9 @@ public class AddAccountToProjectCmdTest extends TestCase { Account account = Mockito.mock(Account.class); Mockito.when(account.getId()).thenReturn(2L); - Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(project); + Mockito.when(projectService.getProject(Matchers.anyLong())).thenReturn(project); - Mockito.when(projectService.getProjectOwner(Mockito.anyLong())).thenReturn(account); + Mockito.when(projectService.getProjectOwner(Matchers.anyLong())).thenReturn(account); addAccountToProjectCmd._projectService = projectService; Assert.assertEquals(2L, addAccountToProjectCmd.getEntityOwnerId()); diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java index d7eacb17f25..195486aedd0 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java @@ -16,22 +16,22 @@ // under the License. package org.apache.cloudstack.api.command.test; -import com.cloud.vm.NicSecondaryIp; import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Matchers; +import org.mockito.Mockito; + import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd; import org.apache.cloudstack.api.command.user.vm.RemoveIpFromVmNicCmd; import org.apache.cloudstack.api.response.NicSecondaryIpResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.Mockito; - import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; @@ -40,6 +40,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.NetworkService; import com.cloud.user.Account; +import com.cloud.vm.NicSecondaryIp; public class AddIpToVmNicTest extends TestCase { @@ -51,6 +52,7 @@ public class AddIpToVmNicTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { addIpToVmNicCmd = new AddIpToVmNicCmd() { @@ -65,8 +67,8 @@ public class AddIpToVmNicTest extends TestCase { AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class); NicSecondaryIp secIp = Mockito.mock(NicSecondaryIp.class); - Mockito.when(networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn( - secIp); + Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString())) + .thenReturn(secIp); ipTonicCmd._networkService = networkService; responseGenerator = Mockito.mock(ResponseGenerator.class); @@ -84,8 +86,8 @@ public class AddIpToVmNicTest extends TestCase { NetworkService networkService = Mockito.mock(NetworkService.class); AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class); - Mockito.when(networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn( - null); + Mockito.when(networkService.allocateSecondaryGuestIP(Matchers.any(Account.class), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyString())) + .thenReturn(null); ipTonicCmd._networkService = networkService; @@ -97,12 +99,13 @@ public class AddIpToVmNicTest extends TestCase { } @Test - public void testRemoveIpFromVmNicSuccess() throws ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException, InsufficientCapacityException { + public void testRemoveIpFromVmNicSuccess() throws ResourceAllocationException, ResourceUnavailableException, ConcurrentOperationException, + InsufficientCapacityException { NetworkService networkService = Mockito.mock(NetworkService.class); RemoveIpFromVmNicCmd removeIpFromNic = Mockito.mock(RemoveIpFromVmNicCmd.class); - Mockito.when(networkService.releaseSecondaryIpFromNic(Mockito.anyInt())).thenReturn(true); + Mockito.when(networkService.releaseSecondaryIpFromNic(Matchers.anyInt())).thenReturn(true); removeIpFromNic._networkService = networkService; successResponseGenerator = Mockito.mock(SuccessResponse.class); @@ -115,7 +118,7 @@ public class AddIpToVmNicTest extends TestCase { NetworkService networkService = Mockito.mock(NetworkService.class); RemoveIpFromVmNicCmd removeIpFromNic = Mockito.mock(RemoveIpFromVmNicCmd.class); - Mockito.when(networkService.releaseSecondaryIpFromNic(Mockito.anyInt())).thenReturn(false); + Mockito.when(networkService.releaseSecondaryIpFromNic(Matchers.anyInt())).thenReturn(false); removeIpFromNic._networkService = networkService; successResponseGenerator = Mockito.mock(SuccessResponse.class); diff --git a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java index 512317850fb..8760fc87556 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java @@ -22,14 +22,16 @@ import java.util.List; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.Matchers; import org.mockito.Mockito; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd; + import com.cloud.exception.ResourceAllocationException; import com.cloud.network.NetworkService; import com.cloud.network.PhysicalNetworkServiceProvider; @@ -41,6 +43,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { addNetworkServiceProviderCmd = new AddNetworkServiceProviderCmd() { @@ -67,6 +70,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase { return lOfEnabledServices; } + @Override public Long getEntityId() { return 2L; } @@ -82,7 +86,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase { addNetworkServiceProviderCmd._networkService = networkService; PhysicalNetworkServiceProvider physicalNetworkServiceProvider = Mockito.mock(PhysicalNetworkServiceProvider.class); - Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyList())).thenReturn( + Mockito.when(networkService.addProviderToPhysicalNetwork(Matchers.anyLong(), Matchers.anyString(), Matchers.anyLong(), Matchers.anyList())).thenReturn( physicalNetworkServiceProvider); try { @@ -99,7 +103,7 @@ public class AddNetworkServiceProviderCmdTest extends TestCase { NetworkService networkService = Mockito.mock(NetworkService.class); addNetworkServiceProviderCmd._networkService = networkService; - Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyList())).thenReturn(null); + Mockito.when(networkService.addProviderToPhysicalNetwork(Matchers.anyLong(), Matchers.anyString(), Matchers.anyLong(), Matchers.anyList())).thenReturn(null); try { addNetworkServiceProviderCmd.create(); diff --git a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java index 88b17478b5d..d0b2d85f8d5 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java @@ -19,17 +19,17 @@ package org.apache.cloudstack.api.command.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd; -import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.ImageStoreResponse; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd; +import org.apache.cloudstack.api.response.ImageStoreResponse; + import com.cloud.storage.ImageStore; import com.cloud.storage.StorageService; diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java index 59d2e8ea662..3755353164f 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java @@ -19,14 +19,16 @@ package org.apache.cloudstack.api.command.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.Matchers; import org.mockito.Mockito; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd; + import com.cloud.network.VpnUser; import com.cloud.network.vpn.RemoteAccessVpnService; import com.cloud.user.Account; @@ -39,6 +41,7 @@ public class AddVpnUserCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { @@ -99,14 +102,14 @@ public class AddVpnUserCmdTest extends TestCase { AccountService accountService = Mockito.mock(AccountService.class); Account account = Mockito.mock(Account.class); - Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account); + Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account); addVpnUserCmd._accountService = accountService; RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class); VpnUser vpnUser = Mockito.mock(VpnUser.class); - Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(vpnUser); + Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(vpnUser); addVpnUserCmd._ravService = ravService; @@ -119,12 +122,12 @@ public class AddVpnUserCmdTest extends TestCase { AccountService accountService = Mockito.mock(AccountService.class); Account account = Mockito.mock(Account.class); - Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account); + Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account); addVpnUserCmd._accountService = accountService; RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class); - Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(null); + Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(null); addVpnUserCmd._ravService = ravService; diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java index b838946fe1b..6b56591d1f1 100644 --- a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java @@ -16,30 +16,26 @@ // under the License. package org.apache.cloudstack.api.command.test; -import com.cloud.configuration.ConfigurationService; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.resource.ResourceService; -import com.cloud.server.ManagementService; -import com.cloud.utils.Pair; +import java.util.ArrayList; +import java.util.List; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; -import org.apache.cloudstack.api.response.ConfigurationResponse; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.config.Configuration; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import java.util.ArrayList; -import java.util.List; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.config.Configuration; + +import com.cloud.server.ManagementService; +import com.cloud.utils.Pair; public class ListCfgCmdTest extends TestCase { @@ -50,6 +46,7 @@ public class ListCfgCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { responseGenerator = Mockito.mock(ResponseGenerator.class); diff --git a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java index 9ed475260e5..10c3d85fa8e 100644 --- a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java @@ -19,17 +19,19 @@ package org.apache.cloudstack.api.command.test; import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Matchers; +import org.mockito.Mockito; + import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.region.AddRegionCmd; import org.apache.cloudstack.api.response.RegionResponse; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.RegionService; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.Mockito; public class RegionCmdTest extends TestCase { @@ -39,6 +41,7 @@ public class RegionCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { @@ -63,7 +66,7 @@ public class RegionCmdTest extends TestCase { RegionService regionService = Mockito.mock(RegionService.class); Region region = Mockito.mock(Region.class); - Mockito.when(regionService.addRegion(Mockito.anyInt(), Mockito.anyString(), Mockito.anyString())).thenReturn(region); + Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(region); addRegionCmd._regionService = regionService; responseGenerator = Mockito.mock(ResponseGenerator.class); @@ -83,7 +86,7 @@ public class RegionCmdTest extends TestCase { RegionService regionService = Mockito.mock(RegionService.class); Region region = Mockito.mock(Region.class); - Mockito.when(regionService.addRegion(Mockito.anyInt(), Mockito.anyString(), Mockito.anyString())).thenReturn(null); + Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(null); addRegionCmd._regionService = regionService; diff --git a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java index 7c6f4920a22..0c03e39b5d9 100644 --- a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java @@ -16,22 +16,25 @@ // under the License. package org.apache.cloudstack.api.command.test; -import com.cloud.uservm.UserVm; -import com.cloud.vm.UserVmService; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; -import org.apache.cloudstack.api.response.UserVmResponse; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import java.util.LinkedList; -import java.util.List; + +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; +import org.apache.cloudstack.api.response.UserVmResponse; + +import com.cloud.uservm.UserVm; +import com.cloud.vm.UserVmService; public class ScaleVMCmdTest extends TestCase { diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java index 5a860cd6fb4..a07608a29fc 100644 --- a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java @@ -16,24 +16,23 @@ // under the License. package org.apache.cloudstack.api.command.test; -import com.cloud.configuration.ConfigurationService; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.resource.ResourceService; - import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Mockito; + import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; import org.apache.cloudstack.api.response.ConfigurationResponse; import org.apache.cloudstack.config.Configuration; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.Mockito; +import com.cloud.configuration.ConfigurationService; +import com.cloud.exception.InvalidParameterValueException; public class UpdateCfgCmdTest extends TestCase { @@ -44,6 +43,7 @@ public class UpdateCfgCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { responseGenerator = Mockito.mock(ResponseGenerator.class); diff --git a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java index ca31edaf0e4..cadf2754dbe 100644 --- a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java @@ -21,15 +21,16 @@ import java.util.List; import junit.framework.TestCase; -import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd; -import org.apache.cloudstack.usage.Usage; -import org.apache.cloudstack.usage.UsageService; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd; +import org.apache.cloudstack.usage.Usage; +import org.apache.cloudstack.usage.UsageService; + import com.cloud.utils.Pair; public class UsageCmdTest extends TestCase { @@ -39,6 +40,7 @@ public class UsageCmdTest extends TestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); + @Override @Before public void setUp() { diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java b/awsapi/src/com/amazon/ec2/ActivateLicense.java index 11fda5685fd..296e5818bf8 100644 --- a/awsapi/src/com/amazon/ec2/ActivateLicense.java +++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java @@ -98,7 +98,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ActivateLicense implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) { object.setActivateLicense(com.amazon.ec2.ActivateLicenseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java index 512d7411d2d..ad3f4bec9a1 100644 --- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java +++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java @@ -98,7 +98,8 @@ public class ActivateLicenseResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ActivateLicenseResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java index 2810f79fd69..02d73d5e564 100644 --- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java +++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java @@ -125,7 +125,8 @@ public class ActivateLicenseResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ActivateLicenseResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java index 445683c90e1..5e7f5c3422e 100644 --- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java +++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java @@ -125,7 +125,8 @@ public class ActivateLicenseType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ActivateLicenseType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java b/awsapi/src/com/amazon/ec2/AllocateAddress.java index 4c5ac3bd839..185f43da703 100644 --- a/awsapi/src/com/amazon/ec2/AllocateAddress.java +++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java @@ -98,7 +98,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AllocateAddress implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) { object.setAllocateAddress(com.amazon.ec2.AllocateAddressType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java index 76801a444b5..bfec9979e1f 100644 --- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java +++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java @@ -98,7 +98,8 @@ public class AllocateAddressResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AllocateAddressResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java index e0e4e644722..57aa866d049 100644 --- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java +++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java @@ -187,7 +187,8 @@ public class AllocateAddressResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -364,9 +365,8 @@ public class AllocateAddressResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java b/awsapi/src/com/amazon/ec2/AllocateAddressType.java index 5127044c6bc..52b183c3e64 100644 --- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java +++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java @@ -115,7 +115,8 @@ public class AllocateAddressType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -196,9 +197,8 @@ public class AllocateAddressType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java index 720cd34a9b0..57771605281 100644 --- a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java @@ -101,7 +101,8 @@ public class AllocationIdSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class AllocationIdSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java index d029139fae6..d7bfad9ad8f 100644 --- a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java +++ b/awsapi/src/com/amazon/ec2/AllocationIdSetType.java @@ -142,7 +142,8 @@ public class AllocationIdSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class AllocationIdSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java index 3672ab84357..e04952a5684 100644 --- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java +++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java @@ -29,7 +29,8 @@ package com.amazon.ec2; public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.AbstractInOutMessageReceiver { - public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) throws org.apache.axis2.AxisFault { + public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) + throws org.apache.axis2.AxisFault { try { @@ -52,12 +53,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describePlacementGroups".equals(methodName)) { com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroupsResponse289 = null; - com.amazon.ec2.DescribePlacementGroups wrappedParam = (com.amazon.ec2.DescribePlacementGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribePlacementGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribePlacementGroups wrappedParam = + (com.amazon.ec2.DescribePlacementGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribePlacementGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describePlacementGroupsResponse289 = - skel.describePlacementGroups(wrappedParam); + skel.describePlacementGroups(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse289, false); } else @@ -65,12 +67,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createSecurityGroup".equals(methodName)) { com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroupResponse291 = null; - com.amazon.ec2.CreateSecurityGroup wrappedParam = (com.amazon.ec2.CreateSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateSecurityGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateSecurityGroup wrappedParam = + (com.amazon.ec2.CreateSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSecurityGroup.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createSecurityGroupResponse291 = - skel.createSecurityGroup(wrappedParam); + skel.createSecurityGroup(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse291, false); } else @@ -78,13 +81,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("resetNetworkInterfaceAttribute".equals(methodName)) { com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttributeResponse293 = null; - com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam = (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.ResetNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam = + (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ResetNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); resetNetworkInterfaceAttributeResponse293 = - skel.resetNetworkInterfaceAttribute(wrappedParam); + skel.resetNetworkInterfaceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), resetNetworkInterfaceAttributeResponse293, false); } else @@ -92,12 +95,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createDhcpOptions".equals(methodName)) { com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptionsResponse295 = null; - com.amazon.ec2.CreateDhcpOptions wrappedParam = (com.amazon.ec2.CreateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateDhcpOptions wrappedParam = + (com.amazon.ec2.CreateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateDhcpOptions.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createDhcpOptionsResponse295 = - skel.createDhcpOptions(wrappedParam); + skel.createDhcpOptions(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createDhcpOptionsResponse295, false); } else @@ -105,12 +109,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createRouteTable".equals(methodName)) { com.amazon.ec2.CreateRouteTableResponse createRouteTableResponse297 = null; - com.amazon.ec2.CreateRouteTable wrappedParam = (com.amazon.ec2.CreateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateRouteTable wrappedParam = + (com.amazon.ec2.CreateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateRouteTable.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createRouteTableResponse297 = - skel.createRouteTable(wrappedParam); + skel.createRouteTable(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createRouteTableResponse297, false); } else @@ -118,12 +123,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSubnets".equals(methodName)) { com.amazon.ec2.DescribeSubnetsResponse describeSubnetsResponse299 = null; - com.amazon.ec2.DescribeSubnets wrappedParam = (com.amazon.ec2.DescribeSubnets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeSubnets.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSubnets wrappedParam = + (com.amazon.ec2.DescribeSubnets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSubnets.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeSubnetsResponse299 = - skel.describeSubnets(wrappedParam); + skel.describeSubnets(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse299, false); } else @@ -131,12 +137,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deactivateLicense".equals(methodName)) { com.amazon.ec2.DeactivateLicenseResponse deactivateLicenseResponse301 = null; - com.amazon.ec2.DeactivateLicense wrappedParam = (com.amazon.ec2.DeactivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeactivateLicense.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeactivateLicense wrappedParam = + (com.amazon.ec2.DeactivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeactivateLicense.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deactivateLicenseResponse301 = - skel.deactivateLicense(wrappedParam); + skel.deactivateLicense(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse301, false); } else @@ -144,12 +151,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteVpc".equals(methodName)) { com.amazon.ec2.DeleteVpcResponse deleteVpcResponse303 = null; - com.amazon.ec2.DeleteVpc wrappedParam = (com.amazon.ec2.DeleteVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpc.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteVpc wrappedParam = + (com.amazon.ec2.DeleteVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpc.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteVpcResponse303 = - skel.deleteVpc(wrappedParam); + skel.deleteVpc(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpcResponse303, false); } else @@ -157,12 +165,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("cancelSpotInstanceRequests".equals(methodName)) { com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequestsResponse305 = null; - com.amazon.ec2.CancelSpotInstanceRequests wrappedParam = (com.amazon.ec2.CancelSpotInstanceRequests)fromOM( - msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CancelSpotInstanceRequests wrappedParam = + (com.amazon.ec2.CancelSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CancelSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope())); cancelSpotInstanceRequestsResponse305 = - skel.cancelSpotInstanceRequests(wrappedParam); + skel.cancelSpotInstanceRequests(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), cancelSpotInstanceRequestsResponse305, false); } else @@ -170,12 +179,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createSubnet".equals(methodName)) { com.amazon.ec2.CreateSubnetResponse createSubnetResponse307 = null; - com.amazon.ec2.CreateSubnet wrappedParam = (com.amazon.ec2.CreateSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateSubnet.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateSubnet wrappedParam = + (com.amazon.ec2.CreateSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSubnet.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createSubnetResponse307 = - skel.createSubnet(wrappedParam); + skel.createSubnet(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createSubnetResponse307, false); } else @@ -183,12 +193,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteVpnGateway".equals(methodName)) { com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGatewayResponse309 = null; - com.amazon.ec2.DeleteVpnGateway wrappedParam = (com.amazon.ec2.DeleteVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteVpnGateway wrappedParam = + (com.amazon.ec2.DeleteVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpnGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteVpnGatewayResponse309 = - skel.deleteVpnGateway(wrappedParam); + skel.deleteVpnGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnGatewayResponse309, false); } else @@ -196,12 +207,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createNetworkAclEntry".equals(methodName)) { com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntryResponse311 = null; - com.amazon.ec2.CreateNetworkAclEntry wrappedParam = (com.amazon.ec2.CreateNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateNetworkAclEntry wrappedParam = + (com.amazon.ec2.CreateNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAclEntry.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createNetworkAclEntryResponse311 = - skel.createNetworkAclEntry(wrappedParam); + skel.createNetworkAclEntry(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclEntryResponse311, false); } else @@ -209,12 +221,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("requestSpotInstances".equals(methodName)) { com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstancesResponse313 = null; - com.amazon.ec2.RequestSpotInstances wrappedParam = (com.amazon.ec2.RequestSpotInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.RequestSpotInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RequestSpotInstances wrappedParam = + (com.amazon.ec2.RequestSpotInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RequestSpotInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); requestSpotInstancesResponse313 = - skel.requestSpotInstances(wrappedParam); + skel.requestSpotInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse313, false); } else @@ -222,12 +235,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVolumeAttribute".equals(methodName)) { com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttributeResponse315 = null; - com.amazon.ec2.DescribeVolumeAttribute wrappedParam = (com.amazon.ec2.DescribeVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVolumeAttribute wrappedParam = + (com.amazon.ec2.DescribeVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeVolumeAttributeResponse315 = - skel.describeVolumeAttribute(wrappedParam); + skel.describeVolumeAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeAttributeResponse315, false); } else @@ -235,12 +249,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("associateDhcpOptions".equals(methodName)) { com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptionsResponse317 = null; - com.amazon.ec2.AssociateDhcpOptions wrappedParam = (com.amazon.ec2.AssociateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AssociateDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AssociateDhcpOptions wrappedParam = + (com.amazon.ec2.AssociateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateDhcpOptions.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); associateDhcpOptionsResponse317 = - skel.associateDhcpOptions(wrappedParam); + skel.associateDhcpOptions(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), associateDhcpOptionsResponse317, false); } else @@ -248,12 +263,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeTags".equals(methodName)) { com.amazon.ec2.DescribeTagsResponse describeTagsResponse319 = null; - com.amazon.ec2.DescribeTags wrappedParam = (com.amazon.ec2.DescribeTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeTags.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeTags wrappedParam = + (com.amazon.ec2.DescribeTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeTags.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeTagsResponse319 = - skel.describeTags(wrappedParam); + skel.describeTags(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse319, false); } else @@ -261,12 +277,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("importKeyPair".equals(methodName)) { com.amazon.ec2.ImportKeyPairResponse importKeyPairResponse321 = null; - com.amazon.ec2.ImportKeyPair wrappedParam = (com.amazon.ec2.ImportKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ImportKeyPair.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ImportKeyPair wrappedParam = + (com.amazon.ec2.ImportKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportKeyPair.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); importKeyPairResponse321 = - skel.importKeyPair(wrappedParam); + skel.importKeyPair(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse321, false); } else @@ -274,12 +291,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteNetworkInterface".equals(methodName)) { com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterfaceResponse323 = null; - com.amazon.ec2.DeleteNetworkInterface wrappedParam = (com.amazon.ec2.DeleteNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteNetworkInterface.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteNetworkInterface wrappedParam = + (com.amazon.ec2.DeleteNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkInterface.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteNetworkInterfaceResponse323 = - skel.deleteNetworkInterface(wrappedParam); + skel.deleteNetworkInterface(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkInterfaceResponse323, false); } else @@ -287,12 +305,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVpcs".equals(methodName)) { com.amazon.ec2.DescribeVpcsResponse describeVpcsResponse325 = null; - com.amazon.ec2.DescribeVpcs wrappedParam = (com.amazon.ec2.DescribeVpcs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVpcs.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVpcs wrappedParam = + (com.amazon.ec2.DescribeVpcs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpcs.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeVpcsResponse325 = - skel.describeVpcs(wrappedParam); + skel.describeVpcs(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse325, false); } else @@ -300,12 +319,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeLicenses".equals(methodName)) { com.amazon.ec2.DescribeLicensesResponse describeLicensesResponse327 = null; - com.amazon.ec2.DescribeLicenses wrappedParam = (com.amazon.ec2.DescribeLicenses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeLicenses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeLicenses wrappedParam = + (com.amazon.ec2.DescribeLicenses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeLicenses.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeLicensesResponse327 = - skel.describeLicenses(wrappedParam); + skel.describeLicenses(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse327, false); } else @@ -313,12 +333,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("bundleInstance".equals(methodName)) { com.amazon.ec2.BundleInstanceResponse bundleInstanceResponse329 = null; - com.amazon.ec2.BundleInstance wrappedParam = (com.amazon.ec2.BundleInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.BundleInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.BundleInstance wrappedParam = + (com.amazon.ec2.BundleInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.BundleInstance.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); bundleInstanceResponse329 = - skel.bundleInstance(wrappedParam); + skel.bundleInstance(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), bundleInstanceResponse329, false); } else @@ -326,12 +347,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVpnConnections".equals(methodName)) { com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnectionsResponse331 = null; - com.amazon.ec2.DescribeVpnConnections wrappedParam = (com.amazon.ec2.DescribeVpnConnections)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVpnConnections.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVpnConnections wrappedParam = + (com.amazon.ec2.DescribeVpnConnections)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpnConnections.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeVpnConnectionsResponse331 = - skel.describeVpnConnections(wrappedParam); + skel.describeVpnConnections(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse331, false); } else @@ -339,12 +361,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeImages".equals(methodName)) { com.amazon.ec2.DescribeImagesResponse describeImagesResponse333 = null; - com.amazon.ec2.DescribeImages wrappedParam = (com.amazon.ec2.DescribeImages)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeImages.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeImages wrappedParam = + (com.amazon.ec2.DescribeImages)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImages.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeImagesResponse333 = - skel.describeImages(wrappedParam); + skel.describeImages(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeImagesResponse333, false); } else @@ -352,12 +375,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createInternetGateway".equals(methodName)) { com.amazon.ec2.CreateInternetGatewayResponse createInternetGatewayResponse335 = null; - com.amazon.ec2.CreateInternetGateway wrappedParam = (com.amazon.ec2.CreateInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateInternetGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateInternetGateway wrappedParam = + (com.amazon.ec2.CreateInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateInternetGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createInternetGatewayResponse335 = - skel.createInternetGateway(wrappedParam); + skel.createInternetGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createInternetGatewayResponse335, false); } else @@ -365,12 +389,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("disassociateRouteTable".equals(methodName)) { com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTableResponse337 = null; - com.amazon.ec2.DisassociateRouteTable wrappedParam = (com.amazon.ec2.DisassociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DisassociateRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DisassociateRouteTable wrappedParam = + (com.amazon.ec2.DisassociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisassociateRouteTable.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); disassociateRouteTableResponse337 = - skel.disassociateRouteTable(wrappedParam); + skel.disassociateRouteTable(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), disassociateRouteTableResponse337, false); } else @@ -378,12 +403,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("replaceNetworkAclEntry".equals(methodName)) { com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntryResponse339 = null; - com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam = (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ReplaceNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam = + (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReplaceNetworkAclEntry.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); replaceNetworkAclEntryResponse339 = - skel.replaceNetworkAclEntry(wrappedParam); + skel.replaceNetworkAclEntry(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclEntryResponse339, false); } else @@ -391,13 +417,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("authorizeSecurityGroupIngress".equals(methodName)) { com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngressResponse341 = null; - com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam = (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.AuthorizeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam = + (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.AuthorizeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); authorizeSecurityGroupIngressResponse341 = - skel.authorizeSecurityGroupIngress(wrappedParam); + skel.authorizeSecurityGroupIngress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupIngressResponse341, false); } else @@ -405,12 +431,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSnapshotAttribute".equals(methodName)) { com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttributeResponse343 = null; - com.amazon.ec2.DescribeSnapshotAttribute wrappedParam = (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSnapshotAttribute wrappedParam = + (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeSnapshotAttributeResponse343 = - skel.describeSnapshotAttribute(wrappedParam); + skel.describeSnapshotAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotAttributeResponse343, false); } else @@ -418,12 +445,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createVpnGateway".equals(methodName)) { com.amazon.ec2.CreateVpnGatewayResponse createVpnGatewayResponse345 = null; - com.amazon.ec2.CreateVpnGateway wrappedParam = (com.amazon.ec2.CreateVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateVpnGateway wrappedParam = + (com.amazon.ec2.CreateVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createVpnGatewayResponse345 = - skel.createVpnGateway(wrappedParam); + skel.createVpnGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createVpnGatewayResponse345, false); } else @@ -431,12 +459,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("resetInstanceAttribute".equals(methodName)) { com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttributeResponse347 = null; - com.amazon.ec2.ResetInstanceAttribute wrappedParam = (com.amazon.ec2.ResetInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ResetInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ResetInstanceAttribute wrappedParam = + (com.amazon.ec2.ResetInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetInstanceAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); resetInstanceAttributeResponse347 = - skel.resetInstanceAttribute(wrappedParam); + skel.resetInstanceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), resetInstanceAttributeResponse347, false); } else @@ -444,12 +473,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createTags".equals(methodName)) { com.amazon.ec2.CreateTagsResponse createTagsResponse349 = null; - com.amazon.ec2.CreateTags wrappedParam = (com.amazon.ec2.CreateTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateTags.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateTags wrappedParam = + (com.amazon.ec2.CreateTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateTags.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createTagsResponse349 = - skel.createTags(wrappedParam); + skel.createTags(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse349, false); } else @@ -457,13 +487,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("authorizeSecurityGroupEgress".equals(methodName)) { com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgressResponse351 = null; - com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam = (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.AuthorizeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam = + (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.AuthorizeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); authorizeSecurityGroupEgressResponse351 = - skel.authorizeSecurityGroupEgress(wrappedParam); + skel.authorizeSecurityGroupEgress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupEgressResponse351, false); } else @@ -471,12 +501,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("associateAddress".equals(methodName)) { com.amazon.ec2.AssociateAddressResponse associateAddressResponse353 = null; - com.amazon.ec2.AssociateAddress wrappedParam = (com.amazon.ec2.AssociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AssociateAddress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AssociateAddress wrappedParam = + (com.amazon.ec2.AssociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateAddress.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); associateAddressResponse353 = - skel.associateAddress(wrappedParam); + skel.associateAddress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), associateAddressResponse353, false); } else @@ -484,12 +515,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeImageAttribute".equals(methodName)) { com.amazon.ec2.DescribeImageAttributeResponse describeImageAttributeResponse355 = null; - com.amazon.ec2.DescribeImageAttribute wrappedParam = (com.amazon.ec2.DescribeImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeImageAttribute wrappedParam = + (com.amazon.ec2.DescribeImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImageAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeImageAttributeResponse355 = - skel.describeImageAttribute(wrappedParam); + skel.describeImageAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse355, false); } else @@ -497,12 +529,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSpotPriceHistory".equals(methodName)) { com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistoryResponse357 = null; - com.amazon.ec2.DescribeSpotPriceHistory wrappedParam = (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeSpotPriceHistory.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSpotPriceHistory wrappedParam = + (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeSpotPriceHistory.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeSpotPriceHistoryResponse357 = - skel.describeSpotPriceHistory(wrappedParam); + skel.describeSpotPriceHistory(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse357, false); } else @@ -510,12 +543,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("modifySnapshotAttribute".equals(methodName)) { com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttributeResponse359 = null; - com.amazon.ec2.ModifySnapshotAttribute wrappedParam = (com.amazon.ec2.ModifySnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ModifySnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ModifySnapshotAttribute wrappedParam = + (com.amazon.ec2.ModifySnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ModifySnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); modifySnapshotAttributeResponse359 = - skel.modifySnapshotAttribute(wrappedParam); + skel.modifySnapshotAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse359, false); } else @@ -523,13 +557,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSpotInstanceRequests".equals(methodName)) { com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequestsResponse361 = null; - com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam = (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DescribeSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam = + (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeSpotInstanceRequestsResponse361 = - skel.describeSpotInstanceRequests(wrappedParam); + skel.describeSpotInstanceRequests(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotInstanceRequestsResponse361, false); } else @@ -537,12 +571,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("importInstance".equals(methodName)) { com.amazon.ec2.ImportInstanceResponse importInstanceResponse363 = null; - com.amazon.ec2.ImportInstance wrappedParam = (com.amazon.ec2.ImportInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ImportInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ImportInstance wrappedParam = + (com.amazon.ec2.ImportInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportInstance.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); importInstanceResponse363 = - skel.importInstance(wrappedParam); + skel.importInstance(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), importInstanceResponse363, false); } else @@ -550,12 +585,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeKeyPairs".equals(methodName)) { com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairsResponse365 = null; - com.amazon.ec2.DescribeKeyPairs wrappedParam = (com.amazon.ec2.DescribeKeyPairs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeKeyPairs.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeKeyPairs wrappedParam = + (com.amazon.ec2.DescribeKeyPairs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeKeyPairs.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeKeyPairsResponse365 = - skel.describeKeyPairs(wrappedParam); + skel.describeKeyPairs(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeKeyPairsResponse365, false); } else @@ -563,12 +599,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("revokeSecurityGroupIngress".equals(methodName)) { com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngressResponse367 = null; - com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam = (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM( - msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RevokeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam = + (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.RevokeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); revokeSecurityGroupIngressResponse367 = - skel.revokeSecurityGroupIngress(wrappedParam); + skel.revokeSecurityGroupIngress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse367, false); } else @@ -576,12 +613,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createPlacementGroup".equals(methodName)) { com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroupResponse369 = null; - com.amazon.ec2.CreatePlacementGroup wrappedParam = (com.amazon.ec2.CreatePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreatePlacementGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreatePlacementGroup wrappedParam = + (com.amazon.ec2.CreatePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreatePlacementGroup.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createPlacementGroupResponse369 = - skel.createPlacementGroup(wrappedParam); + skel.createPlacementGroup(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createPlacementGroupResponse369, false); } else @@ -589,12 +627,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteNetworkAclEntry".equals(methodName)) { com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntryResponse371 = null; - com.amazon.ec2.DeleteNetworkAclEntry wrappedParam = (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteNetworkAclEntry.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteNetworkAclEntry wrappedParam = + (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkAclEntry.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteNetworkAclEntryResponse371 = - skel.deleteNetworkAclEntry(wrappedParam); + skel.deleteNetworkAclEntry(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclEntryResponse371, false); } else @@ -602,12 +641,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("activateLicense".equals(methodName)) { com.amazon.ec2.ActivateLicenseResponse activateLicenseResponse373 = null; - com.amazon.ec2.ActivateLicense wrappedParam = (com.amazon.ec2.ActivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ActivateLicense.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ActivateLicense wrappedParam = + (com.amazon.ec2.ActivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ActivateLicense.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); activateLicenseResponse373 = - skel.activateLicense(wrappedParam); + skel.activateLicense(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), activateLicenseResponse373, false); } else @@ -615,12 +655,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteRouteTable".equals(methodName)) { com.amazon.ec2.DeleteRouteTableResponse deleteRouteTableResponse375 = null; - com.amazon.ec2.DeleteRouteTable wrappedParam = (com.amazon.ec2.DeleteRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteRouteTable wrappedParam = + (com.amazon.ec2.DeleteRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteRouteTable.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteRouteTableResponse375 = - skel.deleteRouteTable(wrappedParam); + skel.deleteRouteTable(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteTableResponse375, false); } else @@ -628,12 +669,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("unmonitorInstances".equals(methodName)) { com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstancesResponse377 = null; - com.amazon.ec2.UnmonitorInstances wrappedParam = (com.amazon.ec2.UnmonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.UnmonitorInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.UnmonitorInstances wrappedParam = + (com.amazon.ec2.UnmonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.UnmonitorInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); unmonitorInstancesResponse377 = - skel.unmonitorInstances(wrappedParam); + skel.unmonitorInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), unmonitorInstancesResponse377, false); } else @@ -641,12 +683,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("startInstances".equals(methodName)) { com.amazon.ec2.StartInstancesResponse startInstancesResponse379 = null; - com.amazon.ec2.StartInstances wrappedParam = (com.amazon.ec2.StartInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.StartInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.StartInstances wrappedParam = + (com.amazon.ec2.StartInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.StartInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); startInstancesResponse379 = - skel.startInstances(wrappedParam); + skel.startInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), startInstancesResponse379, false); } else @@ -654,12 +697,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("confirmProductInstance".equals(methodName)) { com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstanceResponse381 = null; - com.amazon.ec2.ConfirmProductInstance wrappedParam = (com.amazon.ec2.ConfirmProductInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ConfirmProductInstance.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ConfirmProductInstance wrappedParam = + (com.amazon.ec2.ConfirmProductInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ConfirmProductInstance.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); confirmProductInstanceResponse381 = - skel.confirmProductInstance(wrappedParam); + skel.confirmProductInstance(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), confirmProductInstanceResponse381, false); } else @@ -667,13 +711,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeNetworkInterfaceAttribute".equals(methodName)) { com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttributeResponse383 = null; - com.amazon.ec2.DescribeNetworkInterfaceAttribute wrappedParam = (com.amazon.ec2.DescribeNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DescribeNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeNetworkInterfaceAttribute wrappedParam = + (com.amazon.ec2.DescribeNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeNetworkInterfaceAttributeResponse383 = - skel.describeNetworkInterfaceAttribute(wrappedParam); + skel.describeNetworkInterfaceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfaceAttributeResponse383, false); } else @@ -681,12 +725,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("runInstances".equals(methodName)) { com.amazon.ec2.RunInstancesResponse runInstancesResponse385 = null; - com.amazon.ec2.RunInstances wrappedParam = (com.amazon.ec2.RunInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.RunInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RunInstances wrappedParam = + (com.amazon.ec2.RunInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RunInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); runInstancesResponse385 = - skel.runInstances(wrappedParam); + skel.runInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), runInstancesResponse385, false); } else @@ -694,13 +739,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createReservedInstancesListing".equals(methodName)) { com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListingResponse387 = null; - com.amazon.ec2.CreateReservedInstancesListing wrappedParam = (com.amazon.ec2.CreateReservedInstancesListing)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.CreateReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateReservedInstancesListing wrappedParam = + (com.amazon.ec2.CreateReservedInstancesListing)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CreateReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope())); createReservedInstancesListingResponse387 = - skel.createReservedInstancesListing(wrappedParam); + skel.createReservedInstancesListing(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createReservedInstancesListingResponse387, false); } else @@ -708,12 +753,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createCustomerGateway".equals(methodName)) { com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGatewayResponse389 = null; - com.amazon.ec2.CreateCustomerGateway wrappedParam = (com.amazon.ec2.CreateCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateCustomerGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateCustomerGateway wrappedParam = + (com.amazon.ec2.CreateCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateCustomerGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createCustomerGatewayResponse389 = - skel.createCustomerGateway(wrappedParam); + skel.createCustomerGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createCustomerGatewayResponse389, false); } else @@ -721,12 +767,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createNetworkAcl".equals(methodName)) { com.amazon.ec2.CreateNetworkAclResponse createNetworkAclResponse391 = null; - com.amazon.ec2.CreateNetworkAcl wrappedParam = (com.amazon.ec2.CreateNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateNetworkAcl.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateNetworkAcl wrappedParam = + (com.amazon.ec2.CreateNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAcl.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createNetworkAclResponse391 = - skel.createNetworkAcl(wrappedParam); + skel.createNetworkAcl(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclResponse391, false); } else @@ -734,12 +781,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("resetImageAttribute".equals(methodName)) { com.amazon.ec2.ResetImageAttributeResponse resetImageAttributeResponse393 = null; - com.amazon.ec2.ResetImageAttribute wrappedParam = (com.amazon.ec2.ResetImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ResetImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ResetImageAttribute wrappedParam = + (com.amazon.ec2.ResetImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetImageAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); resetImageAttributeResponse393 = - skel.resetImageAttribute(wrappedParam); + skel.resetImageAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), resetImageAttributeResponse393, false); } else @@ -747,12 +795,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("modifyVolumeAttribute".equals(methodName)) { com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttributeResponse395 = null; - com.amazon.ec2.ModifyVolumeAttribute wrappedParam = (com.amazon.ec2.ModifyVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ModifyVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ModifyVolumeAttribute wrappedParam = + (com.amazon.ec2.ModifyVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyVolumeAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); modifyVolumeAttributeResponse395 = - skel.modifyVolumeAttribute(wrappedParam); + skel.modifyVolumeAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), modifyVolumeAttributeResponse395, false); } else @@ -760,12 +809,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeReservedInstances".equals(methodName)) { com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstancesResponse397 = null; - com.amazon.ec2.DescribeReservedInstances wrappedParam = (com.amazon.ec2.DescribeReservedInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeReservedInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeReservedInstances wrappedParam = + (com.amazon.ec2.DescribeReservedInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeReservedInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeReservedInstancesResponse397 = - skel.describeReservedInstances(wrappedParam); + skel.describeReservedInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesResponse397, false); } else @@ -773,12 +823,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("resetSnapshotAttribute".equals(methodName)) { com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttributeResponse399 = null; - com.amazon.ec2.ResetSnapshotAttribute wrappedParam = (com.amazon.ec2.ResetSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ResetSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ResetSnapshotAttribute wrappedParam = + (com.amazon.ec2.ResetSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetSnapshotAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); resetSnapshotAttributeResponse399 = - skel.resetSnapshotAttribute(wrappedParam); + skel.resetSnapshotAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), resetSnapshotAttributeResponse399, false); } else @@ -786,12 +837,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteVolume".equals(methodName)) { com.amazon.ec2.DeleteVolumeResponse deleteVolumeResponse401 = null; - com.amazon.ec2.DeleteVolume wrappedParam = (com.amazon.ec2.DeleteVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteVolume wrappedParam = + (com.amazon.ec2.DeleteVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVolume.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteVolumeResponse401 = - skel.deleteVolume(wrappedParam); + skel.deleteVolume(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteVolumeResponse401, false); } else @@ -799,12 +851,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeAvailabilityZones".equals(methodName)) { com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZonesResponse403 = null; - com.amazon.ec2.DescribeAvailabilityZones wrappedParam = (com.amazon.ec2.DescribeAvailabilityZones)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeAvailabilityZones.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeAvailabilityZones wrappedParam = + (com.amazon.ec2.DescribeAvailabilityZones)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeAvailabilityZones.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeAvailabilityZonesResponse403 = - skel.describeAvailabilityZones(wrappedParam); + skel.describeAvailabilityZones(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeAvailabilityZonesResponse403, false); } else @@ -812,12 +865,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createVpnConnection".equals(methodName)) { com.amazon.ec2.CreateVpnConnectionResponse createVpnConnectionResponse405 = null; - com.amazon.ec2.CreateVpnConnection wrappedParam = (com.amazon.ec2.CreateVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateVpnConnection.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateVpnConnection wrappedParam = + (com.amazon.ec2.CreateVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnConnection.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createVpnConnectionResponse405 = - skel.createVpnConnection(wrappedParam); + skel.createVpnConnection(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionResponse405, false); } else @@ -825,12 +879,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("cancelBundleTask".equals(methodName)) { com.amazon.ec2.CancelBundleTaskResponse cancelBundleTaskResponse407 = null; - com.amazon.ec2.CancelBundleTask wrappedParam = (com.amazon.ec2.CancelBundleTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CancelBundleTask.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CancelBundleTask wrappedParam = + (com.amazon.ec2.CancelBundleTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelBundleTask.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); cancelBundleTaskResponse407 = - skel.cancelBundleTask(wrappedParam); + skel.cancelBundleTask(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), cancelBundleTaskResponse407, false); } else @@ -838,13 +893,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("replaceNetworkAclAssociation".equals(methodName)) { com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociationResponse409 = null; - com.amazon.ec2.ReplaceNetworkAclAssociation wrappedParam = (com.amazon.ec2.ReplaceNetworkAclAssociation)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.ReplaceNetworkAclAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReplaceNetworkAclAssociation wrappedParam = + (com.amazon.ec2.ReplaceNetworkAclAssociation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ReplaceNetworkAclAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); replaceNetworkAclAssociationResponse409 = - skel.replaceNetworkAclAssociation(wrappedParam); + skel.replaceNetworkAclAssociation(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclAssociationResponse409, false); } else @@ -852,12 +907,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("detachVpnGateway".equals(methodName)) { com.amazon.ec2.DetachVpnGatewayResponse detachVpnGatewayResponse411 = null; - com.amazon.ec2.DetachVpnGateway wrappedParam = (com.amazon.ec2.DetachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DetachVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DetachVpnGateway wrappedParam = + (com.amazon.ec2.DetachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachVpnGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); detachVpnGatewayResponse411 = - skel.detachVpnGateway(wrappedParam); + skel.detachVpnGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), detachVpnGatewayResponse411, false); } else @@ -865,12 +921,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSnapshots".equals(methodName)) { com.amazon.ec2.DescribeSnapshotsResponse describeSnapshotsResponse413 = null; - com.amazon.ec2.DescribeSnapshots wrappedParam = (com.amazon.ec2.DescribeSnapshots)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeSnapshots.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSnapshots wrappedParam = + (com.amazon.ec2.DescribeSnapshots)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSnapshots.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeSnapshotsResponse413 = - skel.describeSnapshots(wrappedParam); + skel.describeSnapshots(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotsResponse413, false); } else @@ -878,12 +935,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteSubnet".equals(methodName)) { com.amazon.ec2.DeleteSubnetResponse deleteSubnetResponse415 = null; - com.amazon.ec2.DeleteSubnet wrappedParam = (com.amazon.ec2.DeleteSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteSubnet.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteSubnet wrappedParam = + (com.amazon.ec2.DeleteSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSubnet.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteSubnetResponse415 = - skel.deleteSubnet(wrappedParam); + skel.deleteSubnet(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteSubnetResponse415, false); } else @@ -891,12 +949,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeBundleTasks".equals(methodName)) { com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasksResponse417 = null; - com.amazon.ec2.DescribeBundleTasks wrappedParam = (com.amazon.ec2.DescribeBundleTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeBundleTasks.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeBundleTasks wrappedParam = + (com.amazon.ec2.DescribeBundleTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeBundleTasks.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeBundleTasksResponse417 = - skel.describeBundleTasks(wrappedParam); + skel.describeBundleTasks(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeBundleTasksResponse417, false); } else @@ -904,12 +963,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createKeyPair".equals(methodName)) { com.amazon.ec2.CreateKeyPairResponse createKeyPairResponse419 = null; - com.amazon.ec2.CreateKeyPair wrappedParam = (com.amazon.ec2.CreateKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateKeyPair.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateKeyPair wrappedParam = + (com.amazon.ec2.CreateKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateKeyPair.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createKeyPairResponse419 = - skel.createKeyPair(wrappedParam); + skel.createKeyPair(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createKeyPairResponse419, false); } else @@ -917,12 +977,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createImage".equals(methodName)) { com.amazon.ec2.CreateImageResponse createImageResponse421 = null; - com.amazon.ec2.CreateImage wrappedParam = (com.amazon.ec2.CreateImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateImage.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateImage wrappedParam = + (com.amazon.ec2.CreateImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateImage.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createImageResponse421 = - skel.createImage(wrappedParam); + skel.createImage(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createImageResponse421, false); } else @@ -930,12 +991,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("enableVgwRoutePropagation".equals(methodName)) { com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagationResponse423 = null; - com.amazon.ec2.EnableVgwRoutePropagation wrappedParam = (com.amazon.ec2.EnableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.EnableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.EnableVgwRoutePropagation wrappedParam = + (com.amazon.ec2.EnableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.EnableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); enableVgwRoutePropagationResponse423 = - skel.enableVgwRoutePropagation(wrappedParam); + skel.enableVgwRoutePropagation(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), enableVgwRoutePropagationResponse423, false); } else @@ -943,12 +1005,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("unassignPrivateIpAddresses".equals(methodName)) { com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddressesResponse425 = null; - com.amazon.ec2.UnassignPrivateIpAddresses wrappedParam = (com.amazon.ec2.UnassignPrivateIpAddresses)fromOM( - msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.UnassignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.UnassignPrivateIpAddresses wrappedParam = + (com.amazon.ec2.UnassignPrivateIpAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.UnassignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); unassignPrivateIpAddressesResponse425 = - skel.unassignPrivateIpAddresses(wrappedParam); + skel.unassignPrivateIpAddresses(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), unassignPrivateIpAddressesResponse425, false); } else @@ -956,12 +1019,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deregisterImage".equals(methodName)) { com.amazon.ec2.DeregisterImageResponse deregisterImageResponse427 = null; - com.amazon.ec2.DeregisterImage wrappedParam = (com.amazon.ec2.DeregisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeregisterImage.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeregisterImage wrappedParam = + (com.amazon.ec2.DeregisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeregisterImage.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deregisterImageResponse427 = - skel.deregisterImage(wrappedParam); + skel.deregisterImage(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deregisterImageResponse427, false); } else @@ -969,12 +1033,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteVpnConnectionRoute".equals(methodName)) { com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRouteResponse429 = null; - com.amazon.ec2.DeleteVpnConnectionRoute wrappedParam = (com.amazon.ec2.DeleteVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteVpnConnectionRoute wrappedParam = + (com.amazon.ec2.DeleteVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DeleteVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); deleteVpnConnectionRouteResponse429 = - skel.deleteVpnConnectionRoute(wrappedParam); + skel.deleteVpnConnectionRoute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionRouteResponse429, false); } else @@ -982,12 +1047,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("modifyImageAttribute".equals(methodName)) { com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttributeResponse431 = null; - com.amazon.ec2.ModifyImageAttribute wrappedParam = (com.amazon.ec2.ModifyImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ModifyImageAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ModifyImageAttribute wrappedParam = + (com.amazon.ec2.ModifyImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyImageAttribute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); modifyImageAttributeResponse431 = - skel.modifyImageAttribute(wrappedParam); + skel.modifyImageAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), modifyImageAttributeResponse431, false); } else @@ -995,12 +1061,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("cancelConversionTask".equals(methodName)) { com.amazon.ec2.CancelConversionTaskResponse cancelConversionTaskResponse433 = null; - com.amazon.ec2.CancelConversionTask wrappedParam = (com.amazon.ec2.CancelConversionTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CancelConversionTask.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CancelConversionTask wrappedParam = + (com.amazon.ec2.CancelConversionTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelConversionTask.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); cancelConversionTaskResponse433 = - skel.cancelConversionTask(wrappedParam); + skel.cancelConversionTask(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), cancelConversionTaskResponse433, false); } else @@ -1008,12 +1075,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVolumes".equals(methodName)) { com.amazon.ec2.DescribeVolumesResponse describeVolumesResponse435 = null; - com.amazon.ec2.DescribeVolumes wrappedParam = (com.amazon.ec2.DescribeVolumes)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVolumes.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVolumes wrappedParam = + (com.amazon.ec2.DescribeVolumes)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVolumes.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeVolumesResponse435 = - skel.describeVolumes(wrappedParam); + skel.describeVolumes(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumesResponse435, false); } else @@ -1021,13 +1089,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("cancelReservedInstancesListing".equals(methodName)) { com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListingResponse437 = null; - com.amazon.ec2.CancelReservedInstancesListing wrappedParam = (com.amazon.ec2.CancelReservedInstancesListing)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.CancelReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CancelReservedInstancesListing wrappedParam = + (com.amazon.ec2.CancelReservedInstancesListing)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CancelReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope())); cancelReservedInstancesListingResponse437 = - skel.cancelReservedInstancesListing(wrappedParam); + skel.cancelReservedInstancesListing(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), cancelReservedInstancesListingResponse437, false); } else @@ -1035,12 +1103,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("getPasswordData".equals(methodName)) { com.amazon.ec2.GetPasswordDataResponse getPasswordDataResponse439 = null; - com.amazon.ec2.GetPasswordData wrappedParam = (com.amazon.ec2.GetPasswordData)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.GetPasswordData.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.GetPasswordData wrappedParam = + (com.amazon.ec2.GetPasswordData)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.GetPasswordData.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); getPasswordDataResponse439 = - skel.getPasswordData(wrappedParam); + skel.getPasswordData(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getPasswordDataResponse439, false); } else @@ -1048,12 +1117,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("allocateAddress".equals(methodName)) { com.amazon.ec2.AllocateAddressResponse allocateAddressResponse441 = null; - com.amazon.ec2.AllocateAddress wrappedParam = (com.amazon.ec2.AllocateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AllocateAddress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AllocateAddress wrappedParam = + (com.amazon.ec2.AllocateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AllocateAddress.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); allocateAddressResponse441 = - skel.allocateAddress(wrappedParam); + skel.allocateAddress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), allocateAddressResponse441, false); } else @@ -1061,12 +1131,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteSecurityGroup".equals(methodName)) { com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroupResponse443 = null; - com.amazon.ec2.DeleteSecurityGroup wrappedParam = (com.amazon.ec2.DeleteSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteSecurityGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteSecurityGroup wrappedParam = + (com.amazon.ec2.DeleteSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSecurityGroup.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteSecurityGroupResponse443 = - skel.deleteSecurityGroup(wrappedParam); + skel.deleteSecurityGroup(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteSecurityGroupResponse443, false); } else @@ -1074,12 +1145,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deletePlacementGroup".equals(methodName)) { com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroupResponse445 = null; - com.amazon.ec2.DeletePlacementGroup wrappedParam = (com.amazon.ec2.DeletePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeletePlacementGroup.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeletePlacementGroup wrappedParam = + (com.amazon.ec2.DeletePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeletePlacementGroup.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deletePlacementGroupResponse445 = - skel.deletePlacementGroup(wrappedParam); + skel.deletePlacementGroup(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deletePlacementGroupResponse445, false); } else @@ -1087,12 +1159,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("disassociateAddress".equals(methodName)) { com.amazon.ec2.DisassociateAddressResponse disassociateAddressResponse447 = null; - com.amazon.ec2.DisassociateAddress wrappedParam = (com.amazon.ec2.DisassociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DisassociateAddress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DisassociateAddress wrappedParam = + (com.amazon.ec2.DisassociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisassociateAddress.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); disassociateAddressResponse447 = - skel.disassociateAddress(wrappedParam); + skel.disassociateAddress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), disassociateAddressResponse447, false); } else @@ -1100,12 +1173,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteDhcpOptions".equals(methodName)) { com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptionsResponse449 = null; - com.amazon.ec2.DeleteDhcpOptions wrappedParam = (com.amazon.ec2.DeleteDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteDhcpOptions wrappedParam = + (com.amazon.ec2.DeleteDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteDhcpOptions.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteDhcpOptionsResponse449 = - skel.deleteDhcpOptions(wrappedParam); + skel.deleteDhcpOptions(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteDhcpOptionsResponse449, false); } else @@ -1113,13 +1187,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSpotDatafeedSubscription".equals(methodName)) { com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscriptionResponse451 = null; - com.amazon.ec2.DescribeSpotDatafeedSubscription wrappedParam = (com.amazon.ec2.DescribeSpotDatafeedSubscription)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DescribeSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSpotDatafeedSubscription wrappedParam = + (com.amazon.ec2.DescribeSpotDatafeedSubscription)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeSpotDatafeedSubscriptionResponse451 = - skel.describeSpotDatafeedSubscription(wrappedParam); + skel.describeSpotDatafeedSubscription(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotDatafeedSubscriptionResponse451, false); } else @@ -1127,12 +1201,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeNetworkAcls".equals(methodName)) { com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAclsResponse453 = null; - com.amazon.ec2.DescribeNetworkAcls wrappedParam = (com.amazon.ec2.DescribeNetworkAcls)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeNetworkAcls.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeNetworkAcls wrappedParam = + (com.amazon.ec2.DescribeNetworkAcls)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeNetworkAcls.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeNetworkAclsResponse453 = - skel.describeNetworkAcls(wrappedParam); + skel.describeNetworkAcls(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkAclsResponse453, false); } else @@ -1140,12 +1215,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("enableVolumeIO".equals(methodName)) { com.amazon.ec2.EnableVolumeIOResponse enableVolumeIOResponse455 = null; - com.amazon.ec2.EnableVolumeIO wrappedParam = (com.amazon.ec2.EnableVolumeIO)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.EnableVolumeIO.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.EnableVolumeIO wrappedParam = + (com.amazon.ec2.EnableVolumeIO)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.EnableVolumeIO.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); enableVolumeIOResponse455 = - skel.enableVolumeIO(wrappedParam); + skel.enableVolumeIO(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), enableVolumeIOResponse455, false); } else @@ -1153,12 +1229,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("attachVpnGateway".equals(methodName)) { com.amazon.ec2.AttachVpnGatewayResponse attachVpnGatewayResponse457 = null; - com.amazon.ec2.AttachVpnGateway wrappedParam = (com.amazon.ec2.AttachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AttachVpnGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AttachVpnGateway wrappedParam = + (com.amazon.ec2.AttachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AttachVpnGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); attachVpnGatewayResponse457 = - skel.attachVpnGateway(wrappedParam); + skel.attachVpnGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), attachVpnGatewayResponse457, false); } else @@ -1166,12 +1243,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeInternetGateways".equals(methodName)) { com.amazon.ec2.DescribeInternetGatewaysResponse describeInternetGatewaysResponse459 = null; - com.amazon.ec2.DescribeInternetGateways wrappedParam = (com.amazon.ec2.DescribeInternetGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeInternetGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeInternetGateways wrappedParam = + (com.amazon.ec2.DescribeInternetGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeInternetGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeInternetGatewaysResponse459 = - skel.describeInternetGateways(wrappedParam); + skel.describeInternetGateways(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeInternetGatewaysResponse459, false); } else @@ -1179,12 +1257,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeDhcpOptions".equals(methodName)) { com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptionsResponse461 = null; - com.amazon.ec2.DescribeDhcpOptions wrappedParam = (com.amazon.ec2.DescribeDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeDhcpOptions.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeDhcpOptions wrappedParam = + (com.amazon.ec2.DescribeDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeDhcpOptions.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeDhcpOptionsResponse461 = - skel.describeDhcpOptions(wrappedParam); + skel.describeDhcpOptions(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeDhcpOptionsResponse461, false); } else @@ -1192,13 +1271,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createSpotDatafeedSubscription".equals(methodName)) { com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscriptionResponse463 = null; - com.amazon.ec2.CreateSpotDatafeedSubscription wrappedParam = (com.amazon.ec2.CreateSpotDatafeedSubscription)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.CreateSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateSpotDatafeedSubscription wrappedParam = + (com.amazon.ec2.CreateSpotDatafeedSubscription)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CreateSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); createSpotDatafeedSubscriptionResponse463 = - skel.createSpotDatafeedSubscription(wrappedParam); + skel.createSpotDatafeedSubscription(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createSpotDatafeedSubscriptionResponse463, false); } else @@ -1206,13 +1285,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeReservedInstancesListings".equals(methodName)) { com.amazon.ec2.DescribeReservedInstancesListingsResponse describeReservedInstancesListingsResponse465 = null; - com.amazon.ec2.DescribeReservedInstancesListings wrappedParam = (com.amazon.ec2.DescribeReservedInstancesListings)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DescribeReservedInstancesListings.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeReservedInstancesListings wrappedParam = + (com.amazon.ec2.DescribeReservedInstancesListings)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeReservedInstancesListings.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeReservedInstancesListingsResponse465 = - skel.describeReservedInstancesListings(wrappedParam); + skel.describeReservedInstancesListings(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesListingsResponse465, false); } else @@ -1220,12 +1299,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeInstanceStatus".equals(methodName)) { com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatusResponse467 = null; - com.amazon.ec2.DescribeInstanceStatus wrappedParam = (com.amazon.ec2.DescribeInstanceStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeInstanceStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeInstanceStatus wrappedParam = + (com.amazon.ec2.DescribeInstanceStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeInstanceStatus.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeInstanceStatusResponse467 = - skel.describeInstanceStatus(wrappedParam); + skel.describeInstanceStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeInstanceStatusResponse467, false); } else @@ -1233,13 +1313,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("modifyNetworkInterfaceAttribute".equals(methodName)) { com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttributeResponse469 = null; - com.amazon.ec2.ModifyNetworkInterfaceAttribute wrappedParam = (com.amazon.ec2.ModifyNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.ModifyNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ModifyNetworkInterfaceAttribute wrappedParam = + (com.amazon.ec2.ModifyNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ModifyNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); modifyNetworkInterfaceAttributeResponse469 = - skel.modifyNetworkInterfaceAttribute(wrappedParam); + skel.modifyNetworkInterfaceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), modifyNetworkInterfaceAttributeResponse469, false); } else @@ -1247,12 +1327,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("disableVgwRoutePropagation".equals(methodName)) { com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagationResponse471 = null; - com.amazon.ec2.DisableVgwRoutePropagation wrappedParam = (com.amazon.ec2.DisableVgwRoutePropagation)fromOM( - msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DisableVgwRoutePropagation wrappedParam = + (com.amazon.ec2.DisableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DisableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); disableVgwRoutePropagationResponse471 = - skel.disableVgwRoutePropagation(wrappedParam); + skel.disableVgwRoutePropagation(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), disableVgwRoutePropagationResponse471, false); } else @@ -1260,12 +1341,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVolumeStatus".equals(methodName)) { com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatusResponse473 = null; - com.amazon.ec2.DescribeVolumeStatus wrappedParam = (com.amazon.ec2.DescribeVolumeStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVolumeStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVolumeStatus wrappedParam = + (com.amazon.ec2.DescribeVolumeStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVolumeStatus.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeVolumeStatusResponse473 = - skel.describeVolumeStatus(wrappedParam); + skel.describeVolumeStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeStatusResponse473, false); } else @@ -1273,12 +1355,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("detachNetworkInterface".equals(methodName)) { com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterfaceResponse475 = null; - com.amazon.ec2.DetachNetworkInterface wrappedParam = (com.amazon.ec2.DetachNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DetachNetworkInterface.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DetachNetworkInterface wrappedParam = + (com.amazon.ec2.DetachNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachNetworkInterface.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); detachNetworkInterfaceResponse475 = - skel.detachNetworkInterface(wrappedParam); + skel.detachNetworkInterface(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), detachNetworkInterfaceResponse475, false); } else @@ -1286,12 +1369,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeSecurityGroups".equals(methodName)) { com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroupsResponse477 = null; - com.amazon.ec2.DescribeSecurityGroups wrappedParam = (com.amazon.ec2.DescribeSecurityGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeSecurityGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeSecurityGroups wrappedParam = + (com.amazon.ec2.DescribeSecurityGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSecurityGroups.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeSecurityGroupsResponse477 = - skel.describeSecurityGroups(wrappedParam); + skel.describeSecurityGroups(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeSecurityGroupsResponse477, false); } else @@ -1299,12 +1383,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeInstances".equals(methodName)) { com.amazon.ec2.DescribeInstancesResponse describeInstancesResponse479 = null; - com.amazon.ec2.DescribeInstances wrappedParam = (com.amazon.ec2.DescribeInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeInstances wrappedParam = + (com.amazon.ec2.DescribeInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeInstancesResponse479 = - skel.describeInstances(wrappedParam); + skel.describeInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeInstancesResponse479, false); } else @@ -1312,12 +1397,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeNetworkInterfaces".equals(methodName)) { com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfacesResponse481 = null; - com.amazon.ec2.DescribeNetworkInterfaces wrappedParam = (com.amazon.ec2.DescribeNetworkInterfaces)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeNetworkInterfaces.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeNetworkInterfaces wrappedParam = + (com.amazon.ec2.DescribeNetworkInterfaces)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeNetworkInterfaces.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeNetworkInterfacesResponse481 = - skel.describeNetworkInterfaces(wrappedParam); + skel.describeNetworkInterfaces(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfacesResponse481, false); } else @@ -1325,12 +1411,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteKeyPair".equals(methodName)) { com.amazon.ec2.DeleteKeyPairResponse deleteKeyPairResponse483 = null; - com.amazon.ec2.DeleteKeyPair wrappedParam = (com.amazon.ec2.DeleteKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteKeyPair.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteKeyPair wrappedParam = + (com.amazon.ec2.DeleteKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteKeyPair.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteKeyPairResponse483 = - skel.deleteKeyPair(wrappedParam); + skel.deleteKeyPair(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteKeyPairResponse483, false); } else @@ -1338,12 +1425,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createSnapshot".equals(methodName)) { com.amazon.ec2.CreateSnapshotResponse createSnapshotResponse485 = null; - com.amazon.ec2.CreateSnapshot wrappedParam = (com.amazon.ec2.CreateSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateSnapshot.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateSnapshot wrappedParam = + (com.amazon.ec2.CreateSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSnapshot.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createSnapshotResponse485 = - skel.createSnapshot(wrappedParam); + skel.createSnapshot(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createSnapshotResponse485, false); } else @@ -1351,12 +1439,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeVpnGateways".equals(methodName)) { com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGatewaysResponse487 = null; - com.amazon.ec2.DescribeVpnGateways wrappedParam = (com.amazon.ec2.DescribeVpnGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeVpnGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeVpnGateways wrappedParam = + (com.amazon.ec2.DescribeVpnGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpnGateways.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeVpnGatewaysResponse487 = - skel.describeVpnGateways(wrappedParam); + skel.describeVpnGateways(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnGatewaysResponse487, false); } else @@ -1364,12 +1453,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteTags".equals(methodName)) { com.amazon.ec2.DeleteTagsResponse deleteTagsResponse489 = null; - com.amazon.ec2.DeleteTags wrappedParam = (com.amazon.ec2.DeleteTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteTags.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteTags wrappedParam = + (com.amazon.ec2.DeleteTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteTags.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteTagsResponse489 = - skel.deleteTags(wrappedParam); + skel.deleteTags(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteTagsResponse489, false); } else @@ -1377,12 +1467,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteSnapshot".equals(methodName)) { com.amazon.ec2.DeleteSnapshotResponse deleteSnapshotResponse491 = null; - com.amazon.ec2.DeleteSnapshot wrappedParam = (com.amazon.ec2.DeleteSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteSnapshot.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteSnapshot wrappedParam = + (com.amazon.ec2.DeleteSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSnapshot.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteSnapshotResponse491 = - skel.deleteSnapshot(wrappedParam); + skel.deleteSnapshot(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteSnapshotResponse491, false); } else @@ -1390,12 +1481,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteCustomerGateway".equals(methodName)) { com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGatewayResponse493 = null; - com.amazon.ec2.DeleteCustomerGateway wrappedParam = (com.amazon.ec2.DeleteCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteCustomerGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteCustomerGateway wrappedParam = + (com.amazon.ec2.DeleteCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteCustomerGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteCustomerGatewayResponse493 = - skel.deleteCustomerGateway(wrappedParam); + skel.deleteCustomerGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteCustomerGatewayResponse493, false); } else @@ -1403,12 +1495,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createVolume".equals(methodName)) { com.amazon.ec2.CreateVolumeResponse createVolumeResponse495 = null; - com.amazon.ec2.CreateVolume wrappedParam = (com.amazon.ec2.CreateVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateVolume wrappedParam = + (com.amazon.ec2.CreateVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVolume.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createVolumeResponse495 = - skel.createVolume(wrappedParam); + skel.createVolume(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createVolumeResponse495, false); } else @@ -1416,12 +1509,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("cancelExportTask".equals(methodName)) { com.amazon.ec2.CancelExportTaskResponse cancelExportTaskResponse497 = null; - com.amazon.ec2.CancelExportTask wrappedParam = (com.amazon.ec2.CancelExportTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CancelExportTask.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CancelExportTask wrappedParam = + (com.amazon.ec2.CancelExportTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelExportTask.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); cancelExportTaskResponse497 = - skel.cancelExportTask(wrappedParam); + skel.cancelExportTask(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), cancelExportTaskResponse497, false); } else @@ -1429,12 +1523,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("registerImage".equals(methodName)) { com.amazon.ec2.RegisterImageResponse registerImageResponse499 = null; - com.amazon.ec2.RegisterImage wrappedParam = (com.amazon.ec2.RegisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.RegisterImage.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RegisterImage wrappedParam = + (com.amazon.ec2.RegisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RegisterImage.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); registerImageResponse499 = - skel.registerImage(wrappedParam); + skel.registerImage(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), registerImageResponse499, false); } else @@ -1442,12 +1537,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("detachVolume".equals(methodName)) { com.amazon.ec2.DetachVolumeResponse detachVolumeResponse501 = null; - com.amazon.ec2.DetachVolume wrappedParam = (com.amazon.ec2.DetachVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DetachVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DetachVolume wrappedParam = + (com.amazon.ec2.DetachVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachVolume.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); detachVolumeResponse501 = - skel.detachVolume(wrappedParam); + skel.detachVolume(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), detachVolumeResponse501, false); } else @@ -1455,12 +1551,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("stopInstances".equals(methodName)) { com.amazon.ec2.StopInstancesResponse stopInstancesResponse503 = null; - com.amazon.ec2.StopInstances wrappedParam = (com.amazon.ec2.StopInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.StopInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.StopInstances wrappedParam = + (com.amazon.ec2.StopInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.StopInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); stopInstancesResponse503 = - skel.stopInstances(wrappedParam); + skel.stopInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), stopInstancesResponse503, false); } else @@ -1468,12 +1565,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createRoute".equals(methodName)) { com.amazon.ec2.CreateRouteResponse createRouteResponse505 = null; - com.amazon.ec2.CreateRoute wrappedParam = (com.amazon.ec2.CreateRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateRoute wrappedParam = + (com.amazon.ec2.CreateRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateRoute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createRouteResponse505 = - skel.createRoute(wrappedParam); + skel.createRoute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createRouteResponse505, false); } else @@ -1481,12 +1579,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("releaseAddress".equals(methodName)) { com.amazon.ec2.ReleaseAddressResponse releaseAddressResponse507 = null; - com.amazon.ec2.ReleaseAddress wrappedParam = (com.amazon.ec2.ReleaseAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ReleaseAddress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReleaseAddress wrappedParam = + (com.amazon.ec2.ReleaseAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReleaseAddress.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); releaseAddressResponse507 = - skel.releaseAddress(wrappedParam); + skel.releaseAddress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), releaseAddressResponse507, false); } else @@ -1494,12 +1593,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeRouteTables".equals(methodName)) { com.amazon.ec2.DescribeRouteTablesResponse describeRouteTablesResponse509 = null; - com.amazon.ec2.DescribeRouteTables wrappedParam = (com.amazon.ec2.DescribeRouteTables)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeRouteTables.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeRouteTables wrappedParam = + (com.amazon.ec2.DescribeRouteTables)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeRouteTables.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeRouteTablesResponse509 = - skel.describeRouteTables(wrappedParam); + skel.describeRouteTables(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeRouteTablesResponse509, false); } else @@ -1507,12 +1607,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeCustomerGateways".equals(methodName)) { com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGatewaysResponse511 = null; - com.amazon.ec2.DescribeCustomerGateways wrappedParam = (com.amazon.ec2.DescribeCustomerGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeCustomerGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeCustomerGateways wrappedParam = + (com.amazon.ec2.DescribeCustomerGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeCustomerGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeCustomerGatewaysResponse511 = - skel.describeCustomerGateways(wrappedParam); + skel.describeCustomerGateways(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeCustomerGatewaysResponse511, false); } else @@ -1520,12 +1621,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteNetworkAcl".equals(methodName)) { com.amazon.ec2.DeleteNetworkAclResponse deleteNetworkAclResponse513 = null; - com.amazon.ec2.DeleteNetworkAcl wrappedParam = (com.amazon.ec2.DeleteNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteNetworkAcl.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteNetworkAcl wrappedParam = + (com.amazon.ec2.DeleteNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkAcl.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteNetworkAclResponse513 = - skel.deleteNetworkAcl(wrappedParam); + skel.deleteNetworkAcl(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclResponse513, false); } else @@ -1533,12 +1635,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteRoute".equals(methodName)) { com.amazon.ec2.DeleteRouteResponse deleteRouteResponse515 = null; - com.amazon.ec2.DeleteRoute wrappedParam = (com.amazon.ec2.DeleteRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteRoute wrappedParam = + (com.amazon.ec2.DeleteRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteRoute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteRouteResponse515 = - skel.deleteRoute(wrappedParam); + skel.deleteRoute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteResponse515, false); } else @@ -1546,12 +1649,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("rebootInstances".equals(methodName)) { com.amazon.ec2.RebootInstancesResponse rebootInstancesResponse517 = null; - com.amazon.ec2.RebootInstances wrappedParam = (com.amazon.ec2.RebootInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.RebootInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RebootInstances wrappedParam = + (com.amazon.ec2.RebootInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RebootInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); rebootInstancesResponse517 = - skel.rebootInstances(wrappedParam); + skel.rebootInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), rebootInstancesResponse517, false); } else @@ -1559,12 +1663,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("modifyInstanceAttribute".equals(methodName)) { com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttributeResponse519 = null; - com.amazon.ec2.ModifyInstanceAttribute wrappedParam = (com.amazon.ec2.ModifyInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ModifyInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ModifyInstanceAttribute wrappedParam = + (com.amazon.ec2.ModifyInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ModifyInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); modifyInstanceAttributeResponse519 = - skel.modifyInstanceAttribute(wrappedParam); + skel.modifyInstanceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), modifyInstanceAttributeResponse519, false); } else @@ -1572,12 +1677,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("terminateInstances".equals(methodName)) { com.amazon.ec2.TerminateInstancesResponse terminateInstancesResponse521 = null; - com.amazon.ec2.TerminateInstances wrappedParam = (com.amazon.ec2.TerminateInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.TerminateInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.TerminateInstances wrappedParam = + (com.amazon.ec2.TerminateInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.TerminateInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); terminateInstancesResponse521 = - skel.terminateInstances(wrappedParam); + skel.terminateInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), terminateInstancesResponse521, false); } else @@ -1585,12 +1691,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createVpnConnectionRoute".equals(methodName)) { com.amazon.ec2.CreateVpnConnectionRouteResponse createVpnConnectionRouteResponse523 = null; - com.amazon.ec2.CreateVpnConnectionRoute wrappedParam = (com.amazon.ec2.CreateVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateVpnConnectionRoute wrappedParam = + (com.amazon.ec2.CreateVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CreateVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); createVpnConnectionRouteResponse523 = - skel.createVpnConnectionRoute(wrappedParam); + skel.createVpnConnectionRoute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionRouteResponse523, false); } else @@ -1598,12 +1705,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeConversionTasks".equals(methodName)) { com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasksResponse525 = null; - com.amazon.ec2.DescribeConversionTasks wrappedParam = (com.amazon.ec2.DescribeConversionTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeConversionTasks.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeConversionTasks wrappedParam = + (com.amazon.ec2.DescribeConversionTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeConversionTasks.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeConversionTasksResponse525 = - skel.describeConversionTasks(wrappedParam); + skel.describeConversionTasks(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeConversionTasksResponse525, false); } else @@ -1611,12 +1719,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeAddresses".equals(methodName)) { com.amazon.ec2.DescribeAddressesResponse describeAddressesResponse527 = null; - com.amazon.ec2.DescribeAddresses wrappedParam = (com.amazon.ec2.DescribeAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeAddresses wrappedParam = + (com.amazon.ec2.DescribeAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeAddresses.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeAddressesResponse527 = - skel.describeAddresses(wrappedParam); + skel.describeAddresses(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeAddressesResponse527, false); } else @@ -1624,12 +1733,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeInstanceAttribute".equals(methodName)) { com.amazon.ec2.DescribeInstanceAttributeResponse describeInstanceAttributeResponse529 = null; - com.amazon.ec2.DescribeInstanceAttribute wrappedParam = (com.amazon.ec2.DescribeInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeInstanceAttribute wrappedParam = + (com.amazon.ec2.DescribeInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeInstanceAttributeResponse529 = - skel.describeInstanceAttribute(wrappedParam); + skel.describeInstanceAttribute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeInstanceAttributeResponse529, false); } else @@ -1637,12 +1747,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("attachInternetGateway".equals(methodName)) { com.amazon.ec2.AttachInternetGatewayResponse attachInternetGatewayResponse531 = null; - com.amazon.ec2.AttachInternetGateway wrappedParam = (com.amazon.ec2.AttachInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AttachInternetGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AttachInternetGateway wrappedParam = + (com.amazon.ec2.AttachInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AttachInternetGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); attachInternetGatewayResponse531 = - skel.attachInternetGateway(wrappedParam); + skel.attachInternetGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), attachInternetGatewayResponse531, false); } else @@ -1650,12 +1761,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createVpc".equals(methodName)) { com.amazon.ec2.CreateVpcResponse createVpcResponse533 = null; - com.amazon.ec2.CreateVpc wrappedParam = (com.amazon.ec2.CreateVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpc.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateVpc wrappedParam = + (com.amazon.ec2.CreateVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpc.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createVpcResponse533 = - skel.createVpc(wrappedParam); + skel.createVpc(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createVpcResponse533, false); } else @@ -1663,13 +1775,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("replaceRouteTableAssociation".equals(methodName)) { com.amazon.ec2.ReplaceRouteTableAssociationResponse replaceRouteTableAssociationResponse535 = null; - com.amazon.ec2.ReplaceRouteTableAssociation wrappedParam = (com.amazon.ec2.ReplaceRouteTableAssociation)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.ReplaceRouteTableAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReplaceRouteTableAssociation wrappedParam = + (com.amazon.ec2.ReplaceRouteTableAssociation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.ReplaceRouteTableAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope())); replaceRouteTableAssociationResponse535 = - skel.replaceRouteTableAssociation(wrappedParam); + skel.replaceRouteTableAssociation(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), replaceRouteTableAssociationResponse535, false); } else @@ -1677,12 +1789,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("associateRouteTable".equals(methodName)) { com.amazon.ec2.AssociateRouteTableResponse associateRouteTableResponse537 = null; - com.amazon.ec2.AssociateRouteTable wrappedParam = (com.amazon.ec2.AssociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AssociateRouteTable.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AssociateRouteTable wrappedParam = + (com.amazon.ec2.AssociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateRouteTable.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); associateRouteTableResponse537 = - skel.associateRouteTable(wrappedParam); + skel.associateRouteTable(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), associateRouteTableResponse537, false); } else @@ -1690,12 +1803,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("detachInternetGateway".equals(methodName)) { com.amazon.ec2.DetachInternetGatewayResponse detachInternetGatewayResponse539 = null; - com.amazon.ec2.DetachInternetGateway wrappedParam = (com.amazon.ec2.DetachInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DetachInternetGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DetachInternetGateway wrappedParam = + (com.amazon.ec2.DetachInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachInternetGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); detachInternetGatewayResponse539 = - skel.detachInternetGateway(wrappedParam); + skel.detachInternetGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), detachInternetGatewayResponse539, false); } else @@ -1703,13 +1817,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("purchaseReservedInstancesOffering".equals(methodName)) { com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOfferingResponse541 = null; - com.amazon.ec2.PurchaseReservedInstancesOffering wrappedParam = (com.amazon.ec2.PurchaseReservedInstancesOffering)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.PurchaseReservedInstancesOffering.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.PurchaseReservedInstancesOffering wrappedParam = + (com.amazon.ec2.PurchaseReservedInstancesOffering)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.PurchaseReservedInstancesOffering.class, getEnvelopeNamespaces(msgContext.getEnvelope())); purchaseReservedInstancesOfferingResponse541 = - skel.purchaseReservedInstancesOffering(wrappedParam); + skel.purchaseReservedInstancesOffering(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), purchaseReservedInstancesOfferingResponse541, false); } else @@ -1717,12 +1831,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("importVolume".equals(methodName)) { com.amazon.ec2.ImportVolumeResponse importVolumeResponse543 = null; - com.amazon.ec2.ImportVolume wrappedParam = (com.amazon.ec2.ImportVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ImportVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ImportVolume wrappedParam = + (com.amazon.ec2.ImportVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportVolume.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); importVolumeResponse543 = - skel.importVolume(wrappedParam); + skel.importVolume(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), importVolumeResponse543, false); } else @@ -1730,12 +1845,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeExportTasks".equals(methodName)) { com.amazon.ec2.DescribeExportTasksResponse describeExportTasksResponse545 = null; - com.amazon.ec2.DescribeExportTasks wrappedParam = (com.amazon.ec2.DescribeExportTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeExportTasks.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeExportTasks wrappedParam = + (com.amazon.ec2.DescribeExportTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeExportTasks.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeExportTasksResponse545 = - skel.describeExportTasks(wrappedParam); + skel.describeExportTasks(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeExportTasksResponse545, false); } else @@ -1743,12 +1859,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createInstanceExportTask".equals(methodName)) { com.amazon.ec2.CreateInstanceExportTaskResponse createInstanceExportTaskResponse547 = null; - com.amazon.ec2.CreateInstanceExportTask wrappedParam = (com.amazon.ec2.CreateInstanceExportTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateInstanceExportTask.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateInstanceExportTask wrappedParam = + (com.amazon.ec2.CreateInstanceExportTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.CreateInstanceExportTask.class, getEnvelopeNamespaces(msgContext.getEnvelope())); createInstanceExportTaskResponse547 = - skel.createInstanceExportTask(wrappedParam); + skel.createInstanceExportTask(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createInstanceExportTaskResponse547, false); } else @@ -1756,12 +1873,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("assignPrivateIpAddresses".equals(methodName)) { com.amazon.ec2.AssignPrivateIpAddressesResponse assignPrivateIpAddressesResponse549 = null; - com.amazon.ec2.AssignPrivateIpAddresses wrappedParam = (com.amazon.ec2.AssignPrivateIpAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AssignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AssignPrivateIpAddresses wrappedParam = + (com.amazon.ec2.AssignPrivateIpAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.AssignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope())); assignPrivateIpAddressesResponse549 = - skel.assignPrivateIpAddresses(wrappedParam); + skel.assignPrivateIpAddresses(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), assignPrivateIpAddressesResponse549, false); } else @@ -1769,12 +1887,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("reportInstanceStatus".equals(methodName)) { com.amazon.ec2.ReportInstanceStatusResponse reportInstanceStatusResponse551 = null; - com.amazon.ec2.ReportInstanceStatus wrappedParam = (com.amazon.ec2.ReportInstanceStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ReportInstanceStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReportInstanceStatus wrappedParam = + (com.amazon.ec2.ReportInstanceStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReportInstanceStatus.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); reportInstanceStatusResponse551 = - skel.reportInstanceStatus(wrappedParam); + skel.reportInstanceStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), reportInstanceStatusResponse551, false); } else @@ -1782,13 +1901,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeReservedInstancesOfferings".equals(methodName)) { com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferingsResponse553 = null; - com.amazon.ec2.DescribeReservedInstancesOfferings wrappedParam = (com.amazon.ec2.DescribeReservedInstancesOfferings)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DescribeReservedInstancesOfferings.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeReservedInstancesOfferings wrappedParam = + (com.amazon.ec2.DescribeReservedInstancesOfferings)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DescribeReservedInstancesOfferings.class, getEnvelopeNamespaces(msgContext.getEnvelope())); describeReservedInstancesOfferingsResponse553 = - skel.describeReservedInstancesOfferings(wrappedParam); + skel.describeReservedInstancesOfferings(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesOfferingsResponse553, false); } else @@ -1796,12 +1915,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteVpnConnection".equals(methodName)) { com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnectionResponse555 = null; - com.amazon.ec2.DeleteVpnConnection wrappedParam = (com.amazon.ec2.DeleteVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteVpnConnection.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteVpnConnection wrappedParam = + (com.amazon.ec2.DeleteVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpnConnection.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteVpnConnectionResponse555 = - skel.deleteVpnConnection(wrappedParam); + skel.deleteVpnConnection(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionResponse555, false); } else @@ -1809,12 +1929,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteInternetGateway".equals(methodName)) { com.amazon.ec2.DeleteInternetGatewayResponse deleteInternetGatewayResponse557 = null; - com.amazon.ec2.DeleteInternetGateway wrappedParam = (com.amazon.ec2.DeleteInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DeleteInternetGateway.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteInternetGateway wrappedParam = + (com.amazon.ec2.DeleteInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteInternetGateway.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteInternetGatewayResponse557 = - skel.deleteInternetGateway(wrappedParam); + skel.deleteInternetGateway(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteInternetGatewayResponse557, false); } else @@ -1822,13 +1943,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("deleteSpotDatafeedSubscription".equals(methodName)) { com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscriptionResponse559 = null; - com.amazon.ec2.DeleteSpotDatafeedSubscription wrappedParam = (com.amazon.ec2.DeleteSpotDatafeedSubscription)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.ec2.DeleteSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DeleteSpotDatafeedSubscription wrappedParam = + (com.amazon.ec2.DeleteSpotDatafeedSubscription)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.DeleteSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope())); deleteSpotDatafeedSubscriptionResponse559 = - skel.deleteSpotDatafeedSubscription(wrappedParam); + skel.deleteSpotDatafeedSubscription(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteSpotDatafeedSubscriptionResponse559, false); } else @@ -1836,12 +1957,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("attachNetworkInterface".equals(methodName)) { com.amazon.ec2.AttachNetworkInterfaceResponse attachNetworkInterfaceResponse561 = null; - com.amazon.ec2.AttachNetworkInterface wrappedParam = (com.amazon.ec2.AttachNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AttachNetworkInterface.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AttachNetworkInterface wrappedParam = + (com.amazon.ec2.AttachNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AttachNetworkInterface.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); attachNetworkInterfaceResponse561 = - skel.attachNetworkInterface(wrappedParam); + skel.attachNetworkInterface(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), attachNetworkInterfaceResponse561, false); } else @@ -1849,12 +1971,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("createNetworkInterface".equals(methodName)) { com.amazon.ec2.CreateNetworkInterfaceResponse createNetworkInterfaceResponse563 = null; - com.amazon.ec2.CreateNetworkInterface wrappedParam = (com.amazon.ec2.CreateNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.CreateNetworkInterface.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.CreateNetworkInterface wrappedParam = + (com.amazon.ec2.CreateNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkInterface.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createNetworkInterfaceResponse563 = - skel.createNetworkInterface(wrappedParam); + skel.createNetworkInterface(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkInterfaceResponse563, false); } else @@ -1862,12 +1985,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("revokeSecurityGroupEgress".equals(methodName)) { com.amazon.ec2.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgressResponse565 = null; - com.amazon.ec2.RevokeSecurityGroupEgress wrappedParam = (com.amazon.ec2.RevokeSecurityGroupEgress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.RevokeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.RevokeSecurityGroupEgress wrappedParam = + (com.amazon.ec2.RevokeSecurityGroupEgress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.ec2.RevokeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope())); revokeSecurityGroupEgressResponse565 = - skel.revokeSecurityGroupEgress(wrappedParam); + skel.revokeSecurityGroupEgress(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupEgressResponse565, false); } else @@ -1875,12 +1999,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("monitorInstances".equals(methodName)) { com.amazon.ec2.MonitorInstancesResponse monitorInstancesResponse567 = null; - com.amazon.ec2.MonitorInstances wrappedParam = (com.amazon.ec2.MonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.MonitorInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.MonitorInstances wrappedParam = + (com.amazon.ec2.MonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.MonitorInstances.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); monitorInstancesResponse567 = - skel.monitorInstances(wrappedParam); + skel.monitorInstances(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), monitorInstancesResponse567, false); } else @@ -1888,12 +2013,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("replaceRoute".equals(methodName)) { com.amazon.ec2.ReplaceRouteResponse replaceRouteResponse569 = null; - com.amazon.ec2.ReplaceRoute wrappedParam = (com.amazon.ec2.ReplaceRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.ReplaceRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.ReplaceRoute wrappedParam = + (com.amazon.ec2.ReplaceRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReplaceRoute.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); replaceRouteResponse569 = - skel.replaceRoute(wrappedParam); + skel.replaceRoute(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), replaceRouteResponse569, false); } else @@ -1901,12 +2027,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("attachVolume".equals(methodName)) { com.amazon.ec2.AttachVolumeResponse attachVolumeResponse571 = null; - com.amazon.ec2.AttachVolume wrappedParam = (com.amazon.ec2.AttachVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.AttachVolume.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.AttachVolume wrappedParam = + (com.amazon.ec2.AttachVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AttachVolume.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); attachVolumeResponse571 = - skel.attachVolume(wrappedParam); + skel.attachVolume(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), attachVolumeResponse571, false); } else @@ -1914,12 +2041,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("getConsoleOutput".equals(methodName)) { com.amazon.ec2.GetConsoleOutputResponse getConsoleOutputResponse573 = null; - com.amazon.ec2.GetConsoleOutput wrappedParam = (com.amazon.ec2.GetConsoleOutput)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.GetConsoleOutput.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.GetConsoleOutput wrappedParam = + (com.amazon.ec2.GetConsoleOutput)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.GetConsoleOutput.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); getConsoleOutputResponse573 = - skel.getConsoleOutput(wrappedParam); + skel.getConsoleOutput(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getConsoleOutputResponse573, false); } else @@ -1927,12 +2055,13 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab if ("describeRegions".equals(methodName)) { com.amazon.ec2.DescribeRegionsResponse describeRegionsResponse575 = null; - com.amazon.ec2.DescribeRegions wrappedParam = (com.amazon.ec2.DescribeRegions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.ec2.DescribeRegions.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.ec2.DescribeRegions wrappedParam = + (com.amazon.ec2.DescribeRegions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeRegions.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); describeRegionsResponse575 = - skel.describeRegions(wrappedParam); + skel.describeRegions(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), describeRegionsResponse575, false); @@ -4598,7 +4727,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.DescribeReservedInstancesOfferingsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.DescribeReservedInstancesOfferingsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.DescribeReservedInstancesOfferingsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -4828,8 +4958,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribePlacementGroupsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribePlacementGroupsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -4846,8 +4976,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateSecurityGroupResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateSecurityGroupResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -4882,8 +5012,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateDhcpOptionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateDhcpOptionsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -4900,8 +5030,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateRouteTableResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateRouteTableResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -4918,8 +5048,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSubnetsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSubnetsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -4936,8 +5066,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeactivateLicenseResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeactivateLicenseResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5008,8 +5138,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5026,8 +5156,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkAclEntryResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkAclEntryResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5044,8 +5174,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RequestSpotInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RequestSpotInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5062,8 +5192,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumeAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumeAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5080,8 +5210,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateDhcpOptionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateDhcpOptionsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5134,8 +5264,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkInterfaceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkInterfaceResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5170,8 +5300,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeLicensesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeLicensesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5188,8 +5318,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.BundleInstanceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.BundleInstanceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5206,8 +5336,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVpnConnectionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVpnConnectionsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5224,8 +5354,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeImagesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeImagesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5242,8 +5372,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateInternetGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateInternetGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5260,8 +5390,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DisassociateRouteTableResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DisassociateRouteTableResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5278,8 +5408,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReplaceNetworkAclEntryResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReplaceNetworkAclEntryResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5314,8 +5444,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSnapshotAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSnapshotAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5332,8 +5462,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5350,8 +5480,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetInstanceAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetInstanceAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5404,8 +5534,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateAddressResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateAddressResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5422,8 +5552,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeImageAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeImageAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5440,8 +5570,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSpotPriceHistoryResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSpotPriceHistoryResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5458,8 +5588,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifySnapshotAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifySnapshotAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5494,8 +5624,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ImportInstanceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ImportInstanceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5512,8 +5642,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeKeyPairsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeKeyPairsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5548,8 +5678,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreatePlacementGroupResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreatePlacementGroupResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5566,8 +5696,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkAclEntryResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkAclEntryResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5584,8 +5714,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ActivateLicenseResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ActivateLicenseResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5602,8 +5732,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteRouteTableResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteRouteTableResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5620,8 +5750,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.UnmonitorInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.UnmonitorInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5638,8 +5768,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.StartInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.StartInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5656,8 +5786,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ConfirmProductInstanceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ConfirmProductInstanceResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5728,8 +5858,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateCustomerGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateCustomerGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5746,8 +5876,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkAclResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkAclResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5764,8 +5894,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetImageAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetImageAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5782,8 +5912,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyVolumeAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyVolumeAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5800,8 +5930,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeReservedInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeReservedInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5818,8 +5948,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetSnapshotAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ResetSnapshotAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5854,8 +5984,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeAvailabilityZonesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeAvailabilityZonesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5872,8 +6002,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnConnectionResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnConnectionResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5890,8 +6020,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelBundleTaskResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelBundleTaskResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5926,8 +6056,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachVpnGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachVpnGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5944,8 +6074,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSnapshotsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSnapshotsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -5980,8 +6110,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeBundleTasksResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeBundleTasksResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6034,8 +6164,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.EnableVgwRoutePropagationResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.EnableVgwRoutePropagationResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6070,8 +6200,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeregisterImageResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeregisterImageResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6088,8 +6218,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnConnectionRouteResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnConnectionRouteResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6106,8 +6236,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyImageAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyImageAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6124,8 +6254,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelConversionTaskResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelConversionTaskResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6142,8 +6272,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6178,8 +6308,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.GetPasswordDataResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.GetPasswordDataResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6196,8 +6326,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AllocateAddressResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AllocateAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6214,8 +6344,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteSecurityGroupResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteSecurityGroupResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6232,8 +6362,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeletePlacementGroupResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeletePlacementGroupResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6250,8 +6380,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DisassociateAddressResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DisassociateAddressResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6268,8 +6398,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteDhcpOptionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteDhcpOptionsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6304,8 +6434,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeNetworkAclsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeNetworkAclsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6322,8 +6452,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.EnableVolumeIOResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.EnableVolumeIOResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6340,8 +6470,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachVpnGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachVpnGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6358,8 +6488,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInternetGatewaysResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInternetGatewaysResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6376,8 +6506,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeDhcpOptionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeDhcpOptionsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6430,8 +6560,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstanceStatusResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstanceStatusResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6484,8 +6614,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumeStatusResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVolumeStatusResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6502,8 +6632,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachNetworkInterfaceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachNetworkInterfaceResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6520,8 +6650,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSecurityGroupsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeSecurityGroupsResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6538,8 +6668,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6556,8 +6686,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeNetworkInterfacesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeNetworkInterfacesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6592,8 +6722,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateSnapshotResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateSnapshotResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6610,8 +6740,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVpnGatewaysResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeVpnGatewaysResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6646,8 +6776,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteSnapshotResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteSnapshotResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6664,8 +6794,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteCustomerGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteCustomerGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6700,8 +6830,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelExportTaskResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CancelExportTaskResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6790,8 +6920,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReleaseAddressResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReleaseAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6808,8 +6938,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeRouteTablesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeRouteTablesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6826,8 +6956,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeCustomerGatewaysResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeCustomerGatewaysResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6844,8 +6974,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkAclResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteNetworkAclResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6880,8 +7010,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RebootInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RebootInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6898,8 +7028,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyInstanceAttributeResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ModifyInstanceAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6916,8 +7046,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.TerminateInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.TerminateInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6934,8 +7064,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnConnectionRouteResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateVpnConnectionRouteResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6952,8 +7082,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeConversionTasksResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeConversionTasksResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6970,8 +7100,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeAddressesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeAddressesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -6988,8 +7118,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstanceAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeInstanceAttributeResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7006,8 +7136,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachInternetGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachInternetGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7060,8 +7190,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateRouteTableResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssociateRouteTableResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7078,8 +7208,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachInternetGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DetachInternetGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7132,8 +7262,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeExportTasksResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeExportTasksResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7150,8 +7280,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateInstanceExportTaskResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateInstanceExportTaskResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7168,8 +7298,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssignPrivateIpAddressesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AssignPrivateIpAddressesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7186,8 +7316,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReportInstanceStatusResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.ReportInstanceStatusResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7222,8 +7352,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnConnectionResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteVpnConnectionResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7240,8 +7370,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteInternetGatewayResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DeleteInternetGatewayResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7276,8 +7406,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachNetworkInterfaceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.AttachNetworkInterfaceResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7294,8 +7424,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkInterfaceResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.CreateNetworkInterfaceResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7312,8 +7442,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RevokeSecurityGroupEgressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.RevokeSecurityGroupEgressResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7330,8 +7460,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.MonitorInstancesResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.MonitorInstancesResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7384,8 +7514,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.GetConsoleOutputResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.GetConsoleOutputResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -7402,8 +7532,8 @@ public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.Ab return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeRegionsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.DescribeRegionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java index ec0f982e674..99834a43e9e 100644 --- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java +++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java @@ -56,7 +56,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param resetNetworkInterfaceAttribute4 */ - public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) { + public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute( + com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetNetworkInterfaceAttribute"); } @@ -320,7 +321,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param authorizeSecurityGroupIngress52 */ - public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) { + public com.amazon.ec2.AuthorizeSecurityGroupIngressResponse + authorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#authorizeSecurityGroupIngress"); } @@ -574,7 +576,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param createReservedInstancesListing98 */ - public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing98) { + public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing( + com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing98) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createReservedInstancesListing"); } @@ -849,7 +852,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param cancelReservedInstancesListing148 */ - public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148) { + public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing( + com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelReservedInstancesListing"); } @@ -993,7 +997,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param createSpotDatafeedSubscription174 */ - public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) { + public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription( + com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSpotDatafeedSubscription"); } @@ -1027,8 +1032,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param modifyNetworkInterfaceAttribute180 */ - public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse - modifyNetworkInterfaceAttribute(com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) { + public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute( + com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyNetworkInterfaceAttribute"); } @@ -1525,7 +1530,8 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { * @param deleteSpotDatafeedSubscription270 */ - public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) { + public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription( + com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) { //TODO : fill this with the necessary business logic throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSpotDatafeedSubscription"); } diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java index 40f1113489e..77dd851eb9b 100644 --- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java +++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java @@ -50,7 +50,8 @@ public interface AmazonEC2SkeletonInterface { * @param resetNetworkInterfaceAttribute */ - public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute); + public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute( + com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute); /** * Auto generated method signature @@ -427,7 +428,8 @@ public interface AmazonEC2SkeletonInterface { * @param createReservedInstancesListing */ - public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing); + public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing( + com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing); /** * Auto generated method signature @@ -627,7 +629,8 @@ public interface AmazonEC2SkeletonInterface { * @param cancelReservedInstancesListing */ - public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing); + public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing( + com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing); /** * Auto generated method signature @@ -683,8 +686,8 @@ public interface AmazonEC2SkeletonInterface { * @param describeSpotDatafeedSubscription */ - public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse - describeSpotDatafeedSubscription(com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription); + public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription( + com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription); /** * Auto generated method signature @@ -732,7 +735,8 @@ public interface AmazonEC2SkeletonInterface { * @param createSpotDatafeedSubscription */ - public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription); + public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription( + com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription); /** * Auto generated method signature @@ -757,7 +761,8 @@ public interface AmazonEC2SkeletonInterface { * @param modifyNetworkInterfaceAttribute */ - public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute); + public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute( + com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute); /** * Auto generated method signature @@ -1119,7 +1124,8 @@ public interface AmazonEC2SkeletonInterface { * @param deleteSpotDatafeedSubscription */ - public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription); + public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription( + com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription); /** * Auto generated method signature diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java index 23c22565d2e..f07afd5c1c6 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java @@ -98,7 +98,8 @@ public class AssignPrivateIpAddresses implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AssignPrivateIpAddresses implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java index bad989b7280..dda95b44746 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssignPrivateIpAddressesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AssignPrivateIpAddressesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AssignPrivateIpAddressesResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java index f1e91f3873b..960ad3ad3a2 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java @@ -125,7 +125,8 @@ public class AssignPrivateIpAddressesResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class AssignPrivateIpAddressesResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java index 16a31625421..55365b1a681 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java @@ -101,7 +101,8 @@ public class AssignPrivateIpAddressesSetItemRequestType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class AssignPrivateIpAddressesSetItemRequestType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java index f13cc85fde6..bc65ea8b098 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java @@ -90,7 +90,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2. java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])list.toArray(new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[list.size()]); + this.localItem = + (com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[])list.toArray(new com.amazon.ec2.AssignPrivateIpAddressesSetItemRequestType[list.size()]); } @@ -129,7 +130,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +197,8 @@ public class AssignPrivateIpAddressesSetRequestType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java index 79ac4ca6f23..89d2201c8b6 100644 --- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java +++ b/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java @@ -217,7 +217,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -363,9 +364,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -608,7 +608,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -623,7 +624,8 @@ public class AssignPrivateIpAddressesType implements org.apache.axis2.databindin while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddress.java b/awsapi/src/com/amazon/ec2/AssociateAddress.java index b6cd735b694..6d2d1f9d747 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddress.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddress.java @@ -98,7 +98,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AssociateAddress implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) { object.setAssociateAddress(com.amazon.ec2.AssociateAddressType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java index 314ee35738f..d3726314e93 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java @@ -98,7 +98,8 @@ public class AssociateAddressResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AssociateAddressResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java index 56cf0870b0a..274bdb9651e 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java @@ -163,7 +163,8 @@ public class AssociateAddressResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -305,9 +306,8 @@ public class AssociateAddressResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressType.java b/awsapi/src/com/amazon/ec2/AssociateAddressType.java index 71073679183..6df9c9b41f0 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddressType.java @@ -202,7 +202,8 @@ public class AssociateAddressType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -323,9 +324,8 @@ public class AssociateAddressType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java index e8a242aee06..9a1cfbab732 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java @@ -168,7 +168,8 @@ public class AssociateAddressTypeChoice_type0 implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261,9 +262,8 @@ public class AssociateAddressTypeChoice_type0 implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java index 30250d923bd..4ac01fe1576 100644 --- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java +++ b/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java @@ -168,7 +168,8 @@ public class AssociateAddressTypeChoice_type1 implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261,9 +262,8 @@ public class AssociateAddressTypeChoice_type1 implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java index f39f1a618be..28875cd1cd7 100644 --- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java +++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java @@ -98,7 +98,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AssociateDhcpOptions implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptions").equals(reader.getName())) { object.setAssociateDhcpOptions(com.amazon.ec2.AssociateDhcpOptionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java index e5912cf1e18..2bed7343bf3 100644 --- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java +++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AssociateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AssociateDhcpOptionsResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AssociateDhcpOptionsResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java index 9a07d3433dd..98692a7a426 100644 --- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java @@ -125,7 +125,8 @@ public class AssociateDhcpOptionsResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class AssociateDhcpOptionsResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java index 6e884468e6d..819022056ba 100644 --- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java @@ -125,7 +125,8 @@ public class AssociateDhcpOptionsType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AssociateDhcpOptionsType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java index 663a062f9b0..6a753f1198c 100644 --- a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java +++ b/awsapi/src/com/amazon/ec2/AssociateRouteTable.java @@ -98,7 +98,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AssociateRouteTable implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTable").equals(reader.getName())) { object.setAssociateRouteTable(com.amazon.ec2.AssociateRouteTableType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java index 2603242739d..83089450747 100644 --- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java +++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AssociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AssociateRouteTableResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AssociateRouteTableResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java index d26e7c19dc6..7a8cde16613 100644 --- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java +++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java @@ -125,7 +125,8 @@ public class AssociateRouteTableResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AssociateRouteTableResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java index 6d16c6440fe..00d85ee8aa2 100644 --- a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java +++ b/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java @@ -125,7 +125,8 @@ public class AssociateRouteTableType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AssociateRouteTableType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java index d2447777f7e..b39ef3bdfcc 100644 --- a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java +++ b/awsapi/src/com/amazon/ec2/AttachInternetGateway.java @@ -98,7 +98,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AttachInternetGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway").equals(reader.getName())) { object.setAttachInternetGateway(com.amazon.ec2.AttachInternetGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java index ce9cfc33342..a765ed683f2 100644 --- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AttachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AttachInternetGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AttachInternetGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java index a3df51e335e..f3dee0e4c57 100644 --- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java @@ -125,7 +125,8 @@ public class AttachInternetGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class AttachInternetGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java index 73ebb8710f6..1d2b5b04ab6 100644 --- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java +++ b/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java @@ -125,7 +125,8 @@ public class AttachInternetGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AttachInternetGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java index 6596d21b1fe..2e4ae983ce6 100644 --- a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java +++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java @@ -98,7 +98,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AttachNetworkInterface implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface").equals(reader.getName())) { object.setAttachNetworkInterface(com.amazon.ec2.AttachNetworkInterfaceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java index b0352407274..12f09543892 100644 --- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java +++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AttachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterfaceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AttachNetworkInterfaceResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AttachNetworkInterfaceResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java index acebd7a1858..ead4599356f 100644 --- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java @@ -125,7 +125,8 @@ public class AttachNetworkInterfaceResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AttachNetworkInterfaceResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java index a660a488a4d..ba692366c8b 100644 --- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java +++ b/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java @@ -149,7 +149,8 @@ public class AttachNetworkInterfaceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291,9 +292,8 @@ public class AttachNetworkInterfaceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVolume.java b/awsapi/src/com/amazon/ec2/AttachVolume.java index 63120fe0270..9e03b33a7da 100644 --- a/awsapi/src/com/amazon/ec2/AttachVolume.java +++ b/awsapi/src/com/amazon/ec2/AttachVolume.java @@ -98,7 +98,8 @@ public class AttachVolume implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachVolume implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java index 4d76b8595f8..b4594669b69 100644 --- a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java +++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java @@ -98,7 +98,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AttachVolumeResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolumeResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolumeResponse").equals(reader.getName())) { object.setAttachVolumeResponse(com.amazon.ec2.AttachVolumeResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java index 89e6b7d3cf7..fba55008c59 100644 --- a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java @@ -221,7 +221,8 @@ public class AttachVolumeResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class AttachVolumeResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVolumeType.java b/awsapi/src/com/amazon/ec2/AttachVolumeType.java index bdc94c3c639..cb94df1bb87 100644 --- a/awsapi/src/com/amazon/ec2/AttachVolumeType.java +++ b/awsapi/src/com/amazon/ec2/AttachVolumeType.java @@ -149,7 +149,8 @@ public class AttachVolumeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294,9 +295,8 @@ public class AttachVolumeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java index 4e9192c6262..01c1d05bc5b 100644 --- a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java +++ b/awsapi/src/com/amazon/ec2/AttachVpnGateway.java @@ -98,7 +98,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class AttachVpnGateway implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) { object.setAttachVpnGateway(com.amazon.ec2.AttachVpnGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java index 3ad7911a998..8e098cbe0dc 100644 --- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java @@ -98,7 +98,8 @@ public class AttachVpnGatewayResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class AttachVpnGatewayResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java index 2a5cd668328..337f7a4ba67 100644 --- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java @@ -125,7 +125,8 @@ public class AttachVpnGatewayResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class AttachVpnGatewayResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java index 48a5aec402b..a96e5da587b 100644 --- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java +++ b/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java @@ -125,7 +125,8 @@ public class AttachVpnGatewayType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AttachVpnGatewayType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java index e85f25aacae..d675c96ff37 100644 --- a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java @@ -221,7 +221,8 @@ public class AttachmentSetItemResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -459,9 +460,8 @@ public class AttachmentSetItemResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java index 502f112f791..ffa7934fca6 100644 --- a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java +++ b/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java @@ -142,7 +142,8 @@ public class AttachmentSetResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class AttachmentSetResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttachmentSetType.java b/awsapi/src/com/amazon/ec2/AttachmentSetType.java index 3cd2ee53342..91cb9596132 100644 --- a/awsapi/src/com/amazon/ec2/AttachmentSetType.java +++ b/awsapi/src/com/amazon/ec2/AttachmentSetType.java @@ -142,7 +142,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class AttachmentSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.AttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.AttachmentType.class, list1)); + object.setItem((com.amazon.ec2.AttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.AttachmentType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/AttachmentType.java b/awsapi/src/com/amazon/ec2/AttachmentType.java index 5d7680db4fe..77d4a75e142 100644 --- a/awsapi/src/com/amazon/ec2/AttachmentType.java +++ b/awsapi/src/com/amazon/ec2/AttachmentType.java @@ -125,7 +125,8 @@ public class AttachmentType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class AttachmentType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java index f3dd020377a..763f0f903bc 100644 --- a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java +++ b/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java @@ -101,7 +101,8 @@ public class AttributeBooleanValueType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -179,9 +180,8 @@ public class AttributeBooleanValueType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AttributeValueType.java b/awsapi/src/com/amazon/ec2/AttributeValueType.java index bb4dc16f98b..c306b596284 100644 --- a/awsapi/src/com/amazon/ec2/AttributeValueType.java +++ b/awsapi/src/com/amazon/ec2/AttributeValueType.java @@ -101,7 +101,8 @@ public class AttributeValueType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class AttributeValueType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java index ef3f4698ee9..235eefc182d 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgress", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AuthorizeSecurityGroupEgress implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java index 5d383a506f5..869aaf5974d 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupEgressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java index ade4ab97ad0..fcb74350ae1 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java @@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupEgressResponseType implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class AuthorizeSecurityGroupEgressResponseType implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java index 0ade5c09ad2..2a2cdfdebbb 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java @@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupEgressType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class AuthorizeSecurityGroupEgressType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java index 6da388aea05..e84d54f4a0c 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngress", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class AuthorizeSecurityGroupIngress implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java index 200e28d8aff..42041c37121 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupIngressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java index bb77e7162e3..f94d429ea2c 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java @@ -125,7 +125,8 @@ public class AuthorizeSecurityGroupIngressResponseType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class AuthorizeSecurityGroupIngressResponseType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java index a53ff3f93f9..ef3e8012feb 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java @@ -163,7 +163,8 @@ public class AuthorizeSecurityGroupIngressType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254,9 +255,8 @@ public class AuthorizeSecurityGroupIngressType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java index fd71699f2c6..be1703e9155 100644 --- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java @@ -168,7 +168,8 @@ public class AuthorizeSecurityGroupIngressTypeChoice_type0 implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261,9 +262,8 @@ public class AuthorizeSecurityGroupIngressTypeChoice_type0 implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java index 1d0430b9759..9275d1a0975 100644 --- a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java +++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java @@ -173,7 +173,8 @@ public class AvailabilityZoneItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -323,9 +324,8 @@ public class AvailabilityZoneItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java index 9bee81f6092..78c72ca94df 100644 --- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java +++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java @@ -142,7 +142,8 @@ public class AvailabilityZoneMessageSetType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class AvailabilityZoneMessageSetType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java index eb920a3572b..a2282758db5 100644 --- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java +++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java @@ -101,7 +101,8 @@ public class AvailabilityZoneMessageType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class AvailabilityZoneMessageType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java index bc271cf7a5a..fa0ba5ffc5b 100644 --- a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java +++ b/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java @@ -142,7 +142,8 @@ public class AvailabilityZoneSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class AvailabilityZoneSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java index b0d6cbeabdb..e9f6109bf7d 100644 --- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java +++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java @@ -125,7 +125,8 @@ public class BlockDeviceMappingItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class BlockDeviceMappingItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java index 4aa651ba078..0363031bfb2 100644 --- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java @@ -210,7 +210,8 @@ public class BlockDeviceMappingItemTypeChoice_type0 implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class BlockDeviceMappingItemTypeChoice_type0 implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java index 753f782dcb2..72b095d27c7 100644 --- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java +++ b/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java @@ -142,7 +142,8 @@ public class BlockDeviceMappingType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class BlockDeviceMappingType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstance.java b/awsapi/src/com/amazon/ec2/BundleInstance.java index 863186997b1..e5faa4e5be9 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstance.java +++ b/awsapi/src/com/amazon/ec2/BundleInstance.java @@ -98,7 +98,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class BundleInstance implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) { object.setBundleInstance(com.amazon.ec2.BundleInstanceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java index 064f9d8a59e..002136a9250 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java @@ -98,7 +98,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class BundleInstanceResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse").equals(reader.getName())) { object.setBundleInstanceResponse(com.amazon.ec2.BundleInstanceResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java index 0b44461c556..f44de8074f3 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java @@ -125,7 +125,8 @@ public class BundleInstanceResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class BundleInstanceResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java index 143466232d3..807dff586f3 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java @@ -239,7 +239,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -450,9 +451,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -764,7 +764,8 @@ public class BundleInstanceS3StorageType implements org.apache.axis2.databinding while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java index f75a1e90aa8..b73bbc232ac 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java @@ -125,7 +125,8 @@ public class BundleInstanceTaskErrorType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class BundleInstanceTaskErrorType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java index 524009a1cb4..38d1f864abd 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java @@ -101,7 +101,8 @@ public class BundleInstanceTaskStorageType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class BundleInstanceTaskStorageType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java index 0227d924944..e717186e900 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java @@ -297,7 +297,8 @@ public class BundleInstanceTaskType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -549,9 +550,8 @@ public class BundleInstanceTaskType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java index 9a0a118e426..c5bb82bff4b 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java @@ -142,7 +142,8 @@ public class BundleInstanceTasksSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class BundleInstanceTasksSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/BundleInstanceType.java b/awsapi/src/com/amazon/ec2/BundleInstanceType.java index 514c0e0ab3b..315c4255dbc 100644 --- a/awsapi/src/com/amazon/ec2/BundleInstanceType.java +++ b/awsapi/src/com/amazon/ec2/BundleInstanceType.java @@ -125,7 +125,8 @@ public class BundleInstanceType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class BundleInstanceType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTask.java b/awsapi/src/com/amazon/ec2/CancelBundleTask.java index 0cb2a2c2cb0..81ce7754b50 100644 --- a/awsapi/src/com/amazon/ec2/CancelBundleTask.java +++ b/awsapi/src/com/amazon/ec2/CancelBundleTask.java @@ -98,7 +98,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CancelBundleTask implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) { object.setCancelBundleTask(com.amazon.ec2.CancelBundleTaskType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java index 2549aed3b8f..3b5e4e55fd6 100644 --- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java +++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java @@ -98,7 +98,8 @@ public class CancelBundleTaskResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CancelBundleTaskResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java index d48ae1b445f..9da15894817 100644 --- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java @@ -125,7 +125,8 @@ public class CancelBundleTaskResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CancelBundleTaskResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java index 9b2b37fcfc8..de6689960f2 100644 --- a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java +++ b/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java @@ -101,7 +101,8 @@ public class CancelBundleTaskType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CancelBundleTaskType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTask.java b/awsapi/src/com/amazon/ec2/CancelConversionTask.java index 1390c9c17db..6b5a883f4e8 100644 --- a/awsapi/src/com/amazon/ec2/CancelConversionTask.java +++ b/awsapi/src/com/amazon/ec2/CancelConversionTask.java @@ -98,7 +98,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CancelConversionTask implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTask").equals(reader.getName())) { object.setCancelConversionTask(com.amazon.ec2.CancelConversionTaskType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java index ee5c68819c0..97dab3bdfc9 100644 --- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java +++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CancelConversionTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTaskResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTaskResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CancelConversionTaskResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CancelConversionTaskResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java index 9e0b6b4103c..00b35f2c3d6 100644 --- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java @@ -125,7 +125,8 @@ public class CancelConversionTaskResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CancelConversionTaskResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java index 52448c3e66c..2248fb374a8 100644 --- a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java +++ b/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java @@ -101,7 +101,8 @@ public class CancelConversionTaskType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CancelConversionTaskType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelExportTask.java b/awsapi/src/com/amazon/ec2/CancelExportTask.java index c86ada400ea..777253ccf20 100644 --- a/awsapi/src/com/amazon/ec2/CancelExportTask.java +++ b/awsapi/src/com/amazon/ec2/CancelExportTask.java @@ -98,7 +98,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CancelExportTask implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) { object.setCancelExportTask(com.amazon.ec2.CancelExportTaskType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java index c40aa31794d..3d19c7eebee 100644 --- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java +++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java @@ -98,7 +98,8 @@ public class CancelExportTaskResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CancelExportTaskResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java index 6939beac123..f32c4a5efc2 100644 --- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java @@ -125,7 +125,8 @@ public class CancelExportTaskResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CancelExportTaskResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java index 5dc0853bba2..71d70c06748 100644 --- a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java +++ b/awsapi/src/com/amazon/ec2/CancelExportTaskType.java @@ -101,7 +101,8 @@ public class CancelExportTaskType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CancelExportTaskType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java index e3ecd933497..3fc491b165d 100644 --- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java +++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CancelReservedInstancesListing implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListing", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListing", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CancelReservedInstancesListing implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CancelReservedInstancesListing implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java index c2610f413c2..72c0c55a3a1 100644 --- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java +++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class CancelReservedInstancesListingResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListingResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CancelReservedInstancesListingResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class CancelReservedInstancesListingResponse implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class CancelReservedInstancesListingResponse implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java index 5e475460a47..bee242fde50 100644 --- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java +++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java @@ -125,7 +125,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202,7 +203,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -211,9 +213,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +446,8 @@ public class CancelReservedInstancesListingResponseType implements org.apache.ax while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java index 5d1f44f872e..f1cd0f3e85b 100644 --- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java +++ b/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java @@ -101,7 +101,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -391,7 +391,8 @@ public class CancelReservedInstancesListingType implements org.apache.axis2.data while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java index d9d256aaa1e..b2a0b7b742c 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CancelSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CancelSpotInstanceRequests implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CancelSpotInstanceRequests implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java index 4b10065dd63..8dd023acda9 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequestsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CancelSpotInstanceRequestsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CancelSpotInstanceRequestsResponse implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java index 17769ab18c4..63bc6993696 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java @@ -125,7 +125,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -455,7 +455,8 @@ public class CancelSpotInstanceRequestsResponseSetItemType implements org.apache while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java index 1bb55225b7a..24494dc587f 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java @@ -90,7 +90,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])list.toArray(new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])list.toArray(new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[list.size()]); } @@ -129,7 +130,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +197,8 @@ public class CancelSpotInstanceRequestsResponseSetType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java index b16fe586ad8..6f6c3cad198 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java @@ -125,7 +125,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class CancelSpotInstanceRequestsResponseType implements org.apache.axis2. while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java index 0325a4a17b8..06eaa29a3bf 100644 --- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java +++ b/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java @@ -101,7 +101,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -363,7 +363,8 @@ public class CancelSpotInstanceRequestsType implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java index 2f47ee40819..3f3ce43ebe8 100644 --- a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java +++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java @@ -98,7 +98,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ConfirmProductInstance implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance").equals(reader.getName())) { object.setConfirmProductInstance(com.amazon.ec2.ConfirmProductInstanceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java index 65374443357..7073bcd8c15 100644 --- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java +++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ConfirmProductInstanceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstanceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstanceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ConfirmProductInstanceResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ConfirmProductInstanceResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java index fd741e39244..974daad5b96 100644 --- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java +++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java @@ -163,7 +163,8 @@ public class ConfirmProductInstanceResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -305,9 +306,8 @@ public class ConfirmProductInstanceResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java index 8736e9680cb..f5bfcf77bde 100644 --- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java +++ b/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java @@ -125,7 +125,8 @@ public class ConfirmProductInstanceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ConfirmProductInstanceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java index 7d6db4b514a..cf263b4b47e 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java @@ -101,7 +101,8 @@ public class ConversionTaskIdItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ConversionTaskIdItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java index 0f68c2ddcb3..b9e816b589c 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java @@ -142,7 +142,8 @@ public class ConversionTaskIdSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ConversionTaskIdSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java index b98eed64761..21ad4e76062 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java @@ -142,7 +142,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class ConversionTaskSetType implements org.apache.axis2.databinding.ADBBe } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.ConversionTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ConversionTaskType.class, - list1)); + object.setItem((com.amazon.ec2.ConversionTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.ConversionTaskType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskType.java b/awsapi/src/com/amazon/ec2/ConversionTaskType.java index d0b8636ba32..8c5cccedcd8 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskType.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskType.java @@ -263,7 +263,8 @@ public class ConversionTaskType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -451,9 +452,8 @@ public class ConversionTaskType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java index 4a43e7d9878..6e84c371faa 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java @@ -168,7 +168,8 @@ public class ConversionTaskTypeChoice_type0 implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207,9 +208,8 @@ public class ConversionTaskTypeChoice_type0 implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java index 6557cf8fab0..daf6bc0173e 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java @@ -98,7 +98,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway").equals(reader.getName())) { object.setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java index a90346abf12..04bafeeb906 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateCustomerGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateCustomerGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java index 40c3b4b14a8..ed7a135e25e 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java @@ -125,7 +125,8 @@ public class CreateCustomerGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateCustomerGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java index 9e50b15e46e..002fae26de4 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java @@ -164,7 +164,8 @@ public class CreateCustomerGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -306,9 +307,8 @@ public class CreateCustomerGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java index a895e4a3c17..d182cb15ea3 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java @@ -98,7 +98,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateDhcpOptions implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) { object.setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java index f6d07d3b72a..b49b0a2cfdb 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java index 8ab204bb207..27d6dc6c852 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java @@ -125,7 +125,8 @@ public class CreateDhcpOptionsResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateDhcpOptionsResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java index ef3967cda8f..8c0340e2b04 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java @@ -101,7 +101,8 @@ public class CreateDhcpOptionsType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class CreateDhcpOptionsType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateImage.java b/awsapi/src/com/amazon/ec2/CreateImage.java index 01ef73ced48..4e96e684090 100644 --- a/awsapi/src/com/amazon/ec2/CreateImage.java +++ b/awsapi/src/com/amazon/ec2/CreateImage.java @@ -98,7 +98,8 @@ public class CreateImage implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateImage implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponse.java b/awsapi/src/com/amazon/ec2/CreateImageResponse.java index b6a187a8957..1029d4b0e48 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateImageResponse.java @@ -98,7 +98,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateImageResponse implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImageResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImageResponse").equals(reader.getName())) { object.setCreateImageResponse(com.amazon.ec2.CreateImageResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java index b6b15e17f77..c24d47d3cb1 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java @@ -125,7 +125,8 @@ public class CreateImageResponseType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CreateImageResponseType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateImageType.java b/awsapi/src/com/amazon/ec2/CreateImageType.java index 778c5140da2..9db1851e03d 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageType.java +++ b/awsapi/src/com/amazon/ec2/CreateImageType.java @@ -240,7 +240,8 @@ public class CreateImageType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -421,9 +422,8 @@ public class CreateImageType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java index 6b466b0a3a9..2a8cfb5a2bd 100644 --- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java +++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java @@ -98,7 +98,8 @@ public class CreateInstanceExportTask implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateInstanceExportTask implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java index 1d08260360b..0d8a9d7b49c 100644 --- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateInstanceExportTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInstanceExportTaskResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateInstanceExportTaskResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateInstanceExportTaskResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateInstanceExportTaskResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java index 9b347eb67c0..d6e27040991 100644 --- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java @@ -125,7 +125,8 @@ public class CreateInstanceExportTaskResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateInstanceExportTaskResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java index 59e379a21cf..696f8c6e831 100644 --- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java +++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java @@ -187,7 +187,8 @@ public class CreateInstanceExportTaskType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -337,9 +338,8 @@ public class CreateInstanceExportTaskType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java index b5840410a01..56f779546a3 100644 --- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java @@ -126,7 +126,8 @@ public class CreateInstanceExportTaskTypeChoice_type0 implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class CreateInstanceExportTaskTypeChoice_type0 implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java index 1bd2ea6913f..3035ed5c569 100644 --- a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java +++ b/awsapi/src/com/amazon/ec2/CreateInternetGateway.java @@ -98,7 +98,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateInternetGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway").equals(reader.getName())) { object.setCreateInternetGateway(com.amazon.ec2.CreateInternetGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java index 51d3d6bc912..0bf3fec726d 100644 --- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateInternetGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateInternetGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java index b565db5893d..f10e7d8725f 100644 --- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java @@ -125,7 +125,8 @@ public class CreateInternetGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateInternetGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java index 8feedd0aeac..cac97b6e575 100644 --- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java +++ b/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java @@ -77,7 +77,8 @@ public class CreateInternetGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126,9 +127,8 @@ public class CreateInternetGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPair.java b/awsapi/src/com/amazon/ec2/CreateKeyPair.java index 97644131b25..f27611016d8 100644 --- a/awsapi/src/com/amazon/ec2/CreateKeyPair.java +++ b/awsapi/src/com/amazon/ec2/CreateKeyPair.java @@ -98,7 +98,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateKeyPair implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) { object.setCreateKeyPair(com.amazon.ec2.CreateKeyPairType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java index 7481fa0dd20..e35b8017c42 100644 --- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java @@ -98,7 +98,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse").equals(reader.getName())) { object.setCreateKeyPairResponse(com.amazon.ec2.CreateKeyPairResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java index 3f9f95e6155..5275429ca56 100644 --- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java @@ -173,7 +173,8 @@ public class CreateKeyPairResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350,9 +351,8 @@ public class CreateKeyPairResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java index b32dc3dd3fc..7cbc8a349b8 100644 --- a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java +++ b/awsapi/src/com/amazon/ec2/CreateKeyPairType.java @@ -101,7 +101,8 @@ public class CreateKeyPairType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CreateKeyPairType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java index 5bf934b97fe..5b2b5e8f713 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java @@ -98,7 +98,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateNetworkAcl implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) { object.setCreateNetworkAcl(com.amazon.ec2.CreateNetworkAclType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java index 31259eca497..cb84a695630 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java @@ -98,7 +98,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry").equals(reader.getName())) { object.setCreateNetworkAclEntry(com.amazon.ec2.CreateNetworkAclEntryType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java index ff783859fe6..1b325d1cdcd 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntryResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateNetworkAclEntryResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateNetworkAclEntryResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java index 31cb07e6c6d..815c44c71be 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java @@ -125,7 +125,8 @@ public class CreateNetworkAclEntryResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CreateNetworkAclEntryResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java index 57d67e02882..b98823d1666 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java @@ -297,7 +297,8 @@ public class CreateNetworkAclEntryType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -543,9 +544,8 @@ public class CreateNetworkAclEntryType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java index f443e5d5640..a80bf810b17 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java @@ -98,7 +98,8 @@ public class CreateNetworkAclResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateNetworkAclResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java index 8c210f17cb4..0dcac848078 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java @@ -125,7 +125,8 @@ public class CreateNetworkAclResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateNetworkAclResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java index 25f0c128a9a..2bb15c28c6f 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java @@ -101,7 +101,8 @@ public class CreateNetworkAclType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CreateNetworkAclType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java index 1d53034e04f..0e3449ac5fb 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java @@ -98,7 +98,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateNetworkInterface implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface").equals(reader.getName())) { object.setCreateNetworkInterface(com.amazon.ec2.CreateNetworkInterfaceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java index 613860f546d..8445541b5f7 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterfaceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateNetworkInterfaceResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateNetworkInterfaceResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java index d83d25af5a9..70a716259a2 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java @@ -125,7 +125,8 @@ public class CreateNetworkInterfaceResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateNetworkInterfaceResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java index 5cb80771915..784181f25cb 100644 --- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java +++ b/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java @@ -292,7 +292,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -480,9 +481,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -795,7 +795,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding. while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -810,7 +811,8 @@ public class CreateNetworkInterfaceType implements org.apache.axis2.databinding. while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java index 8b0e1a30f3a..404fec27e32 100644 --- a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java +++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java @@ -98,7 +98,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreatePlacementGroup implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroup").equals(reader.getName())) { object.setCreatePlacementGroup(com.amazon.ec2.CreatePlacementGroupType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java index 3b62b3ba2d2..19e8964c7f6 100644 --- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java +++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreatePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreatePlacementGroupResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreatePlacementGroupResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java index 8b613f3c972..86c5b43a675 100644 --- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java @@ -125,7 +125,8 @@ public class CreatePlacementGroupResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CreatePlacementGroupResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java index 0bb8cfe6ad6..7cfc46e8a90 100644 --- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java +++ b/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java @@ -125,7 +125,8 @@ public class CreatePlacementGroupType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CreatePlacementGroupType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java index 0bb0fbe3dd4..d2d441c7dbe 100644 --- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java +++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateReservedInstancesListing implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListing", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListing", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateReservedInstancesListing implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateReservedInstancesListing implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java index 71b6320924d..2a69f8bcff8 100644 --- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class CreateReservedInstancesListingResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListingResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateReservedInstancesListingResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class CreateReservedInstancesListingResponse implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class CreateReservedInstancesListingResponse implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java index fd2f7701541..862e6df562e 100644 --- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java @@ -125,7 +125,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202,7 +203,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -211,9 +213,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +446,8 @@ public class CreateReservedInstancesListingResponseType implements org.apache.ax while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java index 1181fabba34..d7304c5bd11 100644 --- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java +++ b/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java @@ -188,7 +188,8 @@ public class CreateReservedInstancesListingType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -335,9 +336,8 @@ public class CreateReservedInstancesListingType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRoute.java b/awsapi/src/com/amazon/ec2/CreateRoute.java index 5d24a2b9449..72810cb1b19 100644 --- a/awsapi/src/com/amazon/ec2/CreateRoute.java +++ b/awsapi/src/com/amazon/ec2/CreateRoute.java @@ -98,7 +98,8 @@ public class CreateRoute implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateRoute implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java index 5781692d499..8564fa635d8 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteResponse.java @@ -98,7 +98,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateRouteResponse implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteResponse").equals(reader.getName())) { object.setCreateRouteResponse(com.amazon.ec2.CreateRouteResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java index 3b99be41160..035ff906119 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java @@ -125,7 +125,8 @@ public class CreateRouteResponseType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CreateRouteResponseType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTable.java b/awsapi/src/com/amazon/ec2/CreateRouteTable.java index 0132ce6828d..8ecb753b38e 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteTable.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteTable.java @@ -98,7 +98,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateRouteTable implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) { object.setCreateRouteTable(com.amazon.ec2.CreateRouteTableType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java index 24c1638b88c..bead6e825c1 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java @@ -98,7 +98,8 @@ public class CreateRouteTableResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateRouteTableResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java index a7579331e7f..f08261f092a 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java @@ -125,7 +125,8 @@ public class CreateRouteTableResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateRouteTableResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java index 44f44516ea8..3ac07693a33 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteTableType.java @@ -101,7 +101,8 @@ public class CreateRouteTableType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CreateRouteTableType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteType.java b/awsapi/src/com/amazon/ec2/CreateRouteType.java index 75fb2009d96..2e3f7e0e9ac 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteType.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteType.java @@ -149,7 +149,8 @@ public class CreateRouteType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class CreateRouteType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java index c079a47a910..beb9245d993 100644 --- a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java @@ -210,7 +210,8 @@ public class CreateRouteTypeChoice_type0 implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -336,9 +337,8 @@ public class CreateRouteTypeChoice_type0 implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java index 831a6dbfa83..b2da751bbfd 100644 --- a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java +++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java @@ -98,7 +98,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateSecurityGroup implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroup").equals(reader.getName())) { object.setCreateSecurityGroup(com.amazon.ec2.CreateSecurityGroupType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java index 9fe5f419eb4..e739ae4fd6a 100644 --- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateSecurityGroupResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateSecurityGroupResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java index 725b55fc9dc..27bb0fd7d8b 100644 --- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java @@ -149,7 +149,8 @@ public class CreateSecurityGroupResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291,9 +292,8 @@ public class CreateSecurityGroupResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java index e09ddc2c928..52ebacefcf5 100644 --- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java +++ b/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java @@ -163,7 +163,8 @@ public class CreateSecurityGroupType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -308,9 +309,8 @@ public class CreateSecurityGroupType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshot.java b/awsapi/src/com/amazon/ec2/CreateSnapshot.java index 13ecb5d9b6c..1d329129f49 100644 --- a/awsapi/src/com/amazon/ec2/CreateSnapshot.java +++ b/awsapi/src/com/amazon/ec2/CreateSnapshot.java @@ -98,7 +98,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateSnapshot implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) { object.setCreateSnapshot(com.amazon.ec2.CreateSnapshotType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java index 1a307c4dd4b..93a1e5c1109 100644 --- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java @@ -98,7 +98,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse").equals(reader.getName())) { object.setCreateSnapshotResponse(com.amazon.ec2.CreateSnapshotResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java index 9d90cbb4a54..3a0453d2f89 100644 --- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java @@ -307,7 +307,8 @@ public class CreateSnapshotResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -644,9 +645,8 @@ public class CreateSnapshotResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java index 82a89c84626..4278e08406f 100644 --- a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java +++ b/awsapi/src/com/amazon/ec2/CreateSnapshotType.java @@ -139,7 +139,8 @@ public class CreateSnapshotType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -252,9 +253,8 @@ public class CreateSnapshotType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java index 665d9a04937..f9ba57696b8 100644 --- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java +++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscription", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscription", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateSpotDatafeedSubscription implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateSpotDatafeedSubscription implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java index db2b10aee00..b52f4959dc3 100644 --- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscriptionResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateSpotDatafeedSubscriptionResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class CreateSpotDatafeedSubscriptionResponse implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java index c5b3eb076e7..3193fc315c2 100644 --- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java @@ -125,7 +125,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class CreateSpotDatafeedSubscriptionResponseType implements org.apache.ax while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java index 90691b514e8..0d5c5405b5e 100644 --- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java +++ b/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java @@ -125,7 +125,8 @@ public class CreateSpotDatafeedSubscriptionType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CreateSpotDatafeedSubscriptionType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSubnet.java b/awsapi/src/com/amazon/ec2/CreateSubnet.java index d14ef8f59be..5023b6fb1c7 100644 --- a/awsapi/src/com/amazon/ec2/CreateSubnet.java +++ b/awsapi/src/com/amazon/ec2/CreateSubnet.java @@ -98,7 +98,8 @@ public class CreateSubnet implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateSubnet implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java index 0937c4c5629..4bb8ac4cb0a 100644 --- a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java @@ -98,7 +98,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateSubnetResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnetResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnetResponse").equals(reader.getName())) { object.setCreateSubnetResponse(com.amazon.ec2.CreateSubnetResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java index a68e7352ff4..b8f8ab0c339 100644 --- a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java @@ -125,7 +125,8 @@ public class CreateSubnetResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateSubnetResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateSubnetType.java b/awsapi/src/com/amazon/ec2/CreateSubnetType.java index c1c471068fd..a4a68467ed5 100644 --- a/awsapi/src/com/amazon/ec2/CreateSubnetType.java +++ b/awsapi/src/com/amazon/ec2/CreateSubnetType.java @@ -163,7 +163,8 @@ public class CreateSubnetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -308,9 +309,8 @@ public class CreateSubnetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateTags.java b/awsapi/src/com/amazon/ec2/CreateTags.java index 114b07da49a..b8a407db55d 100644 --- a/awsapi/src/com/amazon/ec2/CreateTags.java +++ b/awsapi/src/com/amazon/ec2/CreateTags.java @@ -98,7 +98,8 @@ public class CreateTags implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateTags implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java index b8f3aa30e9f..401299f1561 100644 --- a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateTagsResponse.java @@ -98,7 +98,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateTagsResponse implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) { object.setCreateTagsResponse(com.amazon.ec2.CreateTagsResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java index 2d0b7177b1f..d8048402978 100644 --- a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java @@ -125,7 +125,8 @@ public class CreateTagsResponseType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CreateTagsResponseType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateTagsType.java b/awsapi/src/com/amazon/ec2/CreateTagsType.java index f0e4f4d8f96..df47acfe972 100644 --- a/awsapi/src/com/amazon/ec2/CreateTagsType.java +++ b/awsapi/src/com/amazon/ec2/CreateTagsType.java @@ -125,7 +125,8 @@ public class CreateTagsType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184,9 +185,8 @@ public class CreateTagsType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolume.java b/awsapi/src/com/amazon/ec2/CreateVolume.java index e49be11d7e4..a1632f0278d 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolume.java +++ b/awsapi/src/com/amazon/ec2/CreateVolume.java @@ -98,7 +98,8 @@ public class CreateVolume implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVolume implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java index 25a3a8536dc..6b634ed56aa 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java @@ -168,7 +168,8 @@ public class CreateVolumePermissionItemType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class CreateVolumePermissionItemType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java index 7fc98d921a5..0ad6fa380e5 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java @@ -142,7 +142,8 @@ public class CreateVolumePermissionListType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class CreateVolumePermissionListType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java index 7729f04dbf2..a21105c6c0b 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java @@ -168,7 +168,8 @@ public class CreateVolumePermissionOperationType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -228,9 +229,8 @@ public class CreateVolumePermissionOperationType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java index d999409a0d4..530491acbc1 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java @@ -98,7 +98,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateVolumeResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolumeResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolumeResponse").equals(reader.getName())) { object.setCreateVolumeResponse(com.amazon.ec2.CreateVolumeResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java index d340ac5e247..4663ef437ab 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java @@ -308,7 +308,8 @@ public class CreateVolumeResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -642,9 +643,8 @@ public class CreateVolumeResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVolumeType.java b/awsapi/src/com/amazon/ec2/CreateVolumeType.java index 82a2f590b96..7722a6992ac 100644 --- a/awsapi/src/com/amazon/ec2/CreateVolumeType.java +++ b/awsapi/src/com/amazon/ec2/CreateVolumeType.java @@ -254,7 +254,8 @@ public class CreateVolumeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class CreateVolumeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpc.java b/awsapi/src/com/amazon/ec2/CreateVpc.java index e38dedcb6ad..853130741d4 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpc.java +++ b/awsapi/src/com/amazon/ec2/CreateVpc.java @@ -98,7 +98,8 @@ public class CreateVpc implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpc implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java index 216f4a35f51..1172fdbfdfa 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpcResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateVpcResponse.java @@ -98,7 +98,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateVpcResponse implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) { object.setCreateVpcResponse(com.amazon.ec2.CreateVpcResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java index 44d4e68ae44..74750ce653b 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpcResponseType.java @@ -125,7 +125,8 @@ public class CreateVpcResponseType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateVpcResponseType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpcType.java b/awsapi/src/com/amazon/ec2/CreateVpcType.java index 59dca8539ac..216826a08da 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpcType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpcType.java @@ -139,7 +139,8 @@ public class CreateVpcType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -252,9 +253,8 @@ public class CreateVpcType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java index a3d20245d64..0c817d0a912 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnection.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnection.java @@ -98,7 +98,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateVpnConnection implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnection").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnection").equals(reader.getName())) { object.setCreateVpnConnection(com.amazon.ec2.CreateVpnConnectionType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java index 6aa73e3bb48..23c4ecd8b1f 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateVpnConnectionResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateVpnConnectionResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java index 6ec847f35e0..08c4d51847e 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionResponseType.java @@ -125,7 +125,8 @@ public class CreateVpnConnectionResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateVpnConnectionResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java index f01afa3beb7..42706cd0973 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRoute.java @@ -98,7 +98,8 @@ public class CreateVpnConnectionRoute implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpnConnectionRoute implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java index 310bf88d8b2..64cadc9b988 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionRouteResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateVpnConnectionRouteResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class CreateVpnConnectionRouteResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java index 19c0a7d4876..ee43fb1b4a1 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteResponseType.java @@ -125,7 +125,8 @@ public class CreateVpnConnectionRouteResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class CreateVpnConnectionRouteResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java index bd52b13f13b..077e54eb3c3 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionRouteType.java @@ -125,7 +125,8 @@ public class CreateVpnConnectionRouteType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CreateVpnConnectionRouteType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java index 586d354beee..37397970d82 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnConnectionType.java @@ -187,7 +187,8 @@ public class CreateVpnConnectionType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -337,9 +338,8 @@ public class CreateVpnConnectionType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java index 29a3288f503..0cf847db97e 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnGateway.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnGateway.java @@ -98,7 +98,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class CreateVpnGateway implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) { object.setCreateVpnGateway(com.amazon.ec2.CreateVpnGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java index 3da7a6cd230..b01ddd3b5c5 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponse.java @@ -98,7 +98,8 @@ public class CreateVpnGatewayResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class CreateVpnGatewayResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java index e815e10356e..ff60d4ec283 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayResponseType.java @@ -125,7 +125,8 @@ public class CreateVpnGatewayResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class CreateVpnGatewayResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java index 333d4bf42c1..d6ed0794bd2 100644 --- a/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java +++ b/awsapi/src/com/amazon/ec2/CreateVpnGatewayType.java @@ -139,7 +139,8 @@ public class CreateVpnGatewayType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -252,9 +253,8 @@ public class CreateVpnGatewayType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java index 4ec520510a3..62471c80ab1 100644 --- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetItemType.java @@ -101,7 +101,8 @@ public class CustomerGatewayIdSetItemType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CustomerGatewayIdSetItemType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java index 5fa28dde9b0..a57618187c6 100644 --- a/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java +++ b/awsapi/src/com/amazon/ec2/CustomerGatewayIdSetType.java @@ -142,7 +142,8 @@ public class CustomerGatewayIdSetType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class CustomerGatewayIdSetType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java index b88e2d6247e..398f3a469e1 100644 --- a/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java +++ b/awsapi/src/com/amazon/ec2/CustomerGatewaySetType.java @@ -142,7 +142,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class CustomerGatewaySetType implements org.apache.axis2.databinding.ADBB } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.CustomerGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.CustomerGatewayType.class, - list1)); + object.setItem((com.amazon.ec2.CustomerGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.CustomerGatewayType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java index 482f46a6ec5..ffc435ec2ef 100644 --- a/awsapi/src/com/amazon/ec2/CustomerGatewayType.java +++ b/awsapi/src/com/amazon/ec2/CustomerGatewayType.java @@ -250,7 +250,8 @@ public class CustomerGatewayType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class CustomerGatewayType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicense.java b/awsapi/src/com/amazon/ec2/DeactivateLicense.java index 281c845bf08..57588694b4e 100644 --- a/awsapi/src/com/amazon/ec2/DeactivateLicense.java +++ b/awsapi/src/com/amazon/ec2/DeactivateLicense.java @@ -98,7 +98,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeactivateLicense implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) { object.setDeactivateLicense(com.amazon.ec2.DeactivateLicenseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java index 58b39a77d00..51a59dacbc9 100644 --- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java +++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeactivateLicenseResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeactivateLicenseResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeactivateLicenseResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java index 0fc5a0b6605..3b48c1af793 100644 --- a/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseResponseType.java @@ -125,7 +125,8 @@ public class DeactivateLicenseResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeactivateLicenseResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java index ffad30e6293..b1a7279c720 100644 --- a/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java +++ b/awsapi/src/com/amazon/ec2/DeactivateLicenseType.java @@ -125,7 +125,8 @@ public class DeactivateLicenseType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeactivateLicenseType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java index 6a497e6d18c..d72bd8e4916 100644 --- a/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java +++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGateway.java @@ -98,7 +98,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway").equals(reader.getName())) { object.setDeleteCustomerGateway(com.amazon.ec2.DeleteCustomerGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java index 11e4ba550e4..8bf90792f2c 100644 --- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteCustomerGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteCustomerGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java index 0871b7cebe7..0deed5484ed 100644 --- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayResponseType.java @@ -125,7 +125,8 @@ public class DeleteCustomerGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteCustomerGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java index 7cc457e357e..ae805e16cef 100644 --- a/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java +++ b/awsapi/src/com/amazon/ec2/DeleteCustomerGatewayType.java @@ -101,7 +101,8 @@ public class DeleteCustomerGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteCustomerGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java index a9fe8153cce..c3b55a2a02c 100644 --- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java +++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java @@ -98,7 +98,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteDhcpOptions implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) { object.setDeleteDhcpOptions(com.amazon.ec2.DeleteDhcpOptionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java index 7553aae6630..6c09db67dfd 100644 --- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java index 37086426edb..7314a5c1d60 100644 --- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsResponseType.java @@ -125,7 +125,8 @@ public class DeleteDhcpOptionsResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteDhcpOptionsResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java index 61aa847dbe7..eb12869b4b8 100644 --- a/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/DeleteDhcpOptionsType.java @@ -101,7 +101,8 @@ public class DeleteDhcpOptionsType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteDhcpOptionsType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java index e6318422c2f..e153cc10eeb 100644 --- a/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java +++ b/awsapi/src/com/amazon/ec2/DeleteInternetGateway.java @@ -98,7 +98,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway").equals(reader.getName())) { object.setDeleteInternetGateway(com.amazon.ec2.DeleteInternetGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java index ee736d42ff7..38c6f0022d0 100644 --- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteInternetGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteInternetGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java index 3b45fcd58b7..9b641cf8b9f 100644 --- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayResponseType.java @@ -125,7 +125,8 @@ public class DeleteInternetGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteInternetGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java index c06a263fa0e..e96813e1b7d 100644 --- a/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java +++ b/awsapi/src/com/amazon/ec2/DeleteInternetGatewayType.java @@ -101,7 +101,8 @@ public class DeleteInternetGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteInternetGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java index e6c88101527..faad15e9aff 100644 --- a/awsapi/src/com/amazon/ec2/DeleteKeyPair.java +++ b/awsapi/src/com/amazon/ec2/DeleteKeyPair.java @@ -98,7 +98,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteKeyPair implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) { object.setDeleteKeyPair(com.amazon.ec2.DeleteKeyPairType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java index 81060362ac3..4bf2d4e3634 100644 --- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponse.java @@ -98,7 +98,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse").equals(reader.getName())) { object.setDeleteKeyPairResponse(com.amazon.ec2.DeleteKeyPairResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java index 4597f65dd54..613e5ba7e8b 100644 --- a/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairResponseType.java @@ -125,7 +125,8 @@ public class DeleteKeyPairResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteKeyPairResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java index d5df2a8d08a..e39b619db60 100644 --- a/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java +++ b/awsapi/src/com/amazon/ec2/DeleteKeyPairType.java @@ -101,7 +101,8 @@ public class DeleteKeyPairType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteKeyPairType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java index 5f9f9751108..255bd52b324 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java @@ -98,7 +98,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteNetworkAcl implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) { object.setDeleteNetworkAcl(com.amazon.ec2.DeleteNetworkAclType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java index cb16bca0fff..1fd877a94c7 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntry.java @@ -98,7 +98,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry").equals(reader.getName())) { object.setDeleteNetworkAclEntry(com.amazon.ec2.DeleteNetworkAclEntryType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java index fdb93c65b13..a10c82c9cca 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntryResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteNetworkAclEntryResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java index e5fff371562..44040e8c886 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryResponseType.java @@ -125,7 +125,8 @@ public class DeleteNetworkAclEntryResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteNetworkAclEntryResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java index 8ee24559b6b..db2994baca4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclEntryType.java @@ -149,7 +149,8 @@ public class DeleteNetworkAclEntryType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -288,9 +289,8 @@ public class DeleteNetworkAclEntryType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java index 05a4fbeb2d0..c1d6b7040cc 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponse.java @@ -98,7 +98,8 @@ public class DeleteNetworkAclResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteNetworkAclResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java index df9cefacd60..96641998952 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclResponseType.java @@ -125,7 +125,8 @@ public class DeleteNetworkAclResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteNetworkAclResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java index 7aeae18d3a6..94cdcf14450 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkAclType.java @@ -101,7 +101,8 @@ public class DeleteNetworkAclType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteNetworkAclType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java index f391253409d..8e3829ecb40 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterface.java @@ -98,7 +98,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface").equals(reader.getName())) { object.setDeleteNetworkInterface(com.amazon.ec2.DeleteNetworkInterfaceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java index c64c4fcfa42..d56bd473e60 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterfaceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteNetworkInterfaceResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java index f556f5b2055..b8c9242bbd4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceResponseType.java @@ -125,7 +125,8 @@ public class DeleteNetworkInterfaceResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteNetworkInterfaceResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java index dc463be63c6..527445893df 100644 --- a/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java +++ b/awsapi/src/com/amazon/ec2/DeleteNetworkInterfaceType.java @@ -101,7 +101,8 @@ public class DeleteNetworkInterfaceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteNetworkInterfaceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java index cbb629c4a9b..f4800dc9f7b 100644 --- a/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java +++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroup.java @@ -98,7 +98,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeletePlacementGroup implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroup").equals(reader.getName())) { object.setDeletePlacementGroup(com.amazon.ec2.DeletePlacementGroupType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java index d00855a2190..7f329ea8502 100644 --- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java +++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeletePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeletePlacementGroupResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeletePlacementGroupResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java index 5d5670089ae..dc68858877e 100644 --- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupResponseType.java @@ -125,7 +125,8 @@ public class DeletePlacementGroupResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeletePlacementGroupResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java index 4dc202c8400..fbee10359c3 100644 --- a/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java +++ b/awsapi/src/com/amazon/ec2/DeletePlacementGroupType.java @@ -101,7 +101,8 @@ public class DeletePlacementGroupType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeletePlacementGroupType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRoute.java b/awsapi/src/com/amazon/ec2/DeleteRoute.java index 5ce30ee3b6a..a02f2dd6216 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRoute.java +++ b/awsapi/src/com/amazon/ec2/DeleteRoute.java @@ -98,7 +98,8 @@ public class DeleteRoute implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteRoute implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java index d0e85c8e5f9..2f49bdaaac4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponse.java @@ -98,7 +98,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteRouteResponse implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteResponse").equals(reader.getName())) { object.setDeleteRouteResponse(com.amazon.ec2.DeleteRouteResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java index 6c97cb6794a..9bc55037d01 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteResponseType.java @@ -125,7 +125,8 @@ public class DeleteRouteResponseType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteRouteResponseType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java index c740911f440..e58c3d74a8a 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteTable.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteTable.java @@ -98,7 +98,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteRouteTable implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) { object.setDeleteRouteTable(com.amazon.ec2.DeleteRouteTableType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java index e3ec8026f1b..dbd509239b4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponse.java @@ -98,7 +98,8 @@ public class DeleteRouteTableResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteRouteTableResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java index 759f0f3b6ed..e434ec8e837 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableResponseType.java @@ -125,7 +125,8 @@ public class DeleteRouteTableResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteRouteTableResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java index e4b446862b4..012b38ae09e 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteTableType.java @@ -101,7 +101,8 @@ public class DeleteRouteTableType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteRouteTableType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteRouteType.java b/awsapi/src/com/amazon/ec2/DeleteRouteType.java index b63e79cc281..decf6622e28 100644 --- a/awsapi/src/com/amazon/ec2/DeleteRouteType.java +++ b/awsapi/src/com/amazon/ec2/DeleteRouteType.java @@ -125,7 +125,8 @@ public class DeleteRouteType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DeleteRouteType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java index d71088fe864..2fefb7ce555 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java +++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java @@ -98,7 +98,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteSecurityGroup implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroup").equals(reader.getName())) { object.setDeleteSecurityGroup(com.amazon.ec2.DeleteSecurityGroupType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java index 41ad33ac80e..9f2cc6e416e 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteSecurityGroupResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java index 8318e8887f1..8d7ee9403b3 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupResponseType.java @@ -125,7 +125,8 @@ public class DeleteSecurityGroupResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteSecurityGroupResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java index fd87314c0a7..4be9090d79f 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSecurityGroupType.java @@ -168,7 +168,8 @@ public class DeleteSecurityGroupType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class DeleteSecurityGroupType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java index d560d34602b..7d039267026 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSnapshot.java +++ b/awsapi/src/com/amazon/ec2/DeleteSnapshot.java @@ -98,7 +98,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteSnapshot implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) { object.setDeleteSnapshot(com.amazon.ec2.DeleteSnapshotType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java index 57386a761c4..7c9b3877db6 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponse.java @@ -98,7 +98,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse").equals(reader.getName())) { object.setDeleteSnapshotResponse(com.amazon.ec2.DeleteSnapshotResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java index f2acfa492f6..bf38c198059 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotResponseType.java @@ -125,7 +125,8 @@ public class DeleteSnapshotResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteSnapshotResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java index a0972f9f507..7aaf7b998dd 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSnapshotType.java @@ -101,7 +101,8 @@ public class DeleteSnapshotType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteSnapshotType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java index 7565b335a83..2f1fe581e53 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java +++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscription.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscription", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscription", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteSpotDatafeedSubscription implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java index 4b0e5a5c41a..62ee37cf6bf 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscriptionResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteSpotDatafeedSubscriptionResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DeleteSpotDatafeedSubscriptionResponse implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java index 4dc8c92f77f..e440fbd3936 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionResponseType.java @@ -125,7 +125,8 @@ public class DeleteSpotDatafeedSubscriptionResponseType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteSpotDatafeedSubscriptionResponseType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java index 4bccd53a721..1ad2c2153c5 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSpotDatafeedSubscriptionType.java @@ -77,7 +77,8 @@ public class DeleteSpotDatafeedSubscriptionType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126,9 +127,8 @@ public class DeleteSpotDatafeedSubscriptionType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnet.java b/awsapi/src/com/amazon/ec2/DeleteSubnet.java index cd0af6ed78d..526d18845b0 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSubnet.java +++ b/awsapi/src/com/amazon/ec2/DeleteSubnet.java @@ -98,7 +98,8 @@ public class DeleteSubnet implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteSubnet implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java index 8b113138834..dec01c93864 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponse.java @@ -98,7 +98,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteSubnetResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnetResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnetResponse").equals(reader.getName())) { object.setDeleteSubnetResponse(com.amazon.ec2.DeleteSubnetResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java index 4c85e93e3f4..fc38ee9d3cb 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSubnetResponseType.java @@ -125,7 +125,8 @@ public class DeleteSubnetResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteSubnetResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java index c46d13c23cd..58cff0cbb55 100644 --- a/awsapi/src/com/amazon/ec2/DeleteSubnetType.java +++ b/awsapi/src/com/amazon/ec2/DeleteSubnetType.java @@ -101,7 +101,8 @@ public class DeleteSubnetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteSubnetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteTags.java b/awsapi/src/com/amazon/ec2/DeleteTags.java index 8464d2c8634..1bdf6871b9b 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTags.java +++ b/awsapi/src/com/amazon/ec2/DeleteTags.java @@ -98,7 +98,8 @@ public class DeleteTags implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteTags implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java index 710deca2ff8..5d71af29bbd 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponse.java @@ -98,7 +98,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteTagsResponse implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) { object.setDeleteTagsResponse(com.amazon.ec2.DeleteTagsResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java index 73574429901..7f874f80637 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteTagsResponseType.java @@ -125,7 +125,8 @@ public class DeleteTagsResponseType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteTagsResponseType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java index 87acb04dc84..7f7414d1114 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetItemType.java @@ -153,7 +153,8 @@ public class DeleteTagsSetItemType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DeleteTagsSetItemType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java index 7ac07ea309c..d1f64622cb5 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java +++ b/awsapi/src/com/amazon/ec2/DeleteTagsSetType.java @@ -142,7 +142,8 @@ public class DeleteTagsSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DeleteTagsSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteTagsType.java b/awsapi/src/com/amazon/ec2/DeleteTagsType.java index f270a44d4bd..7a64496931d 100644 --- a/awsapi/src/com/amazon/ec2/DeleteTagsType.java +++ b/awsapi/src/com/amazon/ec2/DeleteTagsType.java @@ -125,7 +125,8 @@ public class DeleteTagsType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184,9 +185,8 @@ public class DeleteTagsType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVolume.java b/awsapi/src/com/amazon/ec2/DeleteVolume.java index 0e9fda5e763..d35179a4d67 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVolume.java +++ b/awsapi/src/com/amazon/ec2/DeleteVolume.java @@ -98,7 +98,8 @@ public class DeleteVolume implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVolume implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java index 0bfee8f6094..4f26c68339f 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponse.java @@ -98,7 +98,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteVolumeResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolumeResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolumeResponse").equals(reader.getName())) { object.setDeleteVolumeResponse(com.amazon.ec2.DeleteVolumeResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java index 918374b3546..d6693785250 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVolumeResponseType.java @@ -125,7 +125,8 @@ public class DeleteVolumeResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteVolumeResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java index c1709b712cd..80a8fcd6645 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVolumeType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVolumeType.java @@ -101,7 +101,8 @@ public class DeleteVolumeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteVolumeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpc.java b/awsapi/src/com/amazon/ec2/DeleteVpc.java index b7f087cb407..44f4c64dd74 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpc.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpc.java @@ -98,7 +98,8 @@ public class DeleteVpc implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpc implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java index e013ee6ee9e..6b084299cce 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponse.java @@ -98,7 +98,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteVpcResponse implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) { object.setDeleteVpcResponse(com.amazon.ec2.DeleteVpcResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java index 27ec47ecbe5..8c2679329ec 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpcResponseType.java @@ -125,7 +125,8 @@ public class DeleteVpcResponseType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteVpcResponseType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpcType.java b/awsapi/src/com/amazon/ec2/DeleteVpcType.java index 9c53c82675b..a6e7ab80dff 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpcType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpcType.java @@ -101,7 +101,8 @@ public class DeleteVpcType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteVpcType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java index d81443ced92..933ab4e7836 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnection.java @@ -98,7 +98,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteVpnConnection implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnection").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnection").equals(reader.getName())) { object.setDeleteVpnConnection(com.amazon.ec2.DeleteVpnConnectionType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java index f0c3dbf1f29..96dca99c4f2 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteVpnConnectionResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java index 2ecd42c3706..c99375cdcae 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionResponseType.java @@ -125,7 +125,8 @@ public class DeleteVpnConnectionResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteVpnConnectionResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java index 76570bd52be..18511a8b4e2 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRoute.java @@ -98,7 +98,8 @@ public class DeleteVpnConnectionRoute implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpnConnectionRoute implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java index 335af6b5352..d1199efa342 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionRouteResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteVpnConnectionRouteResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java index 5e788d636c2..fd07a5edcb5 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteResponseType.java @@ -125,7 +125,8 @@ public class DeleteVpnConnectionRouteResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteVpnConnectionRouteResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java index 6c9aa21dcf8..4c214c24555 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionRouteType.java @@ -125,7 +125,8 @@ public class DeleteVpnConnectionRouteType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DeleteVpnConnectionRouteType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java index a54daaeb42c..fea593f34d4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnConnectionType.java @@ -101,7 +101,8 @@ public class DeleteVpnConnectionType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteVpnConnectionType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java index d457a9216bc..60253809cc4 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnGateway.java @@ -98,7 +98,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeleteVpnGateway implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) { object.setDeleteVpnGateway(com.amazon.ec2.DeleteVpnGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java index bfe61fa6e9c..15990ec29bd 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponse.java @@ -98,7 +98,8 @@ public class DeleteVpnGatewayResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeleteVpnGatewayResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java index 9058ea042b7..e5722ed2cdc 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayResponseType.java @@ -125,7 +125,8 @@ public class DeleteVpnGatewayResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeleteVpnGatewayResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java index 865d7b6b3cc..c5999366802 100644 --- a/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java +++ b/awsapi/src/com/amazon/ec2/DeleteVpnGatewayType.java @@ -101,7 +101,8 @@ public class DeleteVpnGatewayType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeleteVpnGatewayType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeregisterImage.java b/awsapi/src/com/amazon/ec2/DeregisterImage.java index d7c1ca45bcb..3b0b5d100bf 100644 --- a/awsapi/src/com/amazon/ec2/DeregisterImage.java +++ b/awsapi/src/com/amazon/ec2/DeregisterImage.java @@ -98,7 +98,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DeregisterImage implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) { object.setDeregisterImage(com.amazon.ec2.DeregisterImageType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java index a74ca34e136..ddcf635a527 100644 --- a/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java +++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponse.java @@ -98,7 +98,8 @@ public class DeregisterImageResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DeregisterImageResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java index 6205f38e956..dd8cf96a29e 100644 --- a/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java +++ b/awsapi/src/com/amazon/ec2/DeregisterImageResponseType.java @@ -125,7 +125,8 @@ public class DeregisterImageResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DeregisterImageResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DeregisterImageType.java b/awsapi/src/com/amazon/ec2/DeregisterImageType.java index c220ce05a75..b091dfda001 100644 --- a/awsapi/src/com/amazon/ec2/DeregisterImageType.java +++ b/awsapi/src/com/amazon/ec2/DeregisterImageType.java @@ -101,7 +101,8 @@ public class DeregisterImageType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DeregisterImageType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddresses.java b/awsapi/src/com/amazon/ec2/DescribeAddresses.java index 52d0f7f05e2..68a8838ff14 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddresses.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddresses.java @@ -98,7 +98,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeAddresses implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) { object.setDescribeAddresses(com.amazon.ec2.DescribeAddressesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java index d75ee3c2381..cc23caba868 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesInfoType.java @@ -142,7 +142,8 @@ public class DescribeAddressesInfoType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeAddressesInfoType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java index 83d722bf230..ee00ce22749 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesItemType.java @@ -101,7 +101,8 @@ public class DescribeAddressesItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeAddressesItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java index f9023cd7afe..0a4db6286d9 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeAddressesResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeAddressesResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java index e9a77213e35..0c804158f24 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseInfoType.java @@ -142,7 +142,8 @@ public class DescribeAddressesResponseInfoType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeAddressesResponseInfoType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java index 6c4a15bba5e..380a403af1b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseItemType.java @@ -353,7 +353,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -662,9 +663,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1036,7 +1036,8 @@ public class DescribeAddressesResponseItemType implements org.apache.axis2.datab while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java index 83c56c13ffd..c03ac5ad2d9 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesResponseType.java @@ -125,7 +125,8 @@ public class DescribeAddressesResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeAddressesResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java index 181c9d580e9..d85f8cea76b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAddressesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAddressesType.java @@ -163,7 +163,8 @@ public class DescribeAddressesType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -227,9 +228,8 @@ public class DescribeAddressesType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java index 6f1394ce12d..de546e911f0 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZones.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeAvailabilityZones implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeAvailabilityZones implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeAvailabilityZones implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java index caadbd91141..5901a32ac25 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeAvailabilityZonesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZonesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeAvailabilityZonesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeAvailabilityZonesResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeAvailabilityZonesResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java index 7b45c53b127..b82270a4349 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesResponseType.java @@ -125,7 +125,8 @@ public class DescribeAvailabilityZonesResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeAvailabilityZonesResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java index 56a9e5ef5b4..df7aa716830 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetItemType.java @@ -101,7 +101,8 @@ public class DescribeAvailabilityZonesSetItemType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeAvailabilityZonesSetItemType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java index 1a72b1085ac..ca436afd24c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesSetType.java @@ -142,7 +142,8 @@ public class DescribeAvailabilityZonesSetType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeAvailabilityZonesSetType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java index 4b7cdbe0c46..5460b30176e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeAvailabilityZonesType.java @@ -139,7 +139,8 @@ public class DescribeAvailabilityZonesType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeAvailabilityZonesType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java index 27f326a417f..71de7508b29 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasks.java @@ -98,7 +98,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeBundleTasks implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasks").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasks").equals(reader.getName())) { object.setDescribeBundleTasks(com.amazon.ec2.DescribeBundleTasksType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java index 67aff162489..1261173b837 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksInfoType.java @@ -142,7 +142,8 @@ public class DescribeBundleTasksInfoType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeBundleTasksInfoType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java index c8e07559d39..86f5799a10d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksItemType.java @@ -101,7 +101,8 @@ public class DescribeBundleTasksItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeBundleTasksItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java index a1e8a29b91e..111bb0a3917 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeBundleTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeBundleTasksResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeBundleTasksResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java index 8d1727a6578..d9f45b31167 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksResponseType.java @@ -125,7 +125,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class DescribeBundleTasksResponseType implements org.apache.axis2.databin while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) { object.setBundleInstanceTasksSet(com.amazon.ec2.BundleInstanceTasksSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java index 84791e968b9..f150e876575 100644 --- a/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java +++ b/awsapi/src/com/amazon/ec2/DescribeBundleTasksType.java @@ -139,7 +139,8 @@ public class DescribeBundleTasksType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeBundleTasksType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java index 519d91ce9a7..453c2e18d04 100644 --- a/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java +++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasks.java @@ -98,7 +98,8 @@ public class DescribeConversionTasks implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeConversionTasks implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java index ddcbd17efda..b4001ce937a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeConversionTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasksResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeConversionTasksResponse implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeConversionTasksResponse implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java index a5ce146d065..16773318d33 100644 --- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksResponseType.java @@ -125,7 +125,8 @@ public class DescribeConversionTasksResponseType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeConversionTasksResponseType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java index a5106086f31..66670bfb8ed 100644 --- a/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java +++ b/awsapi/src/com/amazon/ec2/DescribeConversionTasksType.java @@ -101,7 +101,8 @@ public class DescribeConversionTasksType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class DescribeConversionTasksType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java index 298d97ce52b..dca00a06a84 100644 --- a/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java +++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGateways.java @@ -98,7 +98,8 @@ public class DescribeCustomerGateways implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeCustomerGateways implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java index 9a925ad4c61..f4a99e86870 100644 --- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeCustomerGatewaysResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeCustomerGatewaysResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeCustomerGatewaysResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java index 852118239f6..d326f4ea213 100644 --- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysResponseType.java @@ -125,7 +125,8 @@ public class DescribeCustomerGatewaysResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeCustomerGatewaysResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java index 4caa2223029..7cad5970640 100644 --- a/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java +++ b/awsapi/src/com/amazon/ec2/DescribeCustomerGatewaysType.java @@ -153,7 +153,8 @@ public class DescribeCustomerGatewaysType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeCustomerGatewaysType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java index ed030e63307..e24efe407f1 100644 --- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java +++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java @@ -98,7 +98,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeDhcpOptions implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptions").equals(reader.getName())) { object.setDescribeDhcpOptions(com.amazon.ec2.DescribeDhcpOptionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java index 60341b25128..67b17b2034c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java index d6e4d062920..a4e308615df 100644 --- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsResponseType.java @@ -125,7 +125,8 @@ public class DescribeDhcpOptionsResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeDhcpOptionsResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java index 8dfa315a4d9..7207c11ae14 100644 --- a/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeDhcpOptionsType.java @@ -153,7 +153,8 @@ public class DescribeDhcpOptionsType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeDhcpOptionsType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java index e84cd2ca727..5aeeeb0ac0a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeExportTasks.java +++ b/awsapi/src/com/amazon/ec2/DescribeExportTasks.java @@ -98,7 +98,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeExportTasks implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasks").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasks").equals(reader.getName())) { object.setDescribeExportTasks(com.amazon.ec2.DescribeExportTasksType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java index f2b98888900..bc75d93f051 100644 --- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeExportTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeExportTasksResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeExportTasksResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java index c993dfdc76e..d8a001b2710 100644 --- a/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksResponseType.java @@ -125,7 +125,8 @@ public class DescribeExportTasksResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeExportTasksResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java index 674f1a0a6ca..bd17866dbd6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java +++ b/awsapi/src/com/amazon/ec2/DescribeExportTasksType.java @@ -101,7 +101,8 @@ public class DescribeExportTasksType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class DescribeExportTasksType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java index b9d666983a2..25ba4cb0ee1 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttribute.java @@ -98,7 +98,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeImageAttribute implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute").equals(reader.getName())) { object.setDescribeImageAttribute(com.amazon.ec2.DescribeImageAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java index dcaa4b336eb..1e88e881731 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeImageAttributeResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeImageAttributeResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java index 0eb08543c6e..13ebbb963bc 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseType.java @@ -149,7 +149,8 @@ public class DescribeImageAttributeResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DescribeImageAttributeResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java index 63c8cc622cc..f3d9d51e103 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeResponseTypeChoice_type0.java @@ -336,7 +336,8 @@ public class DescribeImageAttributeResponseTypeChoice_type0 implements org.apach } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -399,9 +400,8 @@ public class DescribeImageAttributeResponseTypeChoice_type0 implements org.apach /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java index 1a378046bd0..4675bd82066 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributeType.java @@ -125,7 +125,8 @@ public class DescribeImageAttributeType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeImageAttributeType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java index 4e0f870cb14..aec8ba35c5e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/DescribeImageAttributesGroup.java @@ -378,7 +378,8 @@ public class DescribeImageAttributesGroup implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -447,9 +448,8 @@ public class DescribeImageAttributesGroup implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImages.java b/awsapi/src/com/amazon/ec2/DescribeImages.java index 1c98608cd38..1915a371882 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImages.java +++ b/awsapi/src/com/amazon/ec2/DescribeImages.java @@ -98,7 +98,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeImages implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) { object.setDescribeImages(com.amazon.ec2.DescribeImagesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java index 3a2a6a752bc..e1b28d3eed9 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableBySetType.java @@ -142,7 +142,8 @@ public class DescribeImagesExecutableBySetType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeImagesExecutableBySetType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java index c6fc7515677..1c4cd33f46c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesExecutableByType.java @@ -101,7 +101,8 @@ public class DescribeImagesExecutableByType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeImagesExecutableByType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java index 4511bb3afd4..2e9fd845ffb 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesInfoType.java @@ -142,7 +142,8 @@ public class DescribeImagesInfoType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeImagesInfoType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java index 81e58a314f5..6a852a8852b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesItemType.java @@ -101,7 +101,8 @@ public class DescribeImagesItemType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeImagesItemType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java index cef2122b87e..4602020eaa3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnerType.java @@ -101,7 +101,8 @@ public class DescribeImagesOwnerType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeImagesOwnerType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java index 01f9bda3c94..d8dcff4cc74 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesOwnersType.java @@ -142,7 +142,8 @@ public class DescribeImagesOwnersType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeImagesOwnersType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java index e21339b11dc..fbd5367849b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponse.java @@ -98,7 +98,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeImagesResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse").equals(reader.getName())) { object.setDescribeImagesResponse(com.amazon.ec2.DescribeImagesResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java index 336044d4c8a..f3c4c99b92a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseInfoType.java @@ -142,7 +142,8 @@ public class DescribeImagesResponseInfoType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeImagesResponseInfoType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java index 7b223618102..38c92120c9e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseItemType.java @@ -819,7 +819,8 @@ public class DescribeImagesResponseItemType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1444,9 +1445,8 @@ public class DescribeImagesResponseItemType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java index b99434875da..9997b82717d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesResponseType.java @@ -125,7 +125,8 @@ public class DescribeImagesResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeImagesResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeImagesType.java b/awsapi/src/com/amazon/ec2/DescribeImagesType.java index 216cb64c4a4..8772bb93d53 100644 --- a/awsapi/src/com/amazon/ec2/DescribeImagesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeImagesType.java @@ -215,7 +215,8 @@ public class DescribeImagesType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -285,9 +286,8 @@ public class DescribeImagesType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java index 0fbc7be0631..3023f0a2b71 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttribute.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeInstanceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeInstanceAttribute implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeInstanceAttribute implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java index 2938a9f6e92..997baaa1b25 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeInstanceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeInstanceAttributeResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeInstanceAttributeResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java index 553d730bf51..7982b0750e7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseType.java @@ -149,7 +149,8 @@ public class DescribeInstanceAttributeResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DescribeInstanceAttributeResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java index 48db43a4881..e8c3a1b946e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeResponseTypeChoice_type0.java @@ -588,7 +588,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -603,7 +604,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter); } @@ -643,8 +645,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localRootDeviceNameTracker) { if (localRootDeviceName == null) { @@ -688,9 +690,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1000,7 +1001,8 @@ public class DescribeInstanceAttributeResponseTypeChoice_type0 implements org.ap else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(com.amazon.ec2.NullableAttributeBooleanValueType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java index 216de4c606d..c1a13277039 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributeType.java @@ -125,7 +125,8 @@ public class DescribeInstanceAttributeType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeInstanceAttributeType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java index c6ec82a91b7..c7d2028b064 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceAttributesGroup.java @@ -588,7 +588,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -643,8 +644,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localRootDeviceNameTracker) { if (localRootDeviceName == null) { @@ -688,9 +689,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1000,7 +1000,8 @@ public class DescribeInstanceAttributesGroup implements org.apache.axis2.databin else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(com.amazon.ec2.EmptyElementType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java index 1c5089c8c5e..0f97e94a8c3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatus.java @@ -98,7 +98,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus").equals(reader.getName())) { object.setDescribeInstanceStatus(com.amazon.ec2.DescribeInstanceStatusType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java index 33913745a0f..68a1722e74e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatusResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeInstanceStatusResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeInstanceStatusResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java index 3c5365a3b69..62d9ad14d87 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusResponseType.java @@ -163,7 +163,8 @@ public class DescribeInstanceStatusResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281,9 +282,8 @@ public class DescribeInstanceStatusResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java index d96c049dc1d..c96304487e0 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstanceStatusType.java @@ -255,7 +255,8 @@ public class DescribeInstanceStatusType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -407,9 +408,8 @@ public class DescribeInstanceStatusType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstances.java b/awsapi/src/com/amazon/ec2/DescribeInstances.java index 6f40a56f14f..b583595875e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstances.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstances.java @@ -98,7 +98,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeInstances implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) { object.setDescribeInstances(com.amazon.ec2.DescribeInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java index 49f8c60d0ff..9778634d623 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstancesInfoType.java @@ -142,7 +142,8 @@ public class DescribeInstancesInfoType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeInstancesInfoType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java index 296671a973e..f23c4a4e5cb 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstancesItemType.java @@ -101,7 +101,8 @@ public class DescribeInstancesItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeInstancesItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java index fe52c050335..c407de6edcd 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeInstancesResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeInstancesResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java index e34ea428699..8b263ed71df 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstancesResponseType.java @@ -125,7 +125,8 @@ public class DescribeInstancesResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeInstancesResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java index dbfbed1a594..8ee4c0bf446 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInstancesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInstancesType.java @@ -139,7 +139,8 @@ public class DescribeInstancesType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeInstancesType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java index 9734bac9dc6..65a620ef436 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java +++ b/awsapi/src/com/amazon/ec2/DescribeInternetGateways.java @@ -98,7 +98,8 @@ public class DescribeInternetGateways implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeInternetGateways implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java index 3ac11cea788..6f45f43eb47 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeInternetGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInternetGatewaysResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeInternetGatewaysResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeInternetGatewaysResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeInternetGatewaysResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java index 0fb8b3a91a3..61bbc622c63 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysResponseType.java @@ -125,7 +125,8 @@ public class DescribeInternetGatewaysResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeInternetGatewaysResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java index 586d1987f74..75316464324 100644 --- a/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java +++ b/awsapi/src/com/amazon/ec2/DescribeInternetGatewaysType.java @@ -139,7 +139,8 @@ public class DescribeInternetGatewaysType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeInternetGatewaysType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java index 387ab51f370..b32101150df 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairs.java @@ -98,7 +98,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeKeyPairs implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) { object.setDescribeKeyPairs(com.amazon.ec2.DescribeKeyPairsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java index c1c96f542f9..956f37fae4f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsInfoType.java @@ -142,7 +142,8 @@ public class DescribeKeyPairsInfoType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeKeyPairsInfoType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java index 9c784b8cdd6..843479d2c88 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsItemType.java @@ -101,7 +101,8 @@ public class DescribeKeyPairsItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeKeyPairsItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java index 78c9a41d3a8..984730a3a8e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponse.java @@ -98,7 +98,8 @@ public class DescribeKeyPairsResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeKeyPairsResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java index 9b184f6c9d0..b0c8a8474be 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseInfoType.java @@ -142,7 +142,8 @@ public class DescribeKeyPairsResponseInfoType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeKeyPairsResponseInfoType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java index 487c1166f5a..67ae4c3795d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseItemType.java @@ -125,7 +125,8 @@ public class DescribeKeyPairsResponseItemType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DescribeKeyPairsResponseItemType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java index 7afe6a165f2..ce55fe9589f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsResponseType.java @@ -125,7 +125,8 @@ public class DescribeKeyPairsResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeKeyPairsResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java index 4177c9e70fb..f5325ba40bd 100644 --- a/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeKeyPairsType.java @@ -139,7 +139,8 @@ public class DescribeKeyPairsType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeKeyPairsType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeLicenses.java b/awsapi/src/com/amazon/ec2/DescribeLicenses.java index 9d2c57bc305..ade169b6e12 100644 --- a/awsapi/src/com/amazon/ec2/DescribeLicenses.java +++ b/awsapi/src/com/amazon/ec2/DescribeLicenses.java @@ -98,7 +98,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeLicenses implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) { object.setDescribeLicenses(com.amazon.ec2.DescribeLicensesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java index 0c9b394cb1d..de8d58b09d1 100644 --- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponse.java @@ -98,7 +98,8 @@ public class DescribeLicensesResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeLicensesResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java index 2f861669d1a..0bc5716f88f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeLicensesResponseType.java @@ -125,7 +125,8 @@ public class DescribeLicensesResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeLicensesResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java index d7db1270e76..332b172afbf 100644 --- a/awsapi/src/com/amazon/ec2/DescribeLicensesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeLicensesType.java @@ -153,7 +153,8 @@ public class DescribeLicensesType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeLicensesType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java index fb1062fa56c..4b91d7546fc 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAcls.java @@ -98,7 +98,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeNetworkAcls implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAcls").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAcls").equals(reader.getName())) { object.setDescribeNetworkAcls(com.amazon.ec2.DescribeNetworkAclsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java index 83cf5865bc5..b2139fea807 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeNetworkAclsResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java index 8287435bf8e..2a106bae83a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsResponseType.java @@ -125,7 +125,8 @@ public class DescribeNetworkAclsResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeNetworkAclsResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java index 2eb50fb6d56..325f2ab6420 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkAclsType.java @@ -139,7 +139,8 @@ public class DescribeNetworkAclsType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeNetworkAclsType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java index a02b8afcd7d..c6d4e22a351 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttribute.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeNetworkInterfaceAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeNetworkInterfaceAttribute implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java index ed3acd9098e..9537b300f81 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaceAttributeResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeNetworkInterfaceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DescribeNetworkInterfaceAttributeResponse implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java index 486da72154d..c0885731228 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseType.java @@ -149,7 +149,8 @@ public class DescribeNetworkInterfaceAttributeResponseType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DescribeNetworkInterfaceAttributeResponseType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java index 4052b7a8305..9cdcd3ed7cb 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeResponseTypeChoice_type0.java @@ -252,7 +252,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,8 +268,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", - xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", + namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter); } @@ -304,9 +305,8 @@ public class DescribeNetworkInterfaceAttributeResponseTypeChoice_type0 implement /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java index 90422e5e8f5..b0be0fd7451 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributeType.java @@ -125,7 +125,8 @@ public class DescribeNetworkInterfaceAttributeType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeNetworkInterfaceAttributeType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java index 1f0cf6bc1a3..80a3db9523d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaceAttributesGroup.java @@ -252,7 +252,8 @@ public class DescribeNetworkInterfaceAttributesGroup implements org.apache.axis2 } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -303,9 +304,8 @@ public class DescribeNetworkInterfaceAttributesGroup implements org.apache.axis2 /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java index 59e4aa72d3a..0eb83fdeadc 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfaces.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeNetworkInterfaces implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java index 866cd548067..0f2e83b68b7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeNetworkInterfacesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfacesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeNetworkInterfacesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeNetworkInterfacesResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeNetworkInterfacesResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java index 36865e36165..22415d4ac00 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesResponseType.java @@ -125,7 +125,8 @@ public class DescribeNetworkInterfacesResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeNetworkInterfacesResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java index 0b5e49437bc..cc85c5e99a6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeNetworkInterfacesType.java @@ -153,7 +153,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -431,7 +431,8 @@ public class DescribeNetworkInterfacesType implements org.apache.axis2.databindi while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) { object.setNetworkInterfaceIdSet(com.amazon.ec2.NetworkInterfaceIdSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java index 9c597ba35c0..4e091e35e0f 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupItemType.java @@ -101,7 +101,8 @@ public class DescribePlacementGroupItemType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribePlacementGroupItemType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java index 7f6fbf0a191..27a18d68238 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroups.java @@ -98,7 +98,8 @@ public class DescribePlacementGroups implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribePlacementGroups implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java index b8f4921f009..884ec7235ee 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsInfoType.java @@ -142,7 +142,8 @@ public class DescribePlacementGroupsInfoType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribePlacementGroupsInfoType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java index 0e221d021dc..73015e72cb9 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribePlacementGroupsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroupsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroupsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribePlacementGroupsResponse implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribePlacementGroupsResponse implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java index 6f0cb6f5e0f..15887abf5f4 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsResponseType.java @@ -125,7 +125,8 @@ public class DescribePlacementGroupsResponseType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribePlacementGroupsResponseType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java index c569e595e22..88e631132a3 100644 --- a/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java +++ b/awsapi/src/com/amazon/ec2/DescribePlacementGroupsType.java @@ -139,7 +139,8 @@ public class DescribePlacementGroupsType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribePlacementGroupsType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegions.java b/awsapi/src/com/amazon/ec2/DescribeRegions.java index be788e81af9..67b05ff5157 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegions.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegions.java @@ -98,7 +98,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeRegions implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) { object.setDescribeRegions(com.amazon.ec2.DescribeRegionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java index a9139a6083f..a3238925df0 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponse.java @@ -98,7 +98,8 @@ public class DescribeRegionsResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeRegionsResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java index f346f2a367f..16858583ade 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegionsResponseType.java @@ -125,7 +125,8 @@ public class DescribeRegionsResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeRegionsResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java index 208c75b1005..d86d8cefe81 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetItemType.java @@ -101,7 +101,8 @@ public class DescribeRegionsSetItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeRegionsSetItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java index 97f2e560162..8a9b9d38e5a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegionsSetType.java @@ -142,7 +142,8 @@ public class DescribeRegionsSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeRegionsSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java index 52dc3eca0a5..d03cb9309e7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRegionsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRegionsType.java @@ -139,7 +139,8 @@ public class DescribeRegionsType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeRegionsType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java index 28c025a359d..ed6226c6024 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstances.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeReservedInstances implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeReservedInstances implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeReservedInstances implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java index 1d97dc6eec3..a6a2cb45e53 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetItemType.java @@ -101,7 +101,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -391,7 +391,8 @@ public class DescribeReservedInstancesListingSetItemType implements org.apache.a while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java index 89192fdda35..4da650be9b3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingSetType.java @@ -90,7 +90,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2 java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.DescribeReservedInstancesListingSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.DescribeReservedInstancesListingSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingSetItemType[list.size()]); } @@ -129,7 +130,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2 } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +197,8 @@ public class DescribeReservedInstancesListingSetType implements org.apache.axis2 /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java index 4454fcafcc7..3b7ac22a3e6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListings.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeReservedInstancesListings implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesListings", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesListings", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeReservedInstancesListings implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeReservedInstancesListings implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java index d8ab00f54fa..78035377984 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class DescribeReservedInstancesListingsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesListingsResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesListingsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class DescribeReservedInstancesListingsResponse implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DescribeReservedInstancesListingsResponse implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java index c4e41a29204..4e42d76937b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetItemType.java @@ -345,7 +345,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -380,7 +381,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetItemType", xmlWriter); } @@ -634,9 +636,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -914,7 +915,8 @@ public class DescribeReservedInstancesListingsResponseSetItemType implements org while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java index dc3114498cf..c6f60b78630 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseSetType.java @@ -103,7 +103,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesListingsResponseSetItemType[list.size()]); } @@ -142,7 +143,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -177,7 +179,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetType", xmlWriter); } @@ -208,9 +211,8 @@ public class DescribeReservedInstancesListingsResponseSetType implements org.apa /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java index b177715ad7a..0a979a84620 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsResponseType.java @@ -125,7 +125,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202,7 +203,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -211,9 +213,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +446,8 @@ public class DescribeReservedInstancesListingsResponseType implements org.apache while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet").equals(reader.getName())) { object.setReservedInstancesListingsSet(com.amazon.ec2.DescribeReservedInstancesListingsResponseSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java index 05b6cb61496..7d00dfc58d2 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesListingsType.java @@ -191,7 +191,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -236,7 +237,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d if (localReservedInstancesListingSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingSet cannot be null!!"); } - localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), factory, xmlWriter); + localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), factory, + xmlWriter); } if (localReservedInstancesSetTracker) { if (localReservedInstancesSet == null) { @@ -257,9 +259,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -483,7 +484,8 @@ public class DescribeReservedInstancesListingsType implements org.apache.axis2.d while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet").equals(reader.getName())) { object.setReservedInstancesListingSet(com.amazon.ec2.DescribeReservedInstancesListingSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java index d948e508fe6..7ea529d3295 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferings.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeReservedInstancesOfferings implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesOfferings", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesOfferings", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeReservedInstancesOfferings implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeReservedInstancesOfferings implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java index 31dc2cece4d..d8d7c1c7d7a 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponse.java @@ -99,7 +99,8 @@ public class DescribeReservedInstancesOfferingsResponse implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DescribeReservedInstancesOfferingsResponse implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java index e06c06cb46c..81d277adbc1 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetItemType.java @@ -418,7 +418,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -453,7 +454,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter); } @@ -818,9 +820,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1107,7 +1108,8 @@ public class DescribeReservedInstancesOfferingsResponseSetItemType implements or while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java index 8757515aeb8..78d14c04793 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseSetType.java @@ -103,7 +103,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]); } @@ -142,7 +143,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -177,7 +179,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetType", xmlWriter); } @@ -208,9 +211,8 @@ public class DescribeReservedInstancesOfferingsResponseSetType implements org.ap /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java index 793c3c2b1ca..5921745b04e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsResponseType.java @@ -163,7 +163,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -240,7 +241,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach if (localReservedInstancesOfferingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!"); } - localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, xmlWriter); + localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, + xmlWriter); if (localNextTokenTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (!namespace.equals("")) { @@ -281,9 +283,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -524,7 +525,8 @@ public class DescribeReservedInstancesOfferingsResponseType implements org.apach while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) { object.setReservedInstancesOfferingsSet(com.amazon.ec2.DescribeReservedInstancesOfferingsResponseSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java index abf5d28dd3f..3f4bb83e913 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetItemType.java @@ -101,7 +101,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -391,7 +391,8 @@ public class DescribeReservedInstancesOfferingsSetItemType implements org.apache while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java index 82870fbd86d..eefeb19548d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsSetType.java @@ -103,7 +103,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesOfferingsSetItemType[list.size()]); } @@ -142,7 +143,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +210,8 @@ public class DescribeReservedInstancesOfferingsSetType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java index 1b9a0e9ff0d..163bfbb81da 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesOfferingsType.java @@ -576,7 +576,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -621,8 +622,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2. if (localReservedInstancesOfferingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!"); } - localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, - xmlWriter); + localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), + factory, xmlWriter); } if (localInstanceTypeTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; @@ -985,9 +986,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1282,7 +1282,8 @@ public class DescribeReservedInstancesOfferingsType implements org.apache.axis2. while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet").equals(reader.getName())) { object.setReservedInstancesOfferingsSet(com.amazon.ec2.DescribeReservedInstancesOfferingsSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java index d29f7393eae..a8ae49ce74f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeReservedInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeReservedInstancesResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeReservedInstancesResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java index 9bda3a550f1..bed70964d48 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetItemType.java @@ -465,7 +465,8 @@ public class DescribeReservedInstancesResponseSetItemType implements org.apache. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -931,9 +932,8 @@ public class DescribeReservedInstancesResponseSetItemType implements org.apache. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java index 83c7ee1e7bb..4b2aa45ccdd 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseSetType.java @@ -103,7 +103,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[])list.toArray(new com.amazon.ec2.DescribeReservedInstancesResponseSetItemType[list.size()]); } @@ -142,7 +143,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +210,8 @@ public class DescribeReservedInstancesResponseSetType implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java index a89e2ea2980..e0e477ab1c2 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesResponseType.java @@ -125,7 +125,8 @@ public class DescribeReservedInstancesResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeReservedInstancesResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java index 6a53c835a88..6763a59151f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetItemType.java @@ -101,7 +101,8 @@ public class DescribeReservedInstancesSetItemType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeReservedInstancesSetItemType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java index 2c5fcd3640d..8babb88d311 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesSetType.java @@ -142,7 +142,8 @@ public class DescribeReservedInstancesSetType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeReservedInstancesSetType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java index 39e83eed112..331c47ce18d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeReservedInstancesType.java @@ -191,7 +191,8 @@ public class DescribeReservedInstancesType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -284,9 +285,8 @@ public class DescribeReservedInstancesType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java index 81f44c9c23e..87a9ffabac4 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRouteTables.java +++ b/awsapi/src/com/amazon/ec2/DescribeRouteTables.java @@ -98,7 +98,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeRouteTables implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTables").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTables").equals(reader.getName())) { object.setDescribeRouteTables(com.amazon.ec2.DescribeRouteTablesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java index b44ade0741e..aa7f78d57b4 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeRouteTablesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeRouteTablesResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeRouteTablesResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java index d693fe47e3b..57156a0a09f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesResponseType.java @@ -125,7 +125,8 @@ public class DescribeRouteTablesResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeRouteTablesResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java index a98c650c824..abdebd1c7ba 100644 --- a/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeRouteTablesType.java @@ -139,7 +139,8 @@ public class DescribeRouteTablesType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeRouteTablesType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java index 234aafcefea..1a5dff49b0e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroups.java @@ -98,7 +98,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups").equals(reader.getName())) { object.setDescribeSecurityGroups(com.amazon.ec2.DescribeSecurityGroupsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java index a05f08fba6b..fcf2a812962 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetItemType.java @@ -101,7 +101,8 @@ public class DescribeSecurityGroupsIdSetItemType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeSecurityGroupsIdSetItemType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java index fb9663f71ce..c198ea7e8ea 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsIdSetType.java @@ -142,7 +142,8 @@ public class DescribeSecurityGroupsIdSetType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSecurityGroupsIdSetType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java index 53f65874180..e70867f513b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSecurityGroupsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroupsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroupsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSecurityGroupsResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSecurityGroupsResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java index ef6a6635e09..7d33d382b63 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsResponseType.java @@ -125,7 +125,8 @@ public class DescribeSecurityGroupsResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSecurityGroupsResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java index b1288f4b2d5..3718ba34c5e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetItemType.java @@ -101,7 +101,8 @@ public class DescribeSecurityGroupsSetItemType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeSecurityGroupsSetItemType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java index 9d64b46f5f1..a6e479feac2 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsSetType.java @@ -142,7 +142,8 @@ public class DescribeSecurityGroupsSetType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSecurityGroupsSetType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java index 76821c7a321..da026d378a6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSecurityGroupsType.java @@ -177,7 +177,8 @@ public class DescribeSecurityGroupsType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -242,9 +243,8 @@ public class DescribeSecurityGroupsType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java index ad17a02c806..3b050f00f40 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttribute.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSnapshotAttribute implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java index c7484a323da..c65624c9755 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSnapshotAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSnapshotAttributeResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSnapshotAttributeResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java index e59fbdddba6..d63aee4b7e6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseType.java @@ -149,7 +149,8 @@ public class DescribeSnapshotAttributeResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DescribeSnapshotAttributeResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java index bbc8f9e22bb..718f4731b42 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeResponseTypeChoice_type0.java @@ -168,7 +168,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -183,7 +184,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter); } @@ -207,9 +209,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -399,7 +400,8 @@ public class DescribeSnapshotAttributeResponseTypeChoice_type0 implements org.ap // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(com.amazon.ec2.CreateVolumePermissionListType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java index 80f712efb17..db56e6d6c79 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributeType.java @@ -125,7 +125,8 @@ public class DescribeSnapshotAttributeType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSnapshotAttributeType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java index 9cbef7ece59..f787f7bc8dd 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotAttributesGroup.java @@ -168,7 +168,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207,9 +208,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -399,7 +399,8 @@ public class DescribeSnapshotAttributesGroup implements org.apache.axis2.databin // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(com.amazon.ec2.EmptyElementType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java index 35944fb5f7c..0122c0645a3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshots.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshots.java @@ -98,7 +98,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeSnapshots implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) { object.setDescribeSnapshots(com.amazon.ec2.DescribeSnapshotsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java index ad949b7566e..60f9ff18eba 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnerType.java @@ -101,7 +101,8 @@ public class DescribeSnapshotsOwnerType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeSnapshotsOwnerType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java index 899b1f4cebb..3b7254eaca3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsOwnersType.java @@ -142,7 +142,8 @@ public class DescribeSnapshotsOwnersType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSnapshotsOwnersType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java index c535da868ce..be921922998 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSnapshotsResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java index 3a0097e24ad..54af188f57d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsResponseType.java @@ -125,7 +125,8 @@ public class DescribeSnapshotsResponseType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSnapshotsResponseType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java index 3f4611c5381..d096d2e012e 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableBySetType.java @@ -142,7 +142,8 @@ public class DescribeSnapshotsRestorableBySetType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSnapshotsRestorableBySetType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java index 797d69df4c2..343b72cdf1c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsRestorableByType.java @@ -101,7 +101,8 @@ public class DescribeSnapshotsRestorableByType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeSnapshotsRestorableByType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java index 8eda786972e..519762d3aa7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemResponseType.java @@ -359,7 +359,8 @@ public class DescribeSnapshotsSetItemResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -703,9 +704,8 @@ public class DescribeSnapshotsSetItemResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java index a813b173ee3..f1812f09569 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetItemType.java @@ -101,7 +101,8 @@ public class DescribeSnapshotsSetItemType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeSnapshotsSetItemType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java index ba16098b8c5..195863cbfe3 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetResponseType.java @@ -142,7 +142,8 @@ public class DescribeSnapshotsSetResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSnapshotsSetResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java index efc99730945..5b3d87efb57 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsSetType.java @@ -142,7 +142,8 @@ public class DescribeSnapshotsSetType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeSnapshotsSetType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java index cf1a6b3cba6..e3472a20433 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSnapshotsType.java @@ -215,7 +215,8 @@ public class DescribeSnapshotsType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -286,9 +287,8 @@ public class DescribeSnapshotsType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java index 0d94357a43a..5edf8d4d050 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscription.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotDatafeedSubscription", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotDatafeedSubscription", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSpotDatafeedSubscription implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java index 9d39196d746..e9d51418302 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotDatafeedSubscriptionResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotDatafeedSubscriptionResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DescribeSpotDatafeedSubscriptionResponse implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java index f7db15d3171..846bb141700 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionResponseType.java @@ -125,7 +125,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class DescribeSpotDatafeedSubscriptionResponseType implements org.apache. while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java index 75180d90f9c..3316c98ef3c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotDatafeedSubscriptionType.java @@ -77,7 +77,8 @@ public class DescribeSpotDatafeedSubscriptionType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126,9 +127,8 @@ public class DescribeSpotDatafeedSubscriptionType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java index 3025e4ba333..c413f976acd 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequests.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequests", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequests", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSpotInstanceRequests implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSpotInstanceRequests implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java index 7f3cece9529..7f1f15db5ef 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequestsResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotInstanceRequestsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java index a48eedf7b6d..2a6ccf4f495 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsResponseType.java @@ -125,7 +125,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class DescribeSpotInstanceRequestsResponseType implements org.apache.axis while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(com.amazon.ec2.SpotInstanceRequestSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java index e013be22c99..5da70acc1ea 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotInstanceRequestsType.java @@ -139,7 +139,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -414,7 +414,8 @@ public class DescribeSpotInstanceRequestsType implements org.apache.axis2.databi while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java index 75ec8f79c4d..1118e923e9c 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistory.java @@ -98,7 +98,8 @@ public class DescribeSpotPriceHistory implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeSpotPriceHistory implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java index e8fda9cf313..70a4c3080e6 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotPriceHistoryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotPriceHistoryResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java index 8bc1dde57cf..9dfebce7264 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryResponseType.java @@ -163,7 +163,8 @@ public class DescribeSpotPriceHistoryResponseType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281,9 +282,8 @@ public class DescribeSpotPriceHistoryResponseType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java index f5343d73831..34bf7c99a57 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSpotPriceHistoryType.java @@ -381,7 +381,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -612,9 +613,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -932,7 +932,8 @@ public class DescribeSpotPriceHistoryType implements org.apache.axis2.databindin while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) { object.setProductDescriptionSet(com.amazon.ec2.ProductDescriptionSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnets.java b/awsapi/src/com/amazon/ec2/DescribeSubnets.java index bd519f9ea6b..586deafa306 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSubnets.java +++ b/awsapi/src/com/amazon/ec2/DescribeSubnets.java @@ -98,7 +98,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeSubnets implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) { object.setDescribeSubnets(com.amazon.ec2.DescribeSubnetsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java index 61afe8d2813..aae38ec0aaa 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponse.java @@ -98,7 +98,8 @@ public class DescribeSubnetsResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeSubnetsResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java index 2c3092c00b7..160d7da6b23 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsResponseType.java @@ -125,7 +125,8 @@ public class DescribeSubnetsResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeSubnetsResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java index 023940ace7c..dcf9676cb9b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeSubnetsType.java @@ -153,7 +153,8 @@ public class DescribeSubnetsType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeSubnetsType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeTags.java b/awsapi/src/com/amazon/ec2/DescribeTags.java index a0c517bab2a..a535b50aaef 100644 --- a/awsapi/src/com/amazon/ec2/DescribeTags.java +++ b/awsapi/src/com/amazon/ec2/DescribeTags.java @@ -98,7 +98,8 @@ public class DescribeTags implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeTags implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java index 14d45298904..b86f743c122 100644 --- a/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponse.java @@ -98,7 +98,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeTagsResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTagsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTagsResponse").equals(reader.getName())) { object.setDescribeTagsResponse(com.amazon.ec2.DescribeTagsResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java index b9f7cb6d272..ca15546e8c8 100644 --- a/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeTagsResponseType.java @@ -125,7 +125,8 @@ public class DescribeTagsResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeTagsResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeTagsType.java b/awsapi/src/com/amazon/ec2/DescribeTagsType.java index fe3bb33cba8..b8c7f709a98 100644 --- a/awsapi/src/com/amazon/ec2/DescribeTagsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeTagsType.java @@ -115,7 +115,8 @@ public class DescribeTagsType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -169,9 +170,8 @@ public class DescribeTagsType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java index 3d26b864ad6..3ffa015bb8d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttribute.java @@ -98,7 +98,8 @@ public class DescribeVolumeAttribute implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVolumeAttribute implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java index 11a0f054525..84685c0693b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeVolumeAttributeResponse implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeVolumeAttributeResponse implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java index f817bab951c..809af5769c7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseType.java @@ -149,7 +149,8 @@ public class DescribeVolumeAttributeResponseType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class DescribeVolumeAttributeResponseType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java index 474da7dc1db..2f35ef9ad1d 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeResponseTypeChoice_type0.java @@ -168,7 +168,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -183,7 +184,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter); } @@ -207,9 +209,8 @@ public class DescribeVolumeAttributeResponseTypeChoice_type0 implements org.apac /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java index 31182458fc2..37375785e1b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributeType.java @@ -125,7 +125,8 @@ public class DescribeVolumeAttributeType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeVolumeAttributeType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java index 308c66ba073..6b1aa40d60b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeAttributesGroup.java @@ -168,7 +168,8 @@ public class DescribeVolumeAttributesGroup implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207,9 +208,8 @@ public class DescribeVolumeAttributesGroup implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java index 61aebfd5b34..f55da525fe5 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatus.java @@ -98,7 +98,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeVolumeStatus implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatus").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatus").equals(reader.getName())) { object.setDescribeVolumeStatus(com.amazon.ec2.DescribeVolumeStatusType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java index cd9fdb67947..ba8007f174b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeVolumeStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatusResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeVolumeStatusResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeVolumeStatusResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java index 846a8788016..95305353206 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusResponseType.java @@ -163,7 +163,8 @@ public class DescribeVolumeStatusResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281,9 +282,8 @@ public class DescribeVolumeStatusResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java index 12a73a576d8..4b67d0e0d3b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumeStatusType.java @@ -215,7 +215,8 @@ public class DescribeVolumeStatusType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -340,9 +341,8 @@ public class DescribeVolumeStatusType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumes.java b/awsapi/src/com/amazon/ec2/DescribeVolumes.java index 280cd2d34fc..4f1b1b7ee1f 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumes.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumes.java @@ -98,7 +98,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeVolumes implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) { object.setDescribeVolumes(com.amazon.ec2.DescribeVolumesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java index 5b7a1b3614d..0d90c938239 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponse.java @@ -98,7 +98,8 @@ public class DescribeVolumesResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVolumesResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java index 52b6e3979a9..f28fac60946 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesResponseType.java @@ -125,7 +125,8 @@ public class DescribeVolumesResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeVolumesResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java index 4be8c99839d..621633ac14b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemResponseType.java @@ -346,7 +346,8 @@ public class DescribeVolumesSetItemResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -658,9 +659,8 @@ public class DescribeVolumesSetItemResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java index 3117c9249b9..8a9496738ea 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetItemType.java @@ -101,7 +101,8 @@ public class DescribeVolumesSetItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DescribeVolumesSetItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java index 754fd887d64..9a8d1771962 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetResponseType.java @@ -142,7 +142,8 @@ public class DescribeVolumesSetResponseType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeVolumesSetResponseType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java index 6012bd044fc..59cc09e822b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesSetType.java @@ -142,7 +142,8 @@ public class DescribeVolumesSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DescribeVolumesSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java index 155ea457eed..f04f498e0ca 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVolumesType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVolumesType.java @@ -139,7 +139,8 @@ public class DescribeVolumesType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198,9 +199,8 @@ public class DescribeVolumesType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcs.java b/awsapi/src/com/amazon/ec2/DescribeVpcs.java index 77f025134c9..53228aa5c44 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpcs.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpcs.java @@ -98,7 +98,8 @@ public class DescribeVpcs implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVpcs implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java index 668d3cb88bd..10e4a32701b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponse.java @@ -98,7 +98,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeVpcsResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcsResponse").equals(reader.getName())) { object.setDescribeVpcsResponse(com.amazon.ec2.DescribeVpcsResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java index 3ea8e2e6db8..6fb5cb75118 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpcsResponseType.java @@ -125,7 +125,8 @@ public class DescribeVpcsResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeVpcsResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java index 7d6114de14d..82166e3f82b 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpcsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpcsType.java @@ -153,7 +153,8 @@ public class DescribeVpcsType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeVpcsType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java index 23a435b412d..cee1a8a19b7 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnections.java @@ -98,7 +98,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeVpnConnections implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections").equals(reader.getName())) { object.setDescribeVpnConnections(com.amazon.ec2.DescribeVpnConnectionsType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java index 439d5d71b57..34381ed70a5 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeVpnConnectionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnectionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnectionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeVpnConnectionsResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeVpnConnectionsResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java index 17838bd25be..599aac95352 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsResponseType.java @@ -125,7 +125,8 @@ public class DescribeVpnConnectionsResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeVpnConnectionsResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java index b743bab8657..5d5a79e23f0 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnConnectionsType.java @@ -153,7 +153,8 @@ public class DescribeVpnConnectionsType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeVpnConnectionsType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java index d7e3499d673..46b86f04671 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnGateways.java @@ -98,7 +98,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DescribeVpnGateways implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGateways").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGateways").equals(reader.getName())) { object.setDescribeVpnGateways(com.amazon.ec2.DescribeVpnGatewaysType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java index e548164fbbc..57b0700c9f1 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java index 9b0ca7fe210..58965f42710 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysResponseType.java @@ -125,7 +125,8 @@ public class DescribeVpnGatewaysResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DescribeVpnGatewaysResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java index 6e55c07b9ef..095b1083625 100644 --- a/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java +++ b/awsapi/src/com/amazon/ec2/DescribeVpnGatewaysType.java @@ -153,7 +153,8 @@ public class DescribeVpnGatewaysType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class DescribeVpnGatewaysType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java index 03374a2da32..e2df6846a18 100644 --- a/awsapi/src/com/amazon/ec2/DetachInternetGateway.java +++ b/awsapi/src/com/amazon/ec2/DetachInternetGateway.java @@ -98,7 +98,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DetachInternetGateway implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway").equals(reader.getName())) { object.setDetachInternetGateway(com.amazon.ec2.DetachInternetGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java index 9c3d0a6dd90..3a0dd3e0260 100644 --- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DetachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DetachInternetGatewayResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DetachInternetGatewayResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java index bd9d753c5e9..2f3c8a9f285 100644 --- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayResponseType.java @@ -125,7 +125,8 @@ public class DetachInternetGatewayResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DetachInternetGatewayResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java index 8eea00d8791..1f90350c9ce 100644 --- a/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java +++ b/awsapi/src/com/amazon/ec2/DetachInternetGatewayType.java @@ -125,7 +125,8 @@ public class DetachInternetGatewayType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DetachInternetGatewayType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java index 4416febfdaa..a96834e6662 100644 --- a/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java +++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterface.java @@ -98,7 +98,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DetachNetworkInterface implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface").equals(reader.getName())) { object.setDetachNetworkInterface(com.amazon.ec2.DetachNetworkInterfaceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java index 1dfdccf86ec..f8fac29e370 100644 --- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java +++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DetachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterfaceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DetachNetworkInterfaceResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DetachNetworkInterfaceResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java index adfc9c94151..d5720e9f012 100644 --- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java +++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceResponseType.java @@ -125,7 +125,8 @@ public class DetachNetworkInterfaceResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DetachNetworkInterfaceResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java index d6cee6356d9..1ab1b3b613e 100644 --- a/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java +++ b/awsapi/src/com/amazon/ec2/DetachNetworkInterfaceType.java @@ -140,7 +140,8 @@ public class DetachNetworkInterfaceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -250,9 +251,8 @@ public class DetachNetworkInterfaceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVolume.java b/awsapi/src/com/amazon/ec2/DetachVolume.java index a31e5789956..351cc769eac 100644 --- a/awsapi/src/com/amazon/ec2/DetachVolume.java +++ b/awsapi/src/com/amazon/ec2/DetachVolume.java @@ -98,7 +98,8 @@ public class DetachVolume implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachVolume implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java index 740f9edd7c0..3d188a2b436 100644 --- a/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java +++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponse.java @@ -98,7 +98,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DetachVolumeResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolumeResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolumeResponse").equals(reader.getName())) { object.setDetachVolumeResponse(com.amazon.ec2.DetachVolumeResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java index 4e43b64009d..968f92e9ddf 100644 --- a/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java +++ b/awsapi/src/com/amazon/ec2/DetachVolumeResponseType.java @@ -221,7 +221,8 @@ public class DetachVolumeResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class DetachVolumeResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVolumeType.java b/awsapi/src/com/amazon/ec2/DetachVolumeType.java index 31a16158477..20e7d40c52f 100644 --- a/awsapi/src/com/amazon/ec2/DetachVolumeType.java +++ b/awsapi/src/com/amazon/ec2/DetachVolumeType.java @@ -216,7 +216,8 @@ public class DetachVolumeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -392,9 +393,8 @@ public class DetachVolumeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java index 8a5ba904740..d61b9a817c9 100644 --- a/awsapi/src/com/amazon/ec2/DetachVpnGateway.java +++ b/awsapi/src/com/amazon/ec2/DetachVpnGateway.java @@ -98,7 +98,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DetachVpnGateway implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) { object.setDetachVpnGateway(com.amazon.ec2.DetachVpnGatewayType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java index eecc01a7a1e..31ad0e42111 100644 --- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponse.java @@ -98,7 +98,8 @@ public class DetachVpnGatewayResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DetachVpnGatewayResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java index 82a635aa018..5042fa855a9 100644 --- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayResponseType.java @@ -125,7 +125,8 @@ public class DetachVpnGatewayResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DetachVpnGatewayResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java index 916d4308830..505c74bd8a9 100644 --- a/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java +++ b/awsapi/src/com/amazon/ec2/DetachVpnGatewayType.java @@ -125,7 +125,8 @@ public class DetachVpnGatewayType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DetachVpnGatewayType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java index a47ac9d8845..c2e12c0b41a 100644 --- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java +++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemSetType.java @@ -142,7 +142,8 @@ public class DhcpConfigurationItemSetType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DhcpConfigurationItemSetType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java index 45151cb396e..75346984bba 100644 --- a/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java +++ b/awsapi/src/com/amazon/ec2/DhcpConfigurationItemType.java @@ -125,7 +125,8 @@ public class DhcpConfigurationItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class DhcpConfigurationItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java index 13d2890879f..ec6431931d1 100644 --- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetItemType.java @@ -101,7 +101,8 @@ public class DhcpOptionsIdSetItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DhcpOptionsIdSetItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java index e5d16855aea..982da9f1932 100644 --- a/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java +++ b/awsapi/src/com/amazon/ec2/DhcpOptionsIdSetType.java @@ -142,7 +142,8 @@ public class DhcpOptionsIdSetType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DhcpOptionsIdSetType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java index 3e9e29b913f..732a930cca6 100644 --- a/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java +++ b/awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java @@ -142,7 +142,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class DhcpOptionsSetType implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.DhcpOptionsType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpOptionsType.class, list1)); + object.setItem((com.amazon.ec2.DhcpOptionsType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.DhcpOptionsType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java index eda0a0d32bd..cf11e64a4e6 100644 --- a/awsapi/src/com/amazon/ec2/DhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/DhcpOptionsType.java @@ -163,7 +163,8 @@ public class DhcpOptionsType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254,9 +255,8 @@ public class DhcpOptionsType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java index 097507ce0d8..77565c5c098 100644 --- a/awsapi/src/com/amazon/ec2/DhcpValueSetType.java +++ b/awsapi/src/com/amazon/ec2/DhcpValueSetType.java @@ -142,7 +142,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class DhcpValueSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.DhcpValueType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpValueType.class, list1)); + object.setItem((com.amazon.ec2.DhcpValueType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DhcpValueType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/DhcpValueType.java b/awsapi/src/com/amazon/ec2/DhcpValueType.java index c0c8fea14ee..3c9c1fbb1d9 100644 --- a/awsapi/src/com/amazon/ec2/DhcpValueType.java +++ b/awsapi/src/com/amazon/ec2/DhcpValueType.java @@ -101,7 +101,8 @@ public class DhcpValueType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DhcpValueType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java index 610aaf52f47..4629a7afca5 100644 --- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java +++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagation.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DisableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DisableVgwRoutePropagation implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DisableVgwRoutePropagation implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java index 0480f6e6237..7687744d9e9 100644 --- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java +++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationRequestType.java @@ -125,7 +125,8 @@ public class DisableVgwRoutePropagationRequestType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DisableVgwRoutePropagationRequestType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java index 976edf61f8d..c5d72302005 100644 --- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java +++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DisableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagationResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DisableVgwRoutePropagationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DisableVgwRoutePropagationResponse implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DisableVgwRoutePropagationResponse implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java index adc9113266e..69ed784b0ae 100644 --- a/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java +++ b/awsapi/src/com/amazon/ec2/DisableVgwRoutePropagationResponseType.java @@ -125,7 +125,8 @@ public class DisableVgwRoutePropagationResponseType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DisableVgwRoutePropagationResponseType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddress.java b/awsapi/src/com/amazon/ec2/DisassociateAddress.java index aa270392b0c..255bb182e36 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateAddress.java +++ b/awsapi/src/com/amazon/ec2/DisassociateAddress.java @@ -98,7 +98,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DisassociateAddress implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddress").equals(reader.getName())) { object.setDisassociateAddress(com.amazon.ec2.DisassociateAddressType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java index b4e9390db79..c383368f446 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java +++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DisassociateAddressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DisassociateAddressResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DisassociateAddressResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java index 6353e829c1d..cb2fd97efe7 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java +++ b/awsapi/src/com/amazon/ec2/DisassociateAddressResponseType.java @@ -125,7 +125,8 @@ public class DisassociateAddressResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DisassociateAddressResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java index eee60f311e5..986e7511839 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateAddressType.java +++ b/awsapi/src/com/amazon/ec2/DisassociateAddressType.java @@ -168,7 +168,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -514,7 +514,8 @@ public class DisassociateAddressType implements org.apache.axis2.databinding.ADB else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java index 01d2c5eb11d..51df82d198e 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java +++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTable.java @@ -98,7 +98,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class DisassociateRouteTable implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable").equals(reader.getName())) { object.setDisassociateRouteTable(com.amazon.ec2.DisassociateRouteTableType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java index 74e66fc5a9e..95b1ee3e921 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java +++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class DisassociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTableResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class DisassociateRouteTableResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class DisassociateRouteTableResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java index dc1a8fd6f55..bf752bef586 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java +++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableResponseType.java @@ -125,7 +125,8 @@ public class DisassociateRouteTableResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class DisassociateRouteTableResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java index b2cd6ec5eb5..2949ff5dfd9 100644 --- a/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java +++ b/awsapi/src/com/amazon/ec2/DisassociateRouteTableType.java @@ -101,7 +101,8 @@ public class DisassociateRouteTableType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DisassociateRouteTableType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java index c09c7499b1d..c5597cc3105 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageDescriptionType.java @@ -187,7 +187,8 @@ public class DiskImageDescriptionType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -361,9 +362,8 @@ public class DiskImageDescriptionType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java index f9618800ba4..43f584bb693 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageDetailType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageDetailType.java @@ -149,7 +149,8 @@ public class DiskImageDetailType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291,9 +292,8 @@ public class DiskImageDetailType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DiskImageSetType.java b/awsapi/src/com/amazon/ec2/DiskImageSetType.java index 1adfec3a58b..04b3aeb545d 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageSetType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageSetType.java @@ -142,7 +142,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class DiskImageSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.DiskImageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DiskImageType.class, list1)); + object.setItem((com.amazon.ec2.DiskImageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.DiskImageType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/DiskImageType.java b/awsapi/src/com/amazon/ec2/DiskImageType.java index 1c15498104d..5360bad7868 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageType.java @@ -163,7 +163,8 @@ public class DiskImageType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254,9 +255,8 @@ public class DiskImageType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java index aa66cf28137..a33ffd27dd3 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeDescriptionType.java @@ -125,7 +125,8 @@ public class DiskImageVolumeDescriptionType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class DiskImageVolumeDescriptionType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java index eb207689c52..fc76e92519c 100644 --- a/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java +++ b/awsapi/src/com/amazon/ec2/DiskImageVolumeType.java @@ -101,7 +101,8 @@ public class DiskImageVolumeType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class DiskImageVolumeType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java index d197d72bca4..316260ac484 100644 --- a/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java +++ b/awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java @@ -270,7 +270,8 @@ public class EbsBlockDeviceType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -474,9 +475,8 @@ public class EbsBlockDeviceType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java index c9834f8ccdf..db9f2951080 100644 --- a/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java +++ b/awsapi/src/com/amazon/ec2/EbsInstanceBlockDeviceMappingResponseType.java @@ -188,7 +188,8 @@ public class EbsInstanceBlockDeviceMappingResponseType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -362,9 +363,8 @@ public class EbsInstanceBlockDeviceMappingResponseType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EmptyElementType.java b/awsapi/src/com/amazon/ec2/EmptyElementType.java index ad2f381a4d9..1b88f0a0744 100644 --- a/awsapi/src/com/amazon/ec2/EmptyElementType.java +++ b/awsapi/src/com/amazon/ec2/EmptyElementType.java @@ -77,7 +77,8 @@ public class EmptyElementType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126,9 +127,8 @@ public class EmptyElementType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java index 7f0e06ff9e7..2cb888edf03 100644 --- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java +++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagation.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class EnableVgwRoutePropagation implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java index 2779fc7018f..cc51cd5ccc6 100644 --- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java +++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationRequestType.java @@ -125,7 +125,8 @@ public class EnableVgwRoutePropagationRequestType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class EnableVgwRoutePropagationRequestType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java index d2b89967801..dbc4ed04cf3 100644 --- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java +++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class EnableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagationResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "EnableVgwRoutePropagationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class EnableVgwRoutePropagationResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class EnableVgwRoutePropagationResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java index 3b5d345931b..c9579ba3e5f 100644 --- a/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java +++ b/awsapi/src/com/amazon/ec2/EnableVgwRoutePropagationResponseType.java @@ -125,7 +125,8 @@ public class EnableVgwRoutePropagationResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class EnableVgwRoutePropagationResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java index b7f19555cc3..fc16f91701d 100644 --- a/awsapi/src/com/amazon/ec2/EnableVolumeIO.java +++ b/awsapi/src/com/amazon/ec2/EnableVolumeIO.java @@ -98,7 +98,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class EnableVolumeIO implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) { object.setEnableVolumeIO(com.amazon.ec2.EnableVolumeIOType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java index b6f2f4c6ffa..a1f22405a23 100644 --- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java +++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponse.java @@ -98,7 +98,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse").equals(reader.getName())) { object.setEnableVolumeIOResponse(com.amazon.ec2.EnableVolumeIOResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java index a3deafdb4ba..1805c4331e2 100644 --- a/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java +++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOResponseType.java @@ -125,7 +125,8 @@ public class EnableVolumeIOResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class EnableVolumeIOResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java index 5a80566352b..8b31a5142b9 100644 --- a/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java +++ b/awsapi/src/com/amazon/ec2/EnableVolumeIOType.java @@ -101,7 +101,8 @@ public class EnableVolumeIOType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class EnableVolumeIOType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java index f01d1a88bab..8bf5f6dc17c 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskIdSetType.java @@ -142,7 +142,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class ExportTaskIdSetType implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.ExportTaskIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ExportTaskIdType.class, list1)); + object.setItem((com.amazon.ec2.ExportTaskIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.ExportTaskIdType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java index d10462dad16..94beb232584 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskIdType.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskIdType.java @@ -101,7 +101,8 @@ public class ExportTaskIdType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ExportTaskIdType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java index 90f06dd847d..1fe18a92a70 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseType.java @@ -249,7 +249,8 @@ public class ExportTaskResponseType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -436,9 +437,8 @@ public class ExportTaskResponseType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java index 23a2ea1ff55..361e860fba2 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type0.java @@ -126,7 +126,8 @@ public class ExportTaskResponseTypeChoice_type0 implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ExportTaskResponseTypeChoice_type0 implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java index f566ed4123f..d9faf3f9b51 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskResponseTypeChoice_type1.java @@ -126,7 +126,8 @@ public class ExportTaskResponseTypeChoice_type1 implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ExportTaskResponseTypeChoice_type1 implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java index 90d1a6f1e24..5fc37d911d6 100644 --- a/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java +++ b/awsapi/src/com/amazon/ec2/ExportTaskSetResponseType.java @@ -142,7 +142,8 @@ public class ExportTaskSetResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ExportTaskSetResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java index 66ea53ba447..81d57f14626 100644 --- a/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskResponseType.java @@ -187,7 +187,8 @@ public class ExportToS3TaskResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -364,9 +365,8 @@ public class ExportToS3TaskResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java index 87ae4a27606..3c812b8340e 100644 --- a/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java +++ b/awsapi/src/com/amazon/ec2/ExportToS3TaskType.java @@ -201,7 +201,8 @@ public class ExportToS3TaskType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -379,9 +380,8 @@ public class ExportToS3TaskType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ExtensionMapper.java b/awsapi/src/com/amazon/ec2/ExtensionMapper.java index 09c5f70fdf3..ec0e0d30422 100644 --- a/awsapi/src/com/amazon/ec2/ExtensionMapper.java +++ b/awsapi/src/com/amazon/ec2/ExtensionMapper.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ExtensionMapper { - public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception { + public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) + throws java.lang.Exception { if ("http://ec2.amazonaws.com/doc/2012-08-15/".equals(namespaceURI) && "CreateInternetGatewayType".equals(typeName)) { diff --git a/awsapi/src/com/amazon/ec2/FilterSetType.java b/awsapi/src/com/amazon/ec2/FilterSetType.java index f535e5efba4..9e61f605365 100644 --- a/awsapi/src/com/amazon/ec2/FilterSetType.java +++ b/awsapi/src/com/amazon/ec2/FilterSetType.java @@ -142,7 +142,8 @@ public class FilterSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class FilterSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/FilterType.java b/awsapi/src/com/amazon/ec2/FilterType.java index 4c20eb5f04f..6fa04ca67d6 100644 --- a/awsapi/src/com/amazon/ec2/FilterType.java +++ b/awsapi/src/com/amazon/ec2/FilterType.java @@ -125,7 +125,8 @@ public class FilterType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class FilterType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java index ebb53caf8e1..ab7abab62e0 100644 --- a/awsapi/src/com/amazon/ec2/GetConsoleOutput.java +++ b/awsapi/src/com/amazon/ec2/GetConsoleOutput.java @@ -98,7 +98,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class GetConsoleOutput implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) { object.setGetConsoleOutput(com.amazon.ec2.GetConsoleOutputType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java index f3f4a0f5229..4b26b1447d4 100644 --- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java +++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponse.java @@ -98,7 +98,8 @@ public class GetConsoleOutputResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class GetConsoleOutputResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java index 4bb8d31c9a1..86ec6be786d 100644 --- a/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java +++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputResponseType.java @@ -173,7 +173,8 @@ public class GetConsoleOutputResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350,9 +351,8 @@ public class GetConsoleOutputResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java index dfebfa7804f..5bddcbe5803 100644 --- a/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java +++ b/awsapi/src/com/amazon/ec2/GetConsoleOutputType.java @@ -101,7 +101,8 @@ public class GetConsoleOutputType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class GetConsoleOutputType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetPasswordData.java b/awsapi/src/com/amazon/ec2/GetPasswordData.java index cb003e9bfdd..2b6cde3d469 100644 --- a/awsapi/src/com/amazon/ec2/GetPasswordData.java +++ b/awsapi/src/com/amazon/ec2/GetPasswordData.java @@ -98,7 +98,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class GetPasswordData implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) { object.setGetPasswordData(com.amazon.ec2.GetPasswordDataType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java index c53a87ddf09..5784fc9c745 100644 --- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java +++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponse.java @@ -98,7 +98,8 @@ public class GetPasswordDataResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class GetPasswordDataResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java index 185a47d1877..234d1df77ba 100644 --- a/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java +++ b/awsapi/src/com/amazon/ec2/GetPasswordDataResponseType.java @@ -173,7 +173,8 @@ public class GetPasswordDataResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350,9 +351,8 @@ public class GetPasswordDataResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java index 9429c3d5d38..850192b0759 100644 --- a/awsapi/src/com/amazon/ec2/GetPasswordDataType.java +++ b/awsapi/src/com/amazon/ec2/GetPasswordDataType.java @@ -101,7 +101,8 @@ public class GetPasswordDataType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class GetPasswordDataType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GroupItemType.java b/awsapi/src/com/amazon/ec2/GroupItemType.java index b677b2bf285..0930702844f 100644 --- a/awsapi/src/com/amazon/ec2/GroupItemType.java +++ b/awsapi/src/com/amazon/ec2/GroupItemType.java @@ -153,7 +153,8 @@ public class GroupItemType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class GroupItemType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/GroupSetType.java b/awsapi/src/com/amazon/ec2/GroupSetType.java index 5423625f57c..cf4ccaa691e 100644 --- a/awsapi/src/com/amazon/ec2/GroupSetType.java +++ b/awsapi/src/com/amazon/ec2/GroupSetType.java @@ -142,7 +142,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class GroupSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.GroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.GroupItemType.class, list1)); + object.setItem((com.amazon.ec2.GroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.GroupItemType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java index 1de95db7dc6..4655a177704 100644 --- a/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java +++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileRequestType.java @@ -153,7 +153,8 @@ public class IamInstanceProfileRequestType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class IamInstanceProfileRequestType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java index 4d0ce054b59..9df93c5e345 100644 --- a/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java +++ b/awsapi/src/com/amazon/ec2/IamInstanceProfileResponseType.java @@ -125,7 +125,8 @@ public class IamInstanceProfileResponseType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class IamInstanceProfileResponseType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java index 776c32dfbac..818d49b78fa 100644 --- a/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java +++ b/awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java @@ -125,7 +125,8 @@ public class IcmpTypeCodeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232,9 +233,8 @@ public class IcmpTypeCodeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstance.java b/awsapi/src/com/amazon/ec2/ImportInstance.java index 47a0d8bcf5a..45913bd0b9a 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstance.java +++ b/awsapi/src/com/amazon/ec2/ImportInstance.java @@ -98,7 +98,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ImportInstance implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) { object.setImportInstance(com.amazon.ec2.ImportInstanceType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java index e99e53abc17..57172361ad2 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupItemType.java @@ -153,7 +153,8 @@ public class ImportInstanceGroupItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class ImportInstanceGroupItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java index 0b9367bd182..c85a9495a07 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceGroupSetType.java @@ -142,7 +142,8 @@ public class ImportInstanceGroupSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ImportInstanceGroupSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java index 9851c3a3eff..c9621c834f5 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceLaunchSpecificationType.java @@ -391,7 +391,8 @@ public class ImportInstanceLaunchSpecificationType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -625,9 +626,8 @@ public class ImportInstanceLaunchSpecificationType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java index a312c618b3d..a019faee8d5 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponse.java @@ -98,7 +98,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ImportInstanceResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse").equals(reader.getName())) { object.setImportInstanceResponse(com.amazon.ec2.ImportInstanceResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java index 615508b3d31..d7ff0717e7e 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceResponseType.java @@ -125,7 +125,8 @@ public class ImportInstanceResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ImportInstanceResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java index 2603ea9ebaf..2f2e459d763 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceTaskDetailsType.java @@ -215,7 +215,8 @@ public class ImportInstanceTaskDetailsType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -367,9 +368,8 @@ public class ImportInstanceTaskDetailsType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceType.java b/awsapi/src/com/amazon/ec2/ImportInstanceType.java index c0b1c0f0602..2a1d2136400 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceType.java @@ -226,7 +226,8 @@ public class ImportInstanceType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -378,9 +379,8 @@ public class ImportInstanceType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java index 4a8e60a6712..b49440ad9ee 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailItemType.java @@ -273,7 +273,8 @@ public class ImportInstanceVolumeDetailItemType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -489,9 +490,8 @@ public class ImportInstanceVolumeDetailItemType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java index b2471e6500e..c74ca1b4203 100644 --- a/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java +++ b/awsapi/src/com/amazon/ec2/ImportInstanceVolumeDetailSetType.java @@ -142,7 +142,8 @@ public class ImportInstanceVolumeDetailSetType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ImportInstanceVolumeDetailSetType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPair.java b/awsapi/src/com/amazon/ec2/ImportKeyPair.java index 02102d8c6f3..5bf062dcdf0 100644 --- a/awsapi/src/com/amazon/ec2/ImportKeyPair.java +++ b/awsapi/src/com/amazon/ec2/ImportKeyPair.java @@ -98,7 +98,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ImportKeyPair implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) { object.setImportKeyPair(com.amazon.ec2.ImportKeyPairType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java index 49796fd739b..d65d0e62f8d 100644 --- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java +++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponse.java @@ -98,7 +98,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse").equals(reader.getName())) { object.setImportKeyPairResponse(com.amazon.ec2.ImportKeyPairResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java index a0f04127ac0..ff926992a2f 100644 --- a/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java +++ b/awsapi/src/com/amazon/ec2/ImportKeyPairResponseType.java @@ -149,7 +149,8 @@ public class ImportKeyPairResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294,9 +295,8 @@ public class ImportKeyPairResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java index b502928ab5b..16680ce664f 100644 --- a/awsapi/src/com/amazon/ec2/ImportKeyPairType.java +++ b/awsapi/src/com/amazon/ec2/ImportKeyPairType.java @@ -125,7 +125,8 @@ public class ImportKeyPairType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ImportKeyPairType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportVolume.java b/awsapi/src/com/amazon/ec2/ImportVolume.java index faa891988d5..3226225df32 100644 --- a/awsapi/src/com/amazon/ec2/ImportVolume.java +++ b/awsapi/src/com/amazon/ec2/ImportVolume.java @@ -98,7 +98,8 @@ public class ImportVolume implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportVolume implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java index f478220d9b1..68d2b9d2b1d 100644 --- a/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java +++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponse.java @@ -98,7 +98,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ImportVolumeResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolumeResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolumeResponse").equals(reader.getName())) { object.setImportVolumeResponse(com.amazon.ec2.ImportVolumeResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java index 54df28a1310..2b9d9fd779f 100644 --- a/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ImportVolumeResponseType.java @@ -125,7 +125,8 @@ public class ImportVolumeResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ImportVolumeResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java index 60a04cd087b..61fcc6707e4 100644 --- a/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java +++ b/awsapi/src/com/amazon/ec2/ImportVolumeTaskDetailsType.java @@ -211,7 +211,8 @@ public class ImportVolumeTaskDetailsType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -363,9 +364,8 @@ public class ImportVolumeTaskDetailsType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ImportVolumeType.java b/awsapi/src/com/amazon/ec2/ImportVolumeType.java index 219a03ed9ad..4ec5c67955e 100644 --- a/awsapi/src/com/amazon/ec2/ImportVolumeType.java +++ b/awsapi/src/com/amazon/ec2/ImportVolumeType.java @@ -187,7 +187,8 @@ public class ImportVolumeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -310,9 +311,8 @@ public class ImportVolumeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java index 360c16af363..a0190540c1e 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemType.java @@ -125,7 +125,8 @@ public class InstanceBlockDeviceMappingItemType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class InstanceBlockDeviceMappingItemType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java index 04902b070a7..2f6e97131f5 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingItemTypeChoice_type0.java @@ -210,7 +210,8 @@ public class InstanceBlockDeviceMappingItemTypeChoice_type0 implements org.apach } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class InstanceBlockDeviceMappingItemTypeChoice_type0 implements org.apach /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java index c53a3666e7a..ad2339dc670 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemType.java @@ -125,7 +125,8 @@ public class InstanceBlockDeviceMappingResponseItemType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class InstanceBlockDeviceMappingResponseItemType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java index c56ea48bf58..b3511d37c14 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseItemTypeChoice_type0.java @@ -126,7 +126,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -141,7 +142,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter); } @@ -159,9 +161,8 @@ public class InstanceBlockDeviceMappingResponseItemTypeChoice_type0 implements o /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java index 917ec287b99..78c18b29f77 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingResponseType.java @@ -103,7 +103,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2. java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[])list.toArray(new com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[list.size()]); + this.localItem = + (com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[])list.toArray(new com.amazon.ec2.InstanceBlockDeviceMappingResponseItemType[list.size()]); } @@ -142,7 +143,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +210,8 @@ public class InstanceBlockDeviceMappingResponseType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java index e559c03fa83..4af8d6077d8 100644 --- a/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java +++ b/awsapi/src/com/amazon/ec2/InstanceBlockDeviceMappingType.java @@ -142,7 +142,8 @@ public class InstanceBlockDeviceMappingType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceBlockDeviceMappingType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java index 233a7ff8b5c..a2b55055db0 100644 --- a/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetItemType.java @@ -125,7 +125,8 @@ public class InstanceCountsSetItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class InstanceCountsSetItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java index fc8763b26cd..7aa0ecf73a5 100644 --- a/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceCountsSetType.java @@ -129,7 +129,8 @@ public class InstanceCountsSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class InstanceCountsSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java index bb01c856442..029bcf27609 100644 --- a/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java +++ b/awsapi/src/com/amazon/ec2/InstanceEbsBlockDeviceType.java @@ -140,7 +140,8 @@ public class InstanceEbsBlockDeviceType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -250,9 +251,8 @@ public class InstanceEbsBlockDeviceType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java index 7fc0e54a665..54cf7b9c377 100644 --- a/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java +++ b/awsapi/src/com/amazon/ec2/InstanceExportTaskResponseType.java @@ -139,7 +139,8 @@ public class InstanceExportTaskResponseType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -252,9 +253,8 @@ public class InstanceExportTaskResponseType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java index 194e3672d36..6431bbb3096 100644 --- a/awsapi/src/com/amazon/ec2/InstanceIdSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceIdSetType.java @@ -142,7 +142,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class InstanceIdSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.InstanceIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InstanceIdType.class, list1)); + object.setItem((com.amazon.ec2.InstanceIdType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InstanceIdType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/InstanceIdType.java b/awsapi/src/com/amazon/ec2/InstanceIdType.java index c635f5ee2c4..47470c923ea 100644 --- a/awsapi/src/com/amazon/ec2/InstanceIdType.java +++ b/awsapi/src/com/amazon/ec2/InstanceIdType.java @@ -101,7 +101,8 @@ public class InstanceIdType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InstanceIdType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java index d1821810c04..0ecb4d4f976 100644 --- a/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java +++ b/awsapi/src/com/amazon/ec2/InstanceLicenseRequestType.java @@ -101,7 +101,8 @@ public class InstanceLicenseRequestType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InstanceLicenseRequestType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java index a8c25a5ffa4..41cc0cf9ba9 100644 --- a/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java +++ b/awsapi/src/com/amazon/ec2/InstanceLicenseResponseType.java @@ -101,7 +101,8 @@ public class InstanceLicenseResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InstanceLicenseResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java index 907455452f0..ba4b090967f 100644 --- a/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java +++ b/awsapi/src/com/amazon/ec2/InstanceMonitoringStateType.java @@ -101,7 +101,8 @@ public class InstanceMonitoringStateType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InstanceMonitoringStateType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java index 470866b6364..52b0f9b14f3 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAssociationType.java @@ -139,7 +139,8 @@ public class InstanceNetworkInterfaceAssociationType implements org.apache.axis2 } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -252,9 +253,8 @@ public class InstanceNetworkInterfaceAssociationType implements org.apache.axis2 /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java index ad124182b2f..ae5d755ce85 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceAttachmentType.java @@ -197,7 +197,8 @@ public class InstanceNetworkInterfaceAttachmentType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -400,9 +401,8 @@ public class InstanceNetworkInterfaceAttachmentType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java index a485c037269..c21a90d3e1d 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemRequestType.java @@ -407,7 +407,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -687,9 +688,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1072,7 +1072,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.PrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -1087,7 +1088,8 @@ public class InstanceNetworkInterfaceSetItemRequestType implements org.apache.ax while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "secondaryPrivateIpAddressCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java index 6b9d8a46278..e0bfa3ad1cc 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetItemType.java @@ -516,7 +516,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -876,9 +877,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1382,7 +1382,8 @@ public class InstanceNetworkInterfaceSetItemType implements org.apache.axis2.dat while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.InstancePrivateIpAddressesSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java index 720826f87e1..59738e018ad 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetRequestType.java @@ -103,7 +103,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2. java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[])list.toArray(new com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[list.size()]); + this.localItem = + (com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[])list.toArray(new com.amazon.ec2.InstanceNetworkInterfaceSetItemRequestType[list.size()]); } @@ -142,7 +143,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +210,8 @@ public class InstanceNetworkInterfaceSetRequestType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java index 95b93f189a0..8489608cba0 100644 --- a/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceNetworkInterfaceSetType.java @@ -142,7 +142,8 @@ public class InstanceNetworkInterfaceSetType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceNetworkInterfaceSetType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstancePlacementType.java b/awsapi/src/com/amazon/ec2/InstancePlacementType.java index e444bb7ec6e..c7a898b0046 100644 --- a/awsapi/src/com/amazon/ec2/InstancePlacementType.java +++ b/awsapi/src/com/amazon/ec2/InstancePlacementType.java @@ -153,7 +153,8 @@ public class InstancePlacementType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class InstancePlacementType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java index 54d7dbdd955..b5c59419ece 100644 --- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetItemType.java @@ -192,7 +192,8 @@ public class InstancePrivateIpAddressesSetItemType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -309,9 +310,8 @@ public class InstancePrivateIpAddressesSetItemType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java index d908e3eb056..0955393a7ff 100644 --- a/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java +++ b/awsapi/src/com/amazon/ec2/InstancePrivateIpAddressesSetType.java @@ -142,7 +142,8 @@ public class InstancePrivateIpAddressesSetType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstancePrivateIpAddressesSetType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java index 97606b006e6..4ebb42cce5e 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeSetType.java @@ -142,7 +142,8 @@ public class InstanceStateChangeSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceStateChangeSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java index e14835b3169..d6af118ee54 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStateChangeType.java @@ -149,7 +149,8 @@ public class InstanceStateChangeType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -240,9 +241,8 @@ public class InstanceStateChangeType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStateType.java b/awsapi/src/com/amazon/ec2/InstanceStateType.java index d00a6447f0d..3f61bdac9f0 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStateType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStateType.java @@ -125,7 +125,8 @@ public class InstanceStateType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class InstanceStateType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java index d985cfb5fa4..a76dd730d87 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetItemType.java @@ -163,7 +163,8 @@ public class InstanceStatusDetailsSetItemType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -308,9 +309,8 @@ public class InstanceStatusDetailsSetItemType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java index 2455ec635f4..4daa0dc4cf0 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusDetailsSetType.java @@ -142,7 +142,8 @@ public class InstanceStatusDetailsSetType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceStatusDetailsSetType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java index 0d862874379..0c0a8349976 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventType.java @@ -187,7 +187,8 @@ public class InstanceStatusEventType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -364,9 +365,8 @@ public class InstanceStatusEventType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java index a285c7cc2b5..4cb841492e8 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusEventsSetType.java @@ -142,7 +142,8 @@ public class InstanceStatusEventsSetType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceStatusEventsSetType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java index 015a994f33a..c31b90ea0c9 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusItemType.java @@ -235,7 +235,8 @@ public class InstanceStatusItemType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -368,9 +369,8 @@ public class InstanceStatusItemType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java index 23b9116ae68..70c0be6943b 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusSetType.java @@ -142,7 +142,8 @@ public class InstanceStatusSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InstanceStatusSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceStatusType.java b/awsapi/src/com/amazon/ec2/InstanceStatusType.java index c4fb882f560..269c5569d97 100644 --- a/awsapi/src/com/amazon/ec2/InstanceStatusType.java +++ b/awsapi/src/com/amazon/ec2/InstanceStatusType.java @@ -139,7 +139,8 @@ public class InstanceStatusType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -225,9 +226,8 @@ public class InstanceStatusType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java index 8544323be8e..241873240eb 100644 --- a/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetItemType.java @@ -101,7 +101,8 @@ public class InstanceTypeSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InstanceTypeSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java index 93174bcce7e..5512a55b45c 100644 --- a/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java +++ b/awsapi/src/com/amazon/ec2/InstanceTypeSetType.java @@ -129,7 +129,8 @@ public class InstanceTypeSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class InstanceTypeSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java index 8c00f6895fd..70c41167364 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentSetType.java @@ -142,7 +142,8 @@ public class InternetGatewayAttachmentSetType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InternetGatewayAttachmentSetType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java index 0ce1666576c..fbdecca8413 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewayAttachmentType.java @@ -125,7 +125,8 @@ public class InternetGatewayAttachmentType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class InternetGatewayAttachmentType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java index 963fcc695bf..04f2e58ee7f 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetItemType.java @@ -101,7 +101,8 @@ public class InternetGatewayIdSetItemType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class InternetGatewayIdSetItemType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java index c63f7d51f00..0b38ad2e6a8 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewayIdSetType.java @@ -142,7 +142,8 @@ public class InternetGatewayIdSetType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InternetGatewayIdSetType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java index 1594382c4c5..cc5941ea770 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewaySetType.java @@ -142,7 +142,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class InternetGatewaySetType implements org.apache.axis2.databinding.ADBB } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.InternetGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.InternetGatewayType.class, - list1)); + object.setItem((com.amazon.ec2.InternetGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.InternetGatewayType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/InternetGatewayType.java b/awsapi/src/com/amazon/ec2/InternetGatewayType.java index 01e83b2e079..b371f899b24 100644 --- a/awsapi/src/com/amazon/ec2/InternetGatewayType.java +++ b/awsapi/src/com/amazon/ec2/InternetGatewayType.java @@ -163,7 +163,8 @@ public class InternetGatewayType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254,9 +255,8 @@ public class InternetGatewayType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java index 3a166e6ca37..685c8cfffb2 100644 --- a/awsapi/src/com/amazon/ec2/IpPermissionSetType.java +++ b/awsapi/src/com/amazon/ec2/IpPermissionSetType.java @@ -142,7 +142,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class IpPermissionSetType implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.IpPermissionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.IpPermissionType.class, list1)); + object.setItem((com.amazon.ec2.IpPermissionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.IpPermissionType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/IpPermissionType.java b/awsapi/src/com/amazon/ec2/IpPermissionType.java index 204dedc4bee..08fc442238a 100644 --- a/awsapi/src/com/amazon/ec2/IpPermissionType.java +++ b/awsapi/src/com/amazon/ec2/IpPermissionType.java @@ -227,7 +227,8 @@ public class IpPermissionType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -377,9 +378,8 @@ public class IpPermissionType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/IpRangeItemType.java b/awsapi/src/com/amazon/ec2/IpRangeItemType.java index 99f25dadcfb..e63b6b3dc42 100644 --- a/awsapi/src/com/amazon/ec2/IpRangeItemType.java +++ b/awsapi/src/com/amazon/ec2/IpRangeItemType.java @@ -101,7 +101,8 @@ public class IpRangeItemType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class IpRangeItemType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/IpRangeSetType.java b/awsapi/src/com/amazon/ec2/IpRangeSetType.java index d4a363f53d6..53896ebe16b 100644 --- a/awsapi/src/com/amazon/ec2/IpRangeSetType.java +++ b/awsapi/src/com/amazon/ec2/IpRangeSetType.java @@ -142,7 +142,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class IpRangeSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.IpRangeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.IpRangeItemType.class, list1)); + object.setItem((com.amazon.ec2.IpRangeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.IpRangeItemType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java index 4c9dd3215e3..8e4d8af1abc 100644 --- a/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java +++ b/awsapi/src/com/amazon/ec2/LaunchPermissionItemType.java @@ -168,7 +168,8 @@ public class LaunchPermissionItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282,9 +283,8 @@ public class LaunchPermissionItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java index 5647ad7dc7f..8e16ce735e2 100644 --- a/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java +++ b/awsapi/src/com/amazon/ec2/LaunchPermissionListType.java @@ -142,7 +142,8 @@ public class LaunchPermissionListType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class LaunchPermissionListType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java index 17b93ec021f..7df1eafcdbd 100644 --- a/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java +++ b/awsapi/src/com/amazon/ec2/LaunchPermissionOperationType.java @@ -168,7 +168,8 @@ public class LaunchPermissionOperationType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -228,9 +229,8 @@ public class LaunchPermissionOperationType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java index 18438cd6930..dccdb631675 100644 --- a/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java +++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationRequestType.java @@ -606,7 +606,8 @@ public class LaunchSpecificationRequestType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -952,9 +953,8 @@ public class LaunchSpecificationRequestType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java index 9bdf4fbd6ad..c5f1caf5860 100644 --- a/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java +++ b/awsapi/src/com/amazon/ec2/LaunchSpecificationResponseType.java @@ -568,7 +568,8 @@ public class LaunchSpecificationResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -908,9 +909,8 @@ public class LaunchSpecificationResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java index 8992da26229..6261a3a6879 100644 --- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java +++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetItemType.java @@ -187,7 +187,8 @@ public class LicenseCapacitySetItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -358,9 +359,8 @@ public class LicenseCapacitySetItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java index 4ea2ef1b2c2..78951bfb85c 100644 --- a/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java +++ b/awsapi/src/com/amazon/ec2/LicenseCapacitySetType.java @@ -142,7 +142,8 @@ public class LicenseCapacitySetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class LicenseCapacitySetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java index 75d4b317807..78bfd108be0 100644 --- a/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/LicenseIdSetItemType.java @@ -101,7 +101,8 @@ public class LicenseIdSetItemType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class LicenseIdSetItemType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java index 4c60efdcee8..089c8e7ec6d 100644 --- a/awsapi/src/com/amazon/ec2/LicenseIdSetType.java +++ b/awsapi/src/com/amazon/ec2/LicenseIdSetType.java @@ -142,7 +142,8 @@ public class LicenseIdSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class LicenseIdSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java index 1e5fca4a235..59d2bc7cbbb 100644 --- a/awsapi/src/com/amazon/ec2/LicenseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/LicenseSetItemType.java @@ -211,7 +211,8 @@ public class LicenseSetItemType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -366,9 +367,8 @@ public class LicenseSetItemType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/LicenseSetType.java b/awsapi/src/com/amazon/ec2/LicenseSetType.java index 1cf864de656..2fe88eaa09a 100644 --- a/awsapi/src/com/amazon/ec2/LicenseSetType.java +++ b/awsapi/src/com/amazon/ec2/LicenseSetType.java @@ -142,7 +142,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class LicenseSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.LicenseSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.LicenseSetItemType.class, - list1)); + object.setItem((com.amazon.ec2.LicenseSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.LicenseSetItemType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java index abb4d0a1ef7..d812a4fdda5 100644 --- a/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java +++ b/awsapi/src/com/amazon/ec2/ModifyImageAttribute.java @@ -98,7 +98,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ModifyImageAttribute implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttribute").equals(reader.getName())) { object.setModifyImageAttribute(com.amazon.ec2.ModifyImageAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java index 172e28b6a66..3daabebfacb 100644 --- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ModifyImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ModifyImageAttributeResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ModifyImageAttributeResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java index d650982a8c2..3c6ce9150e6 100644 --- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeResponseType.java @@ -125,7 +125,8 @@ public class ModifyImageAttributeResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifyImageAttributeResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java index 495fac7e4ca..e7fad024c29 100644 --- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeType.java @@ -125,7 +125,8 @@ public class ModifyImageAttributeType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ModifyImageAttributeType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java index ee4a2518445..0bff53a348d 100644 --- a/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ModifyImageAttributeTypeChoice_type0.java @@ -210,7 +210,8 @@ public class ModifyImageAttributeTypeChoice_type0 implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -255,9 +256,8 @@ public class ModifyImageAttributeTypeChoice_type0 implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java index ca9cc280efb..b1cf91d475e 100644 --- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java +++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttribute.java @@ -98,7 +98,8 @@ public class ModifyInstanceAttribute implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ModifyInstanceAttribute implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java index 31f456cda6f..c4b7b473d91 100644 --- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ModifyInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ModifyInstanceAttributeResponse implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ModifyInstanceAttributeResponse implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java index f36513a7244..410f958c3ac 100644 --- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeResponseType.java @@ -125,7 +125,8 @@ public class ModifyInstanceAttributeResponseType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifyInstanceAttributeResponseType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java index b81a325fe45..775b3516fd4 100644 --- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeType.java @@ -125,7 +125,8 @@ public class ModifyInstanceAttributeType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ModifyInstanceAttributeType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java index 03a411675c5..a8bcab9f5dc 100644 --- a/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ModifyInstanceAttributeTypeChoice_type0.java @@ -504,7 +504,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2 } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -559,8 +560,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2 if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localBlockDeviceMappingTracker) { if (localBlockDeviceMapping == null) { @@ -592,9 +593,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2 /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -888,7 +888,8 @@ public class ModifyInstanceAttributeTypeChoice_type0 implements org.apache.axis2 else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(com.amazon.ec2.AttributeBooleanValueType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java index 72f0010ca53..e348c40d793 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttachmentType.java @@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttachmentType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifyNetworkInterfaceAttachmentType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java index 3c0f6d9c799..76e7e2ef25f 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttribute.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java index 0967ba8830d..e7cb1129857 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttributeResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifyNetworkInterfaceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2 } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class ModifyNetworkInterfaceAttributeResponse implements org.apache.axis2 /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java index 8748654f7be..65af5bf808a 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeResponseType.java @@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttributeResponseType implements org.apache.a } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifyNetworkInterfaceAttributeResponseType implements org.apache.a /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java index 05f3b0f1531..0057f6ba633 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeType.java @@ -125,7 +125,8 @@ public class ModifyNetworkInterfaceAttributeType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ModifyNetworkInterfaceAttributeType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java index 4c60d652764..2f8e91a2fb9 100644 --- a/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ModifyNetworkInterfaceAttributeTypeChoice_type0.java @@ -252,7 +252,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,7 +268,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter); } @@ -303,9 +305,8 @@ public class ModifyNetworkInterfaceAttributeTypeChoice_type0 implements org.apac /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java index c592f81db73..9d1eb3bb51a 100644 --- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java +++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttribute.java @@ -98,7 +98,8 @@ public class ModifySnapshotAttribute implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ModifySnapshotAttribute implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java index 962953e8495..cd292146dc6 100644 --- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ModifySnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ModifySnapshotAttributeResponse implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ModifySnapshotAttributeResponse implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java index 07beae9acc5..2df2d54a5ea 100644 --- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeResponseType.java @@ -125,7 +125,8 @@ public class ModifySnapshotAttributeResponseType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifySnapshotAttributeResponseType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java index 7719fad6aef..64674c83f3d 100644 --- a/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ModifySnapshotAttributeType.java @@ -125,7 +125,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class ModifySnapshotAttributeType implements org.apache.axis2.databinding while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(com.amazon.ec2.CreateVolumePermissionOperationType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java index 4fb43ce695a..5e3f2258b46 100644 --- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java +++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttribute.java @@ -98,7 +98,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute").equals(reader.getName())) { object.setModifyVolumeAttribute(com.amazon.ec2.ModifyVolumeAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java index 49330473b17..c5b7ae7d75b 100644 --- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ModifyVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ModifyVolumeAttributeResponse implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ModifyVolumeAttributeResponse implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java index ddac0784205..a1908942120 100644 --- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeResponseType.java @@ -125,7 +125,8 @@ public class ModifyVolumeAttributeResponseType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ModifyVolumeAttributeResponseType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java index 5b8076e66f1..8fac1a6a217 100644 --- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeType.java @@ -125,7 +125,8 @@ public class ModifyVolumeAttributeType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ModifyVolumeAttributeType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java index 6060c9aab0b..e37999a70c8 100644 --- a/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ModifyVolumeAttributeTypeChoice_type0.java @@ -126,7 +126,8 @@ public class ModifyVolumeAttributeTypeChoice_type0 implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ModifyVolumeAttributeTypeChoice_type0 implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstances.java b/awsapi/src/com/amazon/ec2/MonitorInstances.java index 0b4d461f81a..722d39fd20e 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstances.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstances.java @@ -98,7 +98,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class MonitorInstances implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) { object.setMonitorInstances(com.amazon.ec2.MonitorInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java index 82d81cd8f6b..4bf298c8e57 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponse.java @@ -98,7 +98,8 @@ public class MonitorInstancesResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class MonitorInstancesResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java index 44e52cb4f9b..49135423b99 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetItemType.java @@ -125,7 +125,8 @@ public class MonitorInstancesResponseSetItemType implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class MonitorInstancesResponseSetItemType implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java index 3bc01adbb0e..83335b95259 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseSetType.java @@ -129,7 +129,8 @@ public class MonitorInstancesResponseSetType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class MonitorInstancesResponseSetType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java index 5aef8bcd408..ac13a8209d4 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesResponseType.java @@ -125,7 +125,8 @@ public class MonitorInstancesResponseType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class MonitorInstancesResponseType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java index 5e27342e3ad..af3bf356e38 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetItemType.java @@ -101,7 +101,8 @@ public class MonitorInstancesSetItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class MonitorInstancesSetItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java index 6dee688baf5..048e644cc6a 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesSetType.java @@ -129,7 +129,8 @@ public class MonitorInstancesSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class MonitorInstancesSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java index 1cd78d2539f..0de955760f8 100644 --- a/awsapi/src/com/amazon/ec2/MonitorInstancesType.java +++ b/awsapi/src/com/amazon/ec2/MonitorInstancesType.java @@ -101,7 +101,8 @@ public class MonitorInstancesType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class MonitorInstancesType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java index 146bd16b577..65416e1704a 100644 --- a/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java +++ b/awsapi/src/com/amazon/ec2/MonitoringInstanceType.java @@ -116,7 +116,8 @@ public class MonitoringInstanceType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194,9 +195,8 @@ public class MonitoringInstanceType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java index af476889099..fd70c1ea4d5 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationSetType.java @@ -142,7 +142,8 @@ public class NetworkAclAssociationSetType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkAclAssociationSetType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java index 08510c08bb9..05b36b7a186 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclAssociationType.java @@ -149,7 +149,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294,9 +295,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -519,7 +519,8 @@ public class NetworkAclAssociationType implements org.apache.axis2.databinding.A while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java index 4b542f6b803..da1e80e0ab8 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclEntrySetType.java @@ -142,7 +142,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class NetworkAclEntrySetType implements org.apache.axis2.databinding.ADBB } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.NetworkAclEntryType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclEntryType.class, - list1)); + object.setItem((com.amazon.ec2.NetworkAclEntryType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.NetworkAclEntryType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java index e8ab453f0da..70791bac3ca 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclEntryType.java @@ -273,7 +273,8 @@ public class NetworkAclEntryType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -487,9 +488,8 @@ public class NetworkAclEntryType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java index 073868e5453..d3bcbeb12e9 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetItemType.java @@ -101,7 +101,8 @@ public class NetworkAclIdSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class NetworkAclIdSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java index 8f0da0af77a..01259edf6fa 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclIdSetType.java @@ -142,7 +142,8 @@ public class NetworkAclIdSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkAclIdSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java index 0a1290aa5e1..279170ee061 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclSetType.java @@ -142,7 +142,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class NetworkAclSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.NetworkAclType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclType.class, list1)); + object.setItem((com.amazon.ec2.NetworkAclType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.NetworkAclType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/NetworkAclType.java b/awsapi/src/com/amazon/ec2/NetworkAclType.java index c1be8bbae56..c28533429ce 100644 --- a/awsapi/src/com/amazon/ec2/NetworkAclType.java +++ b/awsapi/src/com/amazon/ec2/NetworkAclType.java @@ -235,7 +235,8 @@ public class NetworkAclType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -392,9 +393,8 @@ public class NetworkAclType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java index 911aa79acfa..4dd2c63ad1d 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAssociationType.java @@ -215,7 +215,8 @@ public class NetworkInterfaceAssociationType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -394,9 +395,8 @@ public class NetworkInterfaceAssociationType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java index aec203a08b1..1387ce87075 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceAttachmentType.java @@ -273,7 +273,8 @@ public class NetworkInterfaceAttachmentType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -541,9 +542,8 @@ public class NetworkInterfaceAttachmentType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java index 76b0fb643f0..c07dd5bc6f9 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetItemType.java @@ -101,7 +101,8 @@ public class NetworkInterfaceIdSetItemType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class NetworkInterfaceIdSetItemType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java index a9e251252a9..554cb7c060e 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceIdSetType.java @@ -142,7 +142,8 @@ public class NetworkInterfaceIdSetType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkInterfaceIdSetType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java index 51c6868872d..2c08bcd92bc 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetItemType.java @@ -163,7 +163,8 @@ public class NetworkInterfacePrivateIpAddressesSetItemType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -278,9 +279,8 @@ public class NetworkInterfacePrivateIpAddressesSetItemType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java index 32b2f455376..b539a56c946 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfacePrivateIpAddressesSetType.java @@ -103,7 +103,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[])list.toArray(new com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[])list.toArray(new com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetItemType[list.size()]); } @@ -142,7 +143,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +210,8 @@ public class NetworkInterfacePrivateIpAddressesSetType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java index 3f99200c892..c580476ddc5 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceSetType.java @@ -142,7 +142,8 @@ public class NetworkInterfaceSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class NetworkInterfaceSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java index bd80c981dac..d922f2ad080 100644 --- a/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java +++ b/awsapi/src/com/amazon/ec2/NetworkInterfaceType.java @@ -664,7 +664,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1155,9 +1156,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1783,7 +1783,8 @@ public class NetworkInterfaceType implements org.apache.axis2.databinding.ADBBea while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.NetworkInterfacePrivateIpAddressesSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java index 5ced7e03aa0..c751a804c31 100644 --- a/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java +++ b/awsapi/src/com/amazon/ec2/NullableAttributeBooleanValueType.java @@ -116,7 +116,8 @@ public class NullableAttributeBooleanValueType implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194,9 +195,8 @@ public class NullableAttributeBooleanValueType implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java index e1c8a5c1020..76dae7dfcd4 100644 --- a/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java +++ b/awsapi/src/com/amazon/ec2/NullableAttributeValueType.java @@ -115,7 +115,8 @@ public class NullableAttributeValueType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -196,9 +197,8 @@ public class NullableAttributeValueType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java index 12e25890cc9..3886c9c9ad9 100644 --- a/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java +++ b/awsapi/src/com/amazon/ec2/PlacementGroupInfoType.java @@ -149,7 +149,8 @@ public class PlacementGroupInfoType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294,9 +295,8 @@ public class PlacementGroupInfoType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java index aa299dc3fb0..47cf29fc91a 100644 --- a/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java +++ b/awsapi/src/com/amazon/ec2/PlacementGroupSetType.java @@ -142,7 +142,8 @@ public class PlacementGroupSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class PlacementGroupSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PlacementRequestType.java b/awsapi/src/com/amazon/ec2/PlacementRequestType.java index 4b733288408..e94f10b4a7e 100644 --- a/awsapi/src/com/amazon/ec2/PlacementRequestType.java +++ b/awsapi/src/com/amazon/ec2/PlacementRequestType.java @@ -191,7 +191,8 @@ public class PlacementRequestType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -338,9 +339,8 @@ public class PlacementRequestType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PlacementResponseType.java b/awsapi/src/com/amazon/ec2/PlacementResponseType.java index ad4cf00418b..4838eac2177 100644 --- a/awsapi/src/com/amazon/ec2/PlacementResponseType.java +++ b/awsapi/src/com/amazon/ec2/PlacementResponseType.java @@ -177,7 +177,8 @@ public class PlacementResponseType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -323,9 +324,8 @@ public class PlacementResponseType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PortRangeType.java b/awsapi/src/com/amazon/ec2/PortRangeType.java index 4c7c80c354f..8d674b72219 100644 --- a/awsapi/src/com/amazon/ec2/PortRangeType.java +++ b/awsapi/src/com/amazon/ec2/PortRangeType.java @@ -125,7 +125,8 @@ public class PortRangeType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232,9 +233,8 @@ public class PortRangeType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java index 9b6e33f7fc6..9b6bd9ae7da 100644 --- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java +++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetItemType.java @@ -163,7 +163,8 @@ public class PriceScheduleRequestSetItemType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -302,9 +303,8 @@ public class PriceScheduleRequestSetItemType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java index b52b8fc2fb9..50b26e64d04 100644 --- a/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java +++ b/awsapi/src/com/amazon/ec2/PriceScheduleRequestSetType.java @@ -129,7 +129,8 @@ public class PriceScheduleRequestSetType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class PriceScheduleRequestSetType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java index 21d60ae36ed..3e55b679662 100644 --- a/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java +++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetItemType.java @@ -187,7 +187,8 @@ public class PriceScheduleSetItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -355,9 +356,8 @@ public class PriceScheduleSetItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java index 7abae96e5ec..dd39b75f7ad 100644 --- a/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java +++ b/awsapi/src/com/amazon/ec2/PriceScheduleSetType.java @@ -142,7 +142,8 @@ public class PriceScheduleSetType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class PriceScheduleSetType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java index 99096d23ad7..26f38ef1e78 100644 --- a/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java +++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetItemType.java @@ -125,7 +125,8 @@ public class PricingDetailsSetItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232,9 +233,8 @@ public class PricingDetailsSetItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java index 772bcb0dfa4..9a6f4da974c 100644 --- a/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java +++ b/awsapi/src/com/amazon/ec2/PricingDetailsSetType.java @@ -142,7 +142,8 @@ public class PricingDetailsSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class PricingDetailsSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java index 18fbb6adb8f..1cb1a01d08f 100644 --- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java +++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetItemRequestType.java @@ -140,7 +140,8 @@ public class PrivateIpAddressesSetItemRequestType implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -250,9 +251,8 @@ public class PrivateIpAddressesSetItemRequestType implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java index bc5ca5b661b..b9089c04666 100644 --- a/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java +++ b/awsapi/src/com/amazon/ec2/PrivateIpAddressesSetRequestType.java @@ -142,7 +142,8 @@ public class PrivateIpAddressesSetRequestType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class PrivateIpAddressesSetRequestType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java index 8c109312849..1ade26a434c 100644 --- a/awsapi/src/com/amazon/ec2/ProductCodeItemType.java +++ b/awsapi/src/com/amazon/ec2/ProductCodeItemType.java @@ -101,7 +101,8 @@ public class ProductCodeItemType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ProductCodeItemType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ProductCodeListType.java b/awsapi/src/com/amazon/ec2/ProductCodeListType.java index 114d1c5028b..4e739420aba 100644 --- a/awsapi/src/com/amazon/ec2/ProductCodeListType.java +++ b/awsapi/src/com/amazon/ec2/ProductCodeListType.java @@ -142,7 +142,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class ProductCodeListType implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.ProductCodeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ProductCodeItemType.class, - list1)); + object.setItem((com.amazon.ec2.ProductCodeItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.ProductCodeItemType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java index e9d50b637c4..af861dbe17a 100644 --- a/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/ProductCodesSetItemType.java @@ -125,7 +125,8 @@ public class ProductCodesSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ProductCodesSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java index 56e5d6c0ad4..00a979c9f42 100644 --- a/awsapi/src/com/amazon/ec2/ProductCodesSetType.java +++ b/awsapi/src/com/amazon/ec2/ProductCodesSetType.java @@ -142,7 +142,8 @@ public class ProductCodesSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ProductCodesSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java index bcafb13db44..8de6400f0a1 100644 --- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java +++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetItemType.java @@ -101,7 +101,8 @@ public class ProductDescriptionSetItemType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ProductDescriptionSetItemType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java index f61b22a03c3..4c9e5ea71ce 100644 --- a/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java +++ b/awsapi/src/com/amazon/ec2/ProductDescriptionSetType.java @@ -129,7 +129,8 @@ public class ProductDescriptionSetType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class ProductDescriptionSetType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java index 2ee413660e1..0fe3e5e1086 100644 --- a/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java +++ b/awsapi/src/com/amazon/ec2/PropagatingVgwSetType.java @@ -142,7 +142,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class PropagatingVgwSetType implements org.apache.axis2.databinding.ADBBe } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.PropagatingVgwType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.PropagatingVgwType.class, - list1)); + object.setItem((com.amazon.ec2.PropagatingVgwType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.PropagatingVgwType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java index 598034c5ee9..60246b3d72c 100644 --- a/awsapi/src/com/amazon/ec2/PropagatingVgwType.java +++ b/awsapi/src/com/amazon/ec2/PropagatingVgwType.java @@ -101,7 +101,8 @@ public class PropagatingVgwType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class PropagatingVgwType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java index 006b6ef7360..03fddd8bb74 100644 --- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java +++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOffering.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class PurchaseReservedInstancesOffering implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "PurchaseReservedInstancesOffering", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "PurchaseReservedInstancesOffering", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class PurchaseReservedInstancesOffering implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class PurchaseReservedInstancesOffering implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java index 49c0850672c..930ea83530e 100644 --- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java +++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class PurchaseReservedInstancesOfferingResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "PurchaseReservedInstancesOfferingResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "PurchaseReservedInstancesOfferingResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class PurchaseReservedInstancesOfferingResponse implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class PurchaseReservedInstancesOfferingResponse implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java index 68db5b7b559..86f7ce70b4d 100644 --- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java +++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingResponseType.java @@ -125,7 +125,8 @@ public class PurchaseReservedInstancesOfferingResponseType implements org.apache } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class PurchaseReservedInstancesOfferingResponseType implements org.apache /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java index 9d8efa9eb1c..92dc4983e08 100644 --- a/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java +++ b/awsapi/src/com/amazon/ec2/PurchaseReservedInstancesOfferingType.java @@ -163,7 +163,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -278,9 +279,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -499,7 +499,8 @@ public class PurchaseReservedInstancesOfferingType implements org.apache.axis2.d while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/RebootInstances.java b/awsapi/src/com/amazon/ec2/RebootInstances.java index 1739606f429..212f2e4a8d1 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstances.java +++ b/awsapi/src/com/amazon/ec2/RebootInstances.java @@ -98,7 +98,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class RebootInstances implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) { object.setRebootInstances(com.amazon.ec2.RebootInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java index b212ce0aa13..179dad274e0 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java +++ b/awsapi/src/com/amazon/ec2/RebootInstancesInfoType.java @@ -129,7 +129,8 @@ public class RebootInstancesInfoType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class RebootInstancesInfoType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java index 672f507882f..2e03b799c57 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java +++ b/awsapi/src/com/amazon/ec2/RebootInstancesItemType.java @@ -101,7 +101,8 @@ public class RebootInstancesItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class RebootInstancesItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java index 0a6e784f87d..cb785c20d98 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponse.java @@ -98,7 +98,8 @@ public class RebootInstancesResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RebootInstancesResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java index 138f1a76967..91d7dd1e4d2 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/RebootInstancesResponseType.java @@ -125,7 +125,8 @@ public class RebootInstancesResponseType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class RebootInstancesResponseType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RebootInstancesType.java b/awsapi/src/com/amazon/ec2/RebootInstancesType.java index 83ecc0ef870..3fffc33ce93 100644 --- a/awsapi/src/com/amazon/ec2/RebootInstancesType.java +++ b/awsapi/src/com/amazon/ec2/RebootInstancesType.java @@ -101,7 +101,8 @@ public class RebootInstancesType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class RebootInstancesType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java index f0a91729da8..ddf235297f3 100644 --- a/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java +++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetItemType.java @@ -125,7 +125,8 @@ public class RecurringChargesSetItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class RecurringChargesSetItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java index 1b94767f9a2..d362547e411 100644 --- a/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java +++ b/awsapi/src/com/amazon/ec2/RecurringChargesSetType.java @@ -142,7 +142,8 @@ public class RecurringChargesSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RecurringChargesSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RegionItemType.java b/awsapi/src/com/amazon/ec2/RegionItemType.java index bcd6acefa57..dad953d8f4a 100644 --- a/awsapi/src/com/amazon/ec2/RegionItemType.java +++ b/awsapi/src/com/amazon/ec2/RegionItemType.java @@ -125,7 +125,8 @@ public class RegionItemType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class RegionItemType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RegionSetType.java b/awsapi/src/com/amazon/ec2/RegionSetType.java index d6a8e5e7649..d6e383bb904 100644 --- a/awsapi/src/com/amazon/ec2/RegionSetType.java +++ b/awsapi/src/com/amazon/ec2/RegionSetType.java @@ -142,7 +142,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class RegionSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.RegionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RegionItemType.class, list1)); + object.setItem((com.amazon.ec2.RegionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RegionItemType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/RegisterImage.java b/awsapi/src/com/amazon/ec2/RegisterImage.java index 0146be154f4..9e4438ac3f8 100644 --- a/awsapi/src/com/amazon/ec2/RegisterImage.java +++ b/awsapi/src/com/amazon/ec2/RegisterImage.java @@ -98,7 +98,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class RegisterImage implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) { object.setRegisterImage(com.amazon.ec2.RegisterImageType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java index 7ec9966734a..4028c3df0fd 100644 --- a/awsapi/src/com/amazon/ec2/RegisterImageResponse.java +++ b/awsapi/src/com/amazon/ec2/RegisterImageResponse.java @@ -98,7 +98,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class RegisterImageResponse implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse").equals(reader.getName())) { object.setRegisterImageResponse(com.amazon.ec2.RegisterImageResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java index 6771765bace..6a592f08e92 100644 --- a/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java +++ b/awsapi/src/com/amazon/ec2/RegisterImageResponseType.java @@ -125,7 +125,8 @@ public class RegisterImageResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class RegisterImageResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RegisterImageType.java b/awsapi/src/com/amazon/ec2/RegisterImageType.java index a9145b41bc8..c60ba574846 100644 --- a/awsapi/src/com/amazon/ec2/RegisterImageType.java +++ b/awsapi/src/com/amazon/ec2/RegisterImageType.java @@ -367,7 +367,8 @@ public class RegisterImageType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -650,9 +651,8 @@ public class RegisterImageType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddress.java b/awsapi/src/com/amazon/ec2/ReleaseAddress.java index cf70019482d..395cbf4cabd 100644 --- a/awsapi/src/com/amazon/ec2/ReleaseAddress.java +++ b/awsapi/src/com/amazon/ec2/ReleaseAddress.java @@ -98,7 +98,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ReleaseAddress implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) { object.setReleaseAddress(com.amazon.ec2.ReleaseAddressType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java index 2418e39473f..5c3eccff51c 100644 --- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java +++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponse.java @@ -98,7 +98,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse").equals(reader.getName())) { object.setReleaseAddressResponse(com.amazon.ec2.ReleaseAddressResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java index 2f78607e789..683da67a659 100644 --- a/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReleaseAddressResponseType.java @@ -125,7 +125,8 @@ public class ReleaseAddressResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ReleaseAddressResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java index 62511ffb2b3..2576cdd5f9d 100644 --- a/awsapi/src/com/amazon/ec2/ReleaseAddressType.java +++ b/awsapi/src/com/amazon/ec2/ReleaseAddressType.java @@ -101,7 +101,8 @@ public class ReleaseAddressType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class ReleaseAddressType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java index eca6c31871b..91edd24a73d 100644 --- a/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ReleaseAddressTypeChoice_type0.java @@ -168,7 +168,8 @@ public class ReleaseAddressTypeChoice_type0 implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261,9 +262,8 @@ public class ReleaseAddressTypeChoice_type0 implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java index cff3076180c..52906aa6f9e 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociation.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ReplaceNetworkAclAssociation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociation", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ReplaceNetworkAclAssociation implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ReplaceNetworkAclAssociation implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java index 0ad992c0fb1..c688c9a7ef9 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceNetworkAclAssociationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java index 99bb8824fc3..cf7f6b94cf5 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationResponseType.java @@ -125,7 +125,8 @@ public class ReplaceNetworkAclAssociationResponseType implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ReplaceNetworkAclAssociationResponseType implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java index 5d89632e9fd..3d1a26a78ea 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclAssociationType.java @@ -125,7 +125,8 @@ public class ReplaceNetworkAclAssociationType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ReplaceNetworkAclAssociationType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java index aae8849d1bc..5bd77c3d0e8 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntry.java @@ -98,7 +98,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry").equals(reader.getName())) { object.setReplaceNetworkAclEntry(com.amazon.ec2.ReplaceNetworkAclEntryType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java index 1abb8028c1b..8cfc393881d 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntryResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java index 78d31e40e9e..49a00a2bb1b 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryResponseType.java @@ -125,7 +125,8 @@ public class ReplaceNetworkAclEntryResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ReplaceNetworkAclEntryResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java index 3a553e16ed0..76df8b0ffa0 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceNetworkAclEntryType.java @@ -297,7 +297,8 @@ public class ReplaceNetworkAclEntryType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -543,9 +544,8 @@ public class ReplaceNetworkAclEntryType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRoute.java b/awsapi/src/com/amazon/ec2/ReplaceRoute.java index cd189a98159..c05e298fcc5 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRoute.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRoute.java @@ -98,7 +98,8 @@ public class ReplaceRoute implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReplaceRoute implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java index b352570f2bb..4874a8d760f 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponse.java @@ -98,7 +98,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ReplaceRouteResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteResponse").equals(reader.getName())) { object.setReplaceRouteResponse(com.amazon.ec2.ReplaceRouteResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java index e5d0fa116e8..ecddad2fbbe 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteResponseType.java @@ -125,7 +125,8 @@ public class ReplaceRouteResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ReplaceRouteResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java index 8f6112661c5..e932fdddea6 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociation.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ReplaceRouteTableAssociation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociation", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ReplaceRouteTableAssociation implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ReplaceRouteTableAssociation implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java index ebe56443105..02d455f7377 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceRouteTableAssociationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class ReplaceRouteTableAssociationResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java index b18b221873f..d93bd1095d8 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationResponseType.java @@ -125,7 +125,8 @@ public class ReplaceRouteTableAssociationResponseType implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ReplaceRouteTableAssociationResponseType implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java index e2e005bf481..b4063123409 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTableAssociationType.java @@ -125,7 +125,8 @@ public class ReplaceRouteTableAssociationType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ReplaceRouteTableAssociationType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java index 3e4c3143680..086b7f11976 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteType.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteType.java @@ -149,7 +149,8 @@ public class ReplaceRouteType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class ReplaceRouteType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java index cfaf6aa70a3..aced731d137 100644 --- a/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ReplaceRouteTypeChoice_type0.java @@ -210,7 +210,8 @@ public class ReplaceRouteTypeChoice_type0 implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -336,9 +337,8 @@ public class ReplaceRouteTypeChoice_type0 implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java index 1df861b5f54..e2f858cbcb4 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatus.java @@ -98,7 +98,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ReportInstanceStatus implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatus").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatus").equals(reader.getName())) { object.setReportInstanceStatus(com.amazon.ec2.ReportInstanceStatusType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java index 05aaaf56c66..cdf8dad0c01 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodeSetItemType.java @@ -101,7 +101,8 @@ public class ReportInstanceStatusReasonCodeSetItemType implements org.apache.axi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ReportInstanceStatusReasonCodeSetItemType implements org.apache.axi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java index 982a00fa124..0e68860a805 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusReasonCodesSetType.java @@ -90,7 +90,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2. java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[])list.toArray(new com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[list.size()]); + this.localItem = + (com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[])list.toArray(new com.amazon.ec2.ReportInstanceStatusReasonCodeSetItemType[list.size()]); } @@ -129,7 +130,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +197,8 @@ public class ReportInstanceStatusReasonCodesSetType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java index 73016fe491f..cc6ce8c49c0 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ReportInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatusResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ReportInstanceStatusResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ReportInstanceStatusResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java index c4d3a5b6cba..d7f3304a1b6 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusResponseType.java @@ -125,7 +125,8 @@ public class ReportInstanceStatusResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ReportInstanceStatusResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java index 95ed41f6b53..3390ff41ae2 100644 --- a/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java +++ b/awsapi/src/com/amazon/ec2/ReportInstanceStatusType.java @@ -263,7 +263,8 @@ public class ReportInstanceStatusType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -451,9 +452,8 @@ public class ReportInstanceStatusType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java index 1b7c4554ab2..4829fc1eb42 100644 --- a/awsapi/src/com/amazon/ec2/RequestSpotInstances.java +++ b/awsapi/src/com/amazon/ec2/RequestSpotInstances.java @@ -98,7 +98,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class RequestSpotInstances implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstances").equals(reader.getName())) { object.setRequestSpotInstances(com.amazon.ec2.RequestSpotInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java index 84f436b2439..4ba16c95b65 100644 --- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class RequestSpotInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class RequestSpotInstancesResponse implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class RequestSpotInstancesResponse implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java index 26abf4aeb84..0166ad29888 100644 --- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesResponseType.java @@ -125,7 +125,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class RequestSpotInstancesResponseType implements org.apache.axis2.databi while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(com.amazon.ec2.SpotInstanceRequestSetType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java index abebc6f2b6e..a44ea6e6815 100644 --- a/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java +++ b/awsapi/src/com/amazon/ec2/RequestSpotInstancesType.java @@ -353,7 +353,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -636,9 +637,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1008,7 +1008,8 @@ public class RequestSpotInstancesType implements org.apache.axis2.databinding.AD while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/ReservationInfoType.java b/awsapi/src/com/amazon/ec2/ReservationInfoType.java index 6536d9fd9e9..9a01ed12489 100644 --- a/awsapi/src/com/amazon/ec2/ReservationInfoType.java +++ b/awsapi/src/com/amazon/ec2/ReservationInfoType.java @@ -211,7 +211,8 @@ public class ReservationInfoType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -366,9 +367,8 @@ public class ReservationInfoType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ReservationSetType.java b/awsapi/src/com/amazon/ec2/ReservationSetType.java index 2088981dd8f..24101603102 100644 --- a/awsapi/src/com/amazon/ec2/ReservationSetType.java +++ b/awsapi/src/com/amazon/ec2/ReservationSetType.java @@ -142,7 +142,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class ReservationSetType implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.ReservationInfoType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.ReservationInfoType.class, - list1)); + object.setItem((com.amazon.ec2.ReservationInfoType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.ReservationInfoType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java index d9e0b4bee56..20da1a72bb6 100644 --- a/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java +++ b/awsapi/src/com/amazon/ec2/ReservedInstanceLimitPriceType.java @@ -139,7 +139,8 @@ public class ReservedInstanceLimitPriceType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -249,9 +250,8 @@ public class ReservedInstanceLimitPriceType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java index bad871f4263..bf1ab67c954 100644 --- a/awsapi/src/com/amazon/ec2/ResetImageAttribute.java +++ b/awsapi/src/com/amazon/ec2/ResetImageAttribute.java @@ -98,7 +98,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ResetImageAttribute implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttribute").equals(reader.getName())) { object.setResetImageAttribute(com.amazon.ec2.ResetImageAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java index b54636e1c41..fc816e88972 100644 --- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ResetImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ResetImageAttributeResponse implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ResetImageAttributeResponse implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java index 7618c4810e9..56533b78fe7 100644 --- a/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeResponseType.java @@ -125,7 +125,8 @@ public class ResetImageAttributeResponseType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ResetImageAttributeResponseType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java index 87e57ec5d5b..730aebf86d4 100644 --- a/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ResetImageAttributeType.java @@ -125,7 +125,8 @@ public class ResetImageAttributeType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ResetImageAttributeType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java index c1f934564d4..a23668f1057 100644 --- a/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/ResetImageAttributesGroup.java @@ -126,7 +126,8 @@ public class ResetImageAttributesGroup implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ResetImageAttributesGroup implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java index 16bb53e663f..df0527555fd 100644 --- a/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java +++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttribute.java @@ -98,7 +98,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute").equals(reader.getName())) { object.setResetInstanceAttribute(com.amazon.ec2.ResetInstanceAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java index 62ca506a0bd..42407675f27 100644 --- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ResetInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ResetInstanceAttributeResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ResetInstanceAttributeResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java index f1663d118dd..833c95cc9ff 100644 --- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeResponseType.java @@ -125,7 +125,8 @@ public class ResetInstanceAttributeResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ResetInstanceAttributeResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java index 9d7ba18c43d..f339366626a 100644 --- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributeType.java @@ -125,7 +125,8 @@ public class ResetInstanceAttributeType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ResetInstanceAttributeType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java index 48e278db02f..681ba94b3c2 100644 --- a/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/ResetInstanceAttributesGroup.java @@ -210,7 +210,8 @@ public class ResetInstanceAttributesGroup implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -255,9 +256,8 @@ public class ResetInstanceAttributesGroup implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java index 41f28a28800..aee5e9aa4b6 100644 --- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java +++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttribute.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ResetNetworkInterfaceAttribute implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java index 7afc6dc4d4a..212d161852c 100644 --- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponse.java @@ -30,8 +30,8 @@ package com.amazon.ec2; public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttributeResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ResetNetworkInterfaceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99,7 +99,8 @@ public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119,9 +120,8 @@ public class ResetNetworkInterfaceAttributeResponse implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java index c1e222239d0..afbe16044a6 100644 --- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeResponseType.java @@ -125,7 +125,8 @@ public class ResetNetworkInterfaceAttributeResponseType implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ResetNetworkInterfaceAttributeResponseType implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java index 7cf6fb6c3ba..28f91d3a942 100644 --- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributeType.java @@ -125,7 +125,8 @@ public class ResetNetworkInterfaceAttributeType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ResetNetworkInterfaceAttributeType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java index 27418126df8..605e77a7ec9 100644 --- a/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/ResetNetworkInterfaceAttributesGroup.java @@ -126,7 +126,8 @@ public class ResetNetworkInterfaceAttributesGroup implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ResetNetworkInterfaceAttributesGroup implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java index 171e04c7d00..3df20ba4130 100644 --- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java +++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttribute.java @@ -98,7 +98,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute").equals(reader.getName())) { object.setResetSnapshotAttribute(com.amazon.ec2.ResetSnapshotAttributeType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java index 7241506b6be..03e297d820f 100644 --- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java +++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class ResetSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class ResetSnapshotAttributeResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class ResetSnapshotAttributeResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java index 5f5ee6c7708..3c990546c91 100644 --- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java +++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeResponseType.java @@ -125,7 +125,8 @@ public class ResetSnapshotAttributeResponseType implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class ResetSnapshotAttributeResponseType implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java index d3502d30a1f..7936369a6d1 100644 --- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java +++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributeType.java @@ -125,7 +125,8 @@ public class ResetSnapshotAttributeType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class ResetSnapshotAttributeType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java index 169b5eda557..fbb397c6559 100644 --- a/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java +++ b/awsapi/src/com/amazon/ec2/ResetSnapshotAttributesGroup.java @@ -126,7 +126,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159,9 +160,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -343,7 +343,8 @@ public class ResetSnapshotAttributesGroup implements org.apache.axis2.databindin // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(com.amazon.ec2.EmptyElementType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java index fcfbd6bdf1a..9cac14ade8a 100644 --- a/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/ResourceIdSetItemType.java @@ -101,7 +101,8 @@ public class ResourceIdSetItemType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ResourceIdSetItemType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java index 5cbfb547068..c77cc9a0083 100644 --- a/awsapi/src/com/amazon/ec2/ResourceIdSetType.java +++ b/awsapi/src/com/amazon/ec2/ResourceIdSetType.java @@ -142,7 +142,8 @@ public class ResourceIdSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ResourceIdSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java index 7ec162e99a6..70e3013c9d6 100644 --- a/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java +++ b/awsapi/src/com/amazon/ec2/ResourceTagSetItemType.java @@ -125,7 +125,8 @@ public class ResourceTagSetItemType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ResourceTagSetItemType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java index 95e2f4555e1..39ec3a48a40 100644 --- a/awsapi/src/com/amazon/ec2/ResourceTagSetType.java +++ b/awsapi/src/com/amazon/ec2/ResourceTagSetType.java @@ -142,7 +142,8 @@ public class ResourceTagSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ResourceTagSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java index 4765af10d47..b1356dbe78b 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgress.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java index 65300082e34..67a6f48eb43 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "RevokeSecurityGroupEgressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.datab } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class RevokeSecurityGroupEgressResponse implements org.apache.axis2.datab /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java index 1801d7b40e1..5865c3b5d3e 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressResponseType.java @@ -125,7 +125,8 @@ public class RevokeSecurityGroupEgressResponseType implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class RevokeSecurityGroupEgressResponseType implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java index 3929a67c94b..a411905740d 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupEgressType.java @@ -125,7 +125,8 @@ public class RevokeSecurityGroupEgressType implements org.apache.axis2.databindi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class RevokeSecurityGroupEgressType implements org.apache.axis2.databindi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java index 4ed853420b3..46fcf700823 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngress.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class RevokeSecurityGroupIngress implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java index d98b21c8def..2fa5da8dc8e 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "RevokeSecurityGroupIngressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class RevokeSecurityGroupIngressResponse implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java index e07df9873fe..298e81d3d8c 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressResponseType.java @@ -125,7 +125,8 @@ public class RevokeSecurityGroupIngressResponseType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class RevokeSecurityGroupIngressResponseType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java index dc6c4b7786e..047deee35a2 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressType.java @@ -163,7 +163,8 @@ public class RevokeSecurityGroupIngressType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254,9 +255,8 @@ public class RevokeSecurityGroupIngressType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java index d9c6e7fec39..911e3f01833 100644 --- a/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/RevokeSecurityGroupIngressTypeChoice_type0.java @@ -168,7 +168,8 @@ public class RevokeSecurityGroupIngressTypeChoice_type0 implements org.apache.ax } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261,9 +262,8 @@ public class RevokeSecurityGroupIngressTypeChoice_type0 implements org.apache.ax /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteSetType.java b/awsapi/src/com/amazon/ec2/RouteSetType.java index c5909edb309..3ea9d3a6690 100644 --- a/awsapi/src/com/amazon/ec2/RouteSetType.java +++ b/awsapi/src/com/amazon/ec2/RouteSetType.java @@ -142,7 +142,8 @@ public class RouteSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RouteSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java index c137ec42962..93a7a006f71 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationSetType.java @@ -142,7 +142,8 @@ public class RouteTableAssociationSetType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RouteTableAssociationSetType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java index 0246923ddda..888cfa849f0 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationType.java @@ -149,7 +149,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -491,7 +491,8 @@ public class RouteTableAssociationType implements org.apache.axis2.databinding.A while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java index ac3efcaffd2..0f6e4bc4dd9 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/RouteTableAssociationTypeChoice_type0.java @@ -169,7 +169,8 @@ public class RouteTableAssociationTypeChoice_type0 implements org.apache.axis2.d } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -259,9 +260,8 @@ public class RouteTableAssociationTypeChoice_type0 implements org.apache.axis2.d /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java index 8af35fc07b0..3f72067f721 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetItemType.java @@ -101,7 +101,8 @@ public class RouteTableIdSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class RouteTableIdSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java index 740afb2614c..c9b8bda2c08 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableIdSetType.java @@ -142,7 +142,8 @@ public class RouteTableIdSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RouteTableIdSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteTableSetType.java b/awsapi/src/com/amazon/ec2/RouteTableSetType.java index 9a90d85b5ae..c103da085f8 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableSetType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableSetType.java @@ -142,7 +142,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class RouteTableSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.RouteTableType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RouteTableType.class, list1)); + object.setItem((com.amazon.ec2.RouteTableType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.RouteTableType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/RouteTableType.java b/awsapi/src/com/amazon/ec2/RouteTableType.java index ecc16f193c5..a010a29f7f2 100644 --- a/awsapi/src/com/amazon/ec2/RouteTableType.java +++ b/awsapi/src/com/amazon/ec2/RouteTableType.java @@ -235,7 +235,8 @@ public class RouteTableType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -368,9 +369,8 @@ public class RouteTableType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RouteType.java b/awsapi/src/com/amazon/ec2/RouteType.java index 679926548fb..7cd7eed9122 100644 --- a/awsapi/src/com/amazon/ec2/RouteType.java +++ b/awsapi/src/com/amazon/ec2/RouteType.java @@ -301,7 +301,8 @@ public class RouteType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -577,9 +578,8 @@ public class RouteType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RunInstances.java b/awsapi/src/com/amazon/ec2/RunInstances.java index 228fef532f5..4abb1552264 100644 --- a/awsapi/src/com/amazon/ec2/RunInstances.java +++ b/awsapi/src/com/amazon/ec2/RunInstances.java @@ -98,7 +98,8 @@ public class RunInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RunInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java index 9f71aadfaa8..c0be36d310f 100644 --- a/awsapi/src/com/amazon/ec2/RunInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/RunInstancesResponse.java @@ -98,7 +98,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class RunInstancesResponse implements org.apache.axis2.databinding.ADBBea while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstancesResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstancesResponse").equals(reader.getName())) { object.setRunInstancesResponse(com.amazon.ec2.RunInstancesResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java index 4dcc415e943..6d92a1ef44a 100644 --- a/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/RunInstancesResponseType.java @@ -235,7 +235,8 @@ public class RunInstancesResponseType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -422,9 +423,8 @@ public class RunInstancesResponseType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/RunInstancesType.java b/awsapi/src/com/amazon/ec2/RunInstancesType.java index b18fc2f825b..ad07a686187 100644 --- a/awsapi/src/com/amazon/ec2/RunInstancesType.java +++ b/awsapi/src/com/amazon/ec2/RunInstancesType.java @@ -807,7 +807,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1313,9 +1314,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1888,7 +1888,8 @@ public class RunInstancesType implements org.apache.axis2.databinding.ADBBean { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java index edb97836d1d..6ed0b47bd5b 100644 --- a/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java +++ b/awsapi/src/com/amazon/ec2/RunningInstancesItemType.java @@ -1401,7 +1401,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -2358,9 +2359,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -3332,7 +3332,8 @@ public class RunningInstancesItemType implements org.apache.axis2.databinding.AD while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java index 892c49e85f5..1f4009e0858 100644 --- a/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java +++ b/awsapi/src/com/amazon/ec2/RunningInstancesSetType.java @@ -129,7 +129,8 @@ public class RunningInstancesSetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195,9 +196,8 @@ public class RunningInstancesSetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java index 1c6d01a08c0..95a3fb162ae 100644 --- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetItemType.java @@ -101,7 +101,8 @@ public class SecurityGroupIdSetItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class SecurityGroupIdSetItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java index 698306e83ff..f55b40416ad 100644 --- a/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java +++ b/awsapi/src/com/amazon/ec2/SecurityGroupIdSetType.java @@ -142,7 +142,8 @@ public class SecurityGroupIdSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SecurityGroupIdSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java index c671c3d8b97..5ec01bd0678 100644 --- a/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java +++ b/awsapi/src/com/amazon/ec2/SecurityGroupItemType.java @@ -311,7 +311,8 @@ public class SecurityGroupItemType implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -536,9 +537,8 @@ public class SecurityGroupItemType implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java index 70b2e9e9b97..f94d1b8ca9f 100644 --- a/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java +++ b/awsapi/src/com/amazon/ec2/SecurityGroupSetType.java @@ -142,7 +142,8 @@ public class SecurityGroupSetType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SecurityGroupSetType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java index 53f2fabeb0d..fd77b0fc500 100644 --- a/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java +++ b/awsapi/src/com/amazon/ec2/SpotDatafeedSubscriptionType.java @@ -211,7 +211,8 @@ public class SpotDatafeedSubscriptionType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -393,9 +394,8 @@ public class SpotDatafeedSubscriptionType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java index 35ea927a92f..f05ac517e35 100644 --- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetItemType.java @@ -101,7 +101,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -391,7 +391,8 @@ public class SpotInstanceRequestIdSetItemType implements org.apache.axis2.databi while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java index 23b721fbc96..4f3d4728110 100644 --- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java +++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestIdSetType.java @@ -142,7 +142,8 @@ public class SpotInstanceRequestIdSetType implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SpotInstanceRequestIdSetType implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java index 26e6766a348..ad5d5ba447d 100644 --- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java +++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetItemType.java @@ -591,7 +591,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1049,9 +1050,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1378,7 +1378,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -1516,7 +1517,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -1614,7 +1616,8 @@ public class SpotInstanceRequestSetItemType implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java index f1294b96eed..26c6a3b9e30 100644 --- a/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java +++ b/awsapi/src/com/amazon/ec2/SpotInstanceRequestSetType.java @@ -142,7 +142,8 @@ public class SpotInstanceRequestSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SpotInstanceRequestSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java index 31556414849..19b887631a0 100644 --- a/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java +++ b/awsapi/src/com/amazon/ec2/SpotInstanceStateFaultType.java @@ -125,7 +125,8 @@ public class SpotInstanceStateFaultType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class SpotInstanceStateFaultType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java index 2603cb364f9..9ce9866280d 100644 --- a/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java +++ b/awsapi/src/com/amazon/ec2/SpotPlacementRequestType.java @@ -153,7 +153,8 @@ public class SpotPlacementRequestType implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267,9 +268,8 @@ public class SpotPlacementRequestType implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java index 5cd0bdd624b..2c9950eeb4a 100644 --- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java +++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetItemType.java @@ -211,7 +211,8 @@ public class SpotPriceHistorySetItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -420,9 +421,8 @@ public class SpotPriceHistorySetItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java index 855fd1b33ed..21c22643229 100644 --- a/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java +++ b/awsapi/src/com/amazon/ec2/SpotPriceHistorySetType.java @@ -142,7 +142,8 @@ public class SpotPriceHistorySetType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SpotPriceHistorySetType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/StartInstances.java b/awsapi/src/com/amazon/ec2/StartInstances.java index eb5dd986b2a..1eb4bcc33d3 100644 --- a/awsapi/src/com/amazon/ec2/StartInstances.java +++ b/awsapi/src/com/amazon/ec2/StartInstances.java @@ -98,7 +98,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class StartInstances implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) { object.setStartInstances(com.amazon.ec2.StartInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java index 086566a9c4e..ef93290667f 100644 --- a/awsapi/src/com/amazon/ec2/StartInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/StartInstancesResponse.java @@ -98,7 +98,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class StartInstancesResponse implements org.apache.axis2.databinding.ADBB while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse").equals(reader.getName())) { object.setStartInstancesResponse(com.amazon.ec2.StartInstancesResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java index 5ab9d24f125..c5747c6b230 100644 --- a/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/StartInstancesResponseType.java @@ -125,7 +125,8 @@ public class StartInstancesResponseType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class StartInstancesResponseType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/StartInstancesType.java b/awsapi/src/com/amazon/ec2/StartInstancesType.java index 7512feefef0..2fbcecf4dfb 100644 --- a/awsapi/src/com/amazon/ec2/StartInstancesType.java +++ b/awsapi/src/com/amazon/ec2/StartInstancesType.java @@ -101,7 +101,8 @@ public class StartInstancesType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class StartInstancesType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/StateReasonType.java b/awsapi/src/com/amazon/ec2/StateReasonType.java index 1166de9fa67..3669c4fa0ab 100644 --- a/awsapi/src/com/amazon/ec2/StateReasonType.java +++ b/awsapi/src/com/amazon/ec2/StateReasonType.java @@ -125,7 +125,8 @@ public class StateReasonType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class StateReasonType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/StopInstances.java b/awsapi/src/com/amazon/ec2/StopInstances.java index f9b523aba69..d4913a91ca4 100644 --- a/awsapi/src/com/amazon/ec2/StopInstances.java +++ b/awsapi/src/com/amazon/ec2/StopInstances.java @@ -98,7 +98,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class StopInstances implements org.apache.axis2.databinding.ADBBean { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) { object.setStopInstances(com.amazon.ec2.StopInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java index 2b222058f25..cb9927341e8 100644 --- a/awsapi/src/com/amazon/ec2/StopInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/StopInstancesResponse.java @@ -98,7 +98,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class StopInstancesResponse implements org.apache.axis2.databinding.ADBBe while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse").equals(reader.getName())) { object.setStopInstancesResponse(com.amazon.ec2.StopInstancesResponseType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java index 54cb2dd97fa..46e3042a645 100644 --- a/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/StopInstancesResponseType.java @@ -125,7 +125,8 @@ public class StopInstancesResponseType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class StopInstancesResponseType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/StopInstancesType.java b/awsapi/src/com/amazon/ec2/StopInstancesType.java index 2cd981f2ab8..1e43ee9b973 100644 --- a/awsapi/src/com/amazon/ec2/StopInstancesType.java +++ b/awsapi/src/com/amazon/ec2/StopInstancesType.java @@ -140,7 +140,8 @@ public class StopInstancesType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -223,9 +224,8 @@ public class StopInstancesType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java index 0d46f5b2575..b54a291ab04 100644 --- a/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java @@ -101,7 +101,8 @@ public class SubnetIdSetItemType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class SubnetIdSetItemType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java index b55b315d66a..e21f2fda6e5 100644 --- a/awsapi/src/com/amazon/ec2/SubnetIdSetType.java +++ b/awsapi/src/com/amazon/ec2/SubnetIdSetType.java @@ -142,7 +142,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class SubnetIdSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.SubnetIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.SubnetIdSetItemType.class, - list1)); + object.setItem((com.amazon.ec2.SubnetIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.SubnetIdSetItemType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/SubnetSetType.java b/awsapi/src/com/amazon/ec2/SubnetSetType.java index daa52ef6f94..2e1576fb701 100644 --- a/awsapi/src/com/amazon/ec2/SubnetSetType.java +++ b/awsapi/src/com/amazon/ec2/SubnetSetType.java @@ -142,7 +142,8 @@ public class SubnetSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class SubnetSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/SubnetType.java b/awsapi/src/com/amazon/ec2/SubnetType.java index 33dab24686a..42c5ada01e5 100644 --- a/awsapi/src/com/amazon/ec2/SubnetType.java +++ b/awsapi/src/com/amazon/ec2/SubnetType.java @@ -330,7 +330,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -578,9 +579,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -905,7 +905,8 @@ public class SubnetType implements org.apache.axis2.databinding.ADBBean { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/TagSetItemType.java b/awsapi/src/com/amazon/ec2/TagSetItemType.java index 43aaa1708e9..eb2d92748c6 100644 --- a/awsapi/src/com/amazon/ec2/TagSetItemType.java +++ b/awsapi/src/com/amazon/ec2/TagSetItemType.java @@ -229,7 +229,8 @@ public class TagSetItemType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -409,9 +410,8 @@ public class TagSetItemType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/TagSetType.java b/awsapi/src/com/amazon/ec2/TagSetType.java index 8fb6f488c26..cd495124106 100644 --- a/awsapi/src/com/amazon/ec2/TagSetType.java +++ b/awsapi/src/com/amazon/ec2/TagSetType.java @@ -142,7 +142,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class TagSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.TagSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.TagSetItemType.class, list1)); + object.setItem((com.amazon.ec2.TagSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.TagSetItemType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/TerminateInstances.java b/awsapi/src/com/amazon/ec2/TerminateInstances.java index 97da176e305..cf5ec5c011c 100644 --- a/awsapi/src/com/amazon/ec2/TerminateInstances.java +++ b/awsapi/src/com/amazon/ec2/TerminateInstances.java @@ -98,7 +98,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class TerminateInstances implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) { object.setTerminateInstances(com.amazon.ec2.TerminateInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java index 5ecf983294d..72d33e64c3e 100644 --- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class TerminateInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class TerminateInstancesResponse implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class TerminateInstancesResponse implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java index b8d6c86a42d..8613d72a670 100644 --- a/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java +++ b/awsapi/src/com/amazon/ec2/TerminateInstancesResponseType.java @@ -125,7 +125,8 @@ public class TerminateInstancesResponseType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class TerminateInstancesResponseType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java index 5cffebc9349..a0fe0a584a6 100644 --- a/awsapi/src/com/amazon/ec2/TerminateInstancesType.java +++ b/awsapi/src/com/amazon/ec2/TerminateInstancesType.java @@ -101,7 +101,8 @@ public class TerminateInstancesType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class TerminateInstancesType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java index a3b2075ee2c..d59f10529cb 100644 --- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java +++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddresses.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class UnassignPrivateIpAddresses implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java index ad2dae499b0..3e223996414 100644 --- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java +++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddressesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "UnassignPrivateIpAddressesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.data } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class UnassignPrivateIpAddressesResponse implements org.apache.axis2.data /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java index e37c9b926c0..07d21d2c2af 100644 --- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java +++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesResponseType.java @@ -125,7 +125,8 @@ public class UnassignPrivateIpAddressesResponseType implements org.apache.axis2. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class UnassignPrivateIpAddressesResponseType implements org.apache.axis2. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java index 7fc066bf3ee..7c3da6494a7 100644 --- a/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java +++ b/awsapi/src/com/amazon/ec2/UnassignPrivateIpAddressesType.java @@ -125,7 +125,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -445,7 +445,8 @@ public class UnassignPrivateIpAddressesType implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(com.amazon.ec2.AssignPrivateIpAddressesSetRequestType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java index d182c81c3b5..5967bdd4623 100644 --- a/awsapi/src/com/amazon/ec2/UnmonitorInstances.java +++ b/awsapi/src/com/amazon/ec2/UnmonitorInstances.java @@ -98,7 +98,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +119,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -294,7 +294,8 @@ public class UnmonitorInstances implements org.apache.axis2.databinding.ADBBean while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) { object.setUnmonitorInstances(com.amazon.ec2.MonitorInstancesType.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java index 47d681e149d..f27b1ed1937 100644 --- a/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java +++ b/awsapi/src/com/amazon/ec2/UnmonitorInstancesResponse.java @@ -30,7 +30,8 @@ package com.amazon.ec2; public class UnmonitorInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98,7 +99,8 @@ public class UnmonitorInstancesResponse implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118,9 +120,8 @@ public class UnmonitorInstancesResponse implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/UserDataType.java b/awsapi/src/com/amazon/ec2/UserDataType.java index c456f9a0674..4b04afd4b55 100644 --- a/awsapi/src/com/amazon/ec2/UserDataType.java +++ b/awsapi/src/com/amazon/ec2/UserDataType.java @@ -165,7 +165,8 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -266,9 +267,8 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -482,7 +482,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean { // handle attribute "version" java.lang.String tempAttribVersion = - reader.getAttributeValue(null, "version"); + reader.getAttributeValue(null, "version"); if (tempAttribVersion != null) { java.lang.String content = tempAttribVersion; @@ -499,7 +499,7 @@ public class UserDataType implements org.apache.axis2.databinding.ADBBean { // handle attribute "encoding" java.lang.String tempAttribEncoding = - reader.getAttributeValue(null, "encoding"); + reader.getAttributeValue(null, "encoding"); if (tempAttribEncoding != null) { java.lang.String content = tempAttribEncoding; diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java index b754e0addf4..ec36b2b3d10 100644 --- a/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java +++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairSetType.java @@ -142,7 +142,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class UserIdGroupPairSetType implements org.apache.axis2.databinding.ADBB } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.UserIdGroupPairType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.UserIdGroupPairType.class, - list1)); + object.setItem((com.amazon.ec2.UserIdGroupPairType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.UserIdGroupPairType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java index cc1ff971709..2ee56458243 100644 --- a/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java +++ b/awsapi/src/com/amazon/ec2/UserIdGroupPairType.java @@ -191,7 +191,8 @@ public class UserIdGroupPairType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -338,9 +339,8 @@ public class UserIdGroupPairType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ValueSetType.java b/awsapi/src/com/amazon/ec2/ValueSetType.java index 82763206950..1f5a47a5241 100644 --- a/awsapi/src/com/amazon/ec2/ValueSetType.java +++ b/awsapi/src/com/amazon/ec2/ValueSetType.java @@ -142,7 +142,8 @@ public class ValueSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ValueSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/ValueType.java b/awsapi/src/com/amazon/ec2/ValueType.java index 27854a677d1..dbdc99ce451 100644 --- a/awsapi/src/com/amazon/ec2/ValueType.java +++ b/awsapi/src/com/amazon/ec2/ValueType.java @@ -101,7 +101,8 @@ public class ValueType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class ValueType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java index 5805e5b27f2..56371ea1f7b 100644 --- a/awsapi/src/com/amazon/ec2/VgwTelemetryType.java +++ b/awsapi/src/com/amazon/ec2/VgwTelemetryType.java @@ -142,7 +142,8 @@ public class VgwTelemetryType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VgwTelemetryType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java index 00885de1179..8bc6e53c3be 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionItemType.java @@ -173,7 +173,8 @@ public class VolumeStatusActionItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350,9 +351,8 @@ public class VolumeStatusActionItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java index 465d609b0bd..e49e66cab28 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusActionsSetType.java @@ -142,7 +142,8 @@ public class VolumeStatusActionsSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VolumeStatusActionsSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java index 7a6148d9740..5e7f100828f 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsItemType.java @@ -125,7 +125,8 @@ public class VolumeStatusDetailsItemType implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class VolumeStatusDetailsItemType implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java index b773b0db5c1..97a6d6e7361 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusDetailsSetType.java @@ -142,7 +142,8 @@ public class VolumeStatusDetailsSetType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VolumeStatusDetailsSetType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java index 61cb6ea1eda..e416fbde4bb 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventItemType.java @@ -197,7 +197,8 @@ public class VolumeStatusEventItemType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -406,9 +407,8 @@ public class VolumeStatusEventItemType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java index 436fa6a7db2..a554b0402da 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusEventsSetType.java @@ -142,7 +142,8 @@ public class VolumeStatusEventsSetType implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VolumeStatusEventsSetType implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java index 7ab36ee8012..dd86c2e2b17 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusInfoType.java @@ -125,7 +125,8 @@ public class VolumeStatusInfoType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211,9 +212,8 @@ public class VolumeStatusInfoType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java index 2b231d3d65e..e82270f6f45 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusItemType.java @@ -197,7 +197,8 @@ public class VolumeStatusItemType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -325,9 +326,8 @@ public class VolumeStatusItemType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java index 2932a208fa0..4e4bac5dede 100644 --- a/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java +++ b/awsapi/src/com/amazon/ec2/VolumeStatusSetType.java @@ -142,7 +142,8 @@ public class VolumeStatusSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VolumeStatusSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java index bbc6ce2ad0d..ac3dba30ab2 100644 --- a/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/VpcIdSetItemType.java @@ -101,7 +101,8 @@ public class VpcIdSetItemType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class VpcIdSetItemType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpcIdSetType.java b/awsapi/src/com/amazon/ec2/VpcIdSetType.java index 6ffecb37249..8f3d7f6e3a7 100644 --- a/awsapi/src/com/amazon/ec2/VpcIdSetType.java +++ b/awsapi/src/com/amazon/ec2/VpcIdSetType.java @@ -142,7 +142,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class VpcIdSetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.VpcIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpcIdSetItemType.class, list1)); + object.setItem((com.amazon.ec2.VpcIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.VpcIdSetItemType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/VpcSetType.java b/awsapi/src/com/amazon/ec2/VpcSetType.java index 04b0610b7a0..9372951f554 100644 --- a/awsapi/src/com/amazon/ec2/VpcSetType.java +++ b/awsapi/src/com/amazon/ec2/VpcSetType.java @@ -142,7 +142,8 @@ public class VpcSetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpcSetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpcType.java b/awsapi/src/com/amazon/ec2/VpcType.java index 58317ff90c9..a17a1afabe7 100644 --- a/awsapi/src/com/amazon/ec2/VpcType.java +++ b/awsapi/src/com/amazon/ec2/VpcType.java @@ -291,7 +291,8 @@ public class VpcType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -509,9 +510,8 @@ public class VpcType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java index 51c1cd11516..d34222fe7c4 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetItemType.java @@ -101,7 +101,8 @@ public class VpnConnectionIdSetItemType implements org.apache.axis2.databinding. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class VpnConnectionIdSetItemType implements org.apache.axis2.databinding. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java index 152743811b5..a2fcf932878 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionIdSetType.java @@ -142,7 +142,8 @@ public class VpnConnectionIdSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpnConnectionIdSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java index 9a0558c103a..d60e83d8372 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsRequestType.java @@ -116,7 +116,8 @@ public class VpnConnectionOptionsRequestType implements org.apache.axis2.databin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194,9 +195,8 @@ public class VpnConnectionOptionsRequestType implements org.apache.axis2.databin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java index 79ce9670b8c..48c4210fecb 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionOptionsResponseType.java @@ -116,7 +116,8 @@ public class VpnConnectionOptionsResponseType implements org.apache.axis2.databi } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194,9 +195,8 @@ public class VpnConnectionOptionsResponseType implements org.apache.axis2.databi /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java index a45667ed293..6b528c941dd 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionSetType.java @@ -142,7 +142,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class VpnConnectionSetType implements org.apache.axis2.databinding.ADBBea } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.VpnConnectionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnConnectionType.class, - list1)); + object.setItem((com.amazon.ec2.VpnConnectionType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.VpnConnectionType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/VpnConnectionType.java b/awsapi/src/com/amazon/ec2/VpnConnectionType.java index 6698bf7cf8f..6ce38fcb639 100644 --- a/awsapi/src/com/amazon/ec2/VpnConnectionType.java +++ b/awsapi/src/com/amazon/ec2/VpnConnectionType.java @@ -401,7 +401,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -666,9 +667,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -984,7 +984,8 @@ public class VpnConnectionType implements org.apache.axis2.databinding.ADBBean { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayConfiguration").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayConfiguration").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java index 421a9d5897b..ba507fe07f4 100644 --- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java +++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetItemType.java @@ -101,7 +101,8 @@ public class VpnGatewayIdSetItemType implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class VpnGatewayIdSetItemType implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java index 44149cc8f8f..e0760fbd371 100644 --- a/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java +++ b/awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java @@ -142,7 +142,8 @@ public class VpnGatewayIdSetType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpnGatewayIdSetType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java index a909560083e..585fde14e85 100644 --- a/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java +++ b/awsapi/src/com/amazon/ec2/VpnGatewaySetType.java @@ -142,7 +142,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,7 +463,8 @@ public class VpnGatewaySetType implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.VpnGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnGatewayType.class, list1)); + object.setItem((com.amazon.ec2.VpnGatewayType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnGatewayType.class, + list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/VpnGatewayType.java b/awsapi/src/com/amazon/ec2/VpnGatewayType.java index ebeebefaba4..a1f98a9df30 100644 --- a/awsapi/src/com/amazon/ec2/VpnGatewayType.java +++ b/awsapi/src/com/amazon/ec2/VpnGatewayType.java @@ -249,7 +249,8 @@ public class VpnGatewayType implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -436,9 +437,8 @@ public class VpnGatewayType implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java index 25496347a4d..50f2ca277bf 100644 --- a/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java +++ b/awsapi/src/com/amazon/ec2/VpnStaticRouteType.java @@ -149,7 +149,8 @@ public class VpnStaticRouteType implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294,9 +295,8 @@ public class VpnStaticRouteType implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java index d0251fc4c0e..4259e96b3ed 100644 --- a/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java +++ b/awsapi/src/com/amazon/ec2/VpnStaticRoutesSetType.java @@ -142,7 +142,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -463,8 +463,8 @@ public class VpnStaticRoutesSetType implements org.apache.axis2.databinding.ADBB } // call the converter utility to convert and set the array - object.setItem((com.amazon.ec2.VpnStaticRouteType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.VpnStaticRouteType.class, - list1)); + object.setItem((com.amazon.ec2.VpnStaticRouteType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.ec2.VpnStaticRouteType.class, list1)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java index eb63c21587d..0ce55ff018d 100644 --- a/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java +++ b/awsapi/src/com/amazon/ec2/VpnTunnelTelemetryType.java @@ -211,7 +211,8 @@ public class VpnTunnelTelemetryType implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -417,9 +418,8 @@ public class VpnTunnelTelemetryType implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java index 2002a0a895a..b6698a8aa0f 100644 --- a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java +++ b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java @@ -1131,9 +1131,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse describePlacementGroups( - com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0) + com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1150,8 +1150,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1164,11 +1165,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse)object; @@ -1231,11 +1234,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribePlacementGroups( - com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0, + com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups describePlacementGroups0, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[0].getName()); _operationClient.getOptions().setAction("DescribePlacementGroups"); @@ -1249,8 +1252,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describePlacementGroups0, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describePlacementGroups"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1265,8 +1269,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribePlacementGroups((com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1361,9 +1366,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse createSecurityGroup( - com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2) + com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1380,8 +1385,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1394,11 +1400,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse)object; @@ -1461,11 +1468,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateSecurityGroup( - com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2, + com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroup createSecurityGroup2, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[1].getName()); _operationClient.getOptions().setAction("CreateSecurityGroup"); @@ -1479,8 +1486,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSecurityGroup2, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSecurityGroup"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1495,8 +1503,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateSecurityGroup((com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1591,9 +1600,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) + com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1610,8 +1619,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1624,11 +1634,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse)object; @@ -1691,11 +1703,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startresetNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4, + com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[2].getName()); _operationClient.getOptions().setAction("ResetNetworkInterfaceAttribute"); @@ -1709,8 +1721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetNetworkInterfaceAttribute4, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetNetworkInterfaceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1725,8 +1738,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultresetNetworkInterfaceAttribute((com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1821,9 +1835,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse createDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6) + com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1840,8 +1854,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1854,11 +1869,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse)object; @@ -1921,11 +1937,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6, + com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptions createDhcpOptions6, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[3].getName()); _operationClient.getOptions().setAction("CreateDhcpOptions"); @@ -1939,8 +1955,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createDhcpOptions6, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createDhcpOptions"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1955,8 +1972,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2051,9 +2069,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse createRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8) + com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2070,8 +2088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2084,11 +2103,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse)object; @@ -2151,11 +2171,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8, + com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTable createRouteTable8, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[4].getName()); _operationClient.getOptions().setAction("CreateRouteTable"); @@ -2169,8 +2189,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRouteTable8, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createRouteTable"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2185,8 +2206,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateRouteTable((com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2281,9 +2303,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse describeSubnets( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2300,8 +2322,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2314,11 +2337,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse)object; @@ -2381,11 +2405,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSubnets( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnets describeSubnets10, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[5].getName()); _operationClient.getOptions().setAction("DescribeSubnets"); @@ -2399,8 +2423,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSubnets10, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSubnets"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2415,8 +2440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSubnets((com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2511,9 +2536,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse deactivateLicense( - com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12) + com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2530,8 +2555,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2544,11 +2570,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse)object; @@ -2611,11 +2638,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeactivateLicense( - com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12, + com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicense deactivateLicense12, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[6].getName()); _operationClient.getOptions().setAction("DeactivateLicense"); @@ -2629,8 +2656,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deactivateLicense12, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deactivateLicense"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2645,8 +2673,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeactivateLicense((com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2741,9 +2770,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse deleteVpc( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14) + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2760,8 +2789,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2774,10 +2804,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse)object; @@ -2840,11 +2872,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteVpc( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14, + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc deleteVpc14, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[7].getName()); _operationClient.getOptions().setAction("DeleteVpc"); @@ -2858,8 +2890,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpc14, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpc"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2874,8 +2907,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteVpc((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2970,9 +3003,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests( - com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16) + com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2989,8 +3022,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3003,11 +3037,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse)object; @@ -3070,11 +3106,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcancelSpotInstanceRequests( - com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16, + com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests cancelSpotInstanceRequests16, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[8].getName()); _operationClient.getOptions().setAction("CancelSpotInstanceRequests"); @@ -3088,8 +3124,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelSpotInstanceRequests16, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelSpotInstanceRequests"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3104,8 +3141,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcancelSpotInstanceRequests((com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3200,9 +3238,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse createSubnet( - com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18) + com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3219,8 +3257,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3233,11 +3272,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse)object; @@ -3300,11 +3340,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateSubnet( - com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18, + com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet createSubnet18, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[9].getName()); _operationClient.getOptions().setAction("CreateSubnet"); @@ -3318,8 +3358,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSubnet18, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSubnet"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3334,8 +3375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateSubnet((com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3430,9 +3471,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse deleteVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20) + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3449,8 +3490,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3463,11 +3505,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse)object; @@ -3530,11 +3573,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20, + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGateway deleteVpnGateway20, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[10].getName()); _operationClient.getOptions().setAction("DeleteVpnGateway"); @@ -3548,8 +3591,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnGateway20, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3564,8 +3608,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteVpnGateway((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3660,9 +3705,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse createNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22) + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3679,8 +3724,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3693,11 +3739,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse)object; @@ -3760,11 +3807,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22, + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry createNetworkAclEntry22, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[11].getName()); _operationClient.getOptions().setAction("CreateNetworkAclEntry"); @@ -3778,8 +3825,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAclEntry22, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAclEntry"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3794,8 +3842,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateNetworkAclEntry((com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3890,9 +3939,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse requestSpotInstances( - com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24) + com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3909,8 +3958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3923,11 +3973,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse)object; @@ -3990,11 +4041,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startrequestSpotInstances( - com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24, + com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstances requestSpotInstances24, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[12].getName()); _operationClient.getOptions().setAction("RequestSpotInstances"); @@ -4008,8 +4059,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), requestSpotInstances24, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "requestSpotInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4024,8 +4076,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultrequestSpotInstances((com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -4120,9 +4173,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse describeVolumeAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -4139,8 +4192,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4153,11 +4207,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse)object; @@ -4220,11 +4276,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVolumeAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute describeVolumeAttribute26, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[13].getName()); _operationClient.getOptions().setAction("DescribeVolumeAttribute"); @@ -4238,8 +4294,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeAttribute26, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4254,8 +4311,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVolumeAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -4350,9 +4408,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse associateDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28) + com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -4369,8 +4427,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4383,11 +4442,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse)object; @@ -4450,11 +4510,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startassociateDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28, + com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptions associateDhcpOptions28, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[14].getName()); _operationClient.getOptions().setAction("AssociateDhcpOptions"); @@ -4468,8 +4528,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateDhcpOptions28, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateDhcpOptions"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4484,8 +4545,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultassociateDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -4580,9 +4642,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse describeTags( - com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30) + com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -4599,8 +4661,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4613,11 +4676,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse)object; @@ -4680,11 +4744,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeTags( - com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30, + com.amazon.ec2.client.AmazonEC2Stub.DescribeTags describeTags30, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[15].getName()); _operationClient.getOptions().setAction("DescribeTags"); @@ -4698,8 +4762,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeTags30, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeTags"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4714,8 +4779,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeTags((com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -4810,9 +4875,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse importKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32) + com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -4829,8 +4894,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4843,11 +4909,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse)object; @@ -4910,11 +4977,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startimportKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32, + com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPair importKeyPair32, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[16].getName()); _operationClient.getOptions().setAction("ImportKeyPair"); @@ -4928,8 +4995,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importKeyPair32, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importKeyPair"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -4944,8 +5012,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultimportKeyPair((com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -5040,9 +5108,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse deleteNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34) + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -5059,8 +5127,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5073,11 +5142,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse)object; @@ -5140,11 +5211,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34, + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface deleteNetworkInterface34, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[17].getName()); _operationClient.getOptions().setAction("DeleteNetworkInterface"); @@ -5158,8 +5229,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkInterface34, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkInterface"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5174,8 +5246,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteNetworkInterface((com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -5270,9 +5343,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse describeVpcs( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -5289,8 +5362,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5303,11 +5377,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse)object; @@ -5370,11 +5445,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVpcs( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs describeVpcs36, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[18].getName()); _operationClient.getOptions().setAction("DescribeVpcs"); @@ -5388,8 +5463,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpcs36, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpcs"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5404,8 +5480,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVpcs((com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -5500,9 +5576,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse describeLicenses( - com.amazon.ec2.client.AmazonEC2Stub.DescribeLicenses describeLicenses38) + com.amazon.ec2.client.AmazonEC2Stub.DescribeLicenses describeLicenses38) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -5519,8 +5595,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeLicenses38, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeLicenses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeLicenses38, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeLicenses"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5533,11 +5610,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse)object; @@ -5600,11 +5678,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeLicenses( - com.amazon.ec2.client.AmazonEC2Stub.DescribeLicenses describeLicenses38, + com.amazon.ec2.client.AmazonEC2Stub.DescribeLicenses describeLicenses38, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[19].getName()); _operationClient.getOptions().setAction("DescribeLicenses"); @@ -5618,8 +5696,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeLicenses38, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeLicenses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeLicenses38, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeLicenses"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5634,8 +5713,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeLicenses((com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -5730,9 +5810,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse bundleInstance( - com.amazon.ec2.client.AmazonEC2Stub.BundleInstance bundleInstance40) + com.amazon.ec2.client.AmazonEC2Stub.BundleInstance bundleInstance40) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -5749,8 +5829,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), bundleInstance40, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), bundleInstance40, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstance"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5763,11 +5844,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse)object; @@ -5830,11 +5912,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startbundleInstance( - com.amazon.ec2.client.AmazonEC2Stub.BundleInstance bundleInstance40, + com.amazon.ec2.client.AmazonEC2Stub.BundleInstance bundleInstance40, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[20].getName()); _operationClient.getOptions().setAction("BundleInstance"); @@ -5848,8 +5930,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), bundleInstance40, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), bundleInstance40, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstance"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5864,8 +5947,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultbundleInstance((com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -5960,9 +6043,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse describeVpnConnections( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections describeVpnConnections42) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections describeVpnConnections42) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -5979,8 +6062,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnConnections42, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnConnections"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnConnections42, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnConnections"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -5993,11 +6077,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse)object; @@ -6060,11 +6146,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVpnConnections( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections describeVpnConnections42, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections describeVpnConnections42, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[21].getName()); _operationClient.getOptions().setAction("DescribeVpnConnections"); @@ -6078,8 +6164,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnConnections42, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnConnections"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnConnections42, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnConnections"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6094,8 +6181,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVpnConnections((com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -6190,9 +6278,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse describeImages( - com.amazon.ec2.client.AmazonEC2Stub.DescribeImages describeImages44) + com.amazon.ec2.client.AmazonEC2Stub.DescribeImages describeImages44) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -6209,8 +6297,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImages44, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImages"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImages44, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImages"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6223,11 +6312,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse)object; @@ -6290,11 +6380,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeImages( - com.amazon.ec2.client.AmazonEC2Stub.DescribeImages describeImages44, + com.amazon.ec2.client.AmazonEC2Stub.DescribeImages describeImages44, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[22].getName()); _operationClient.getOptions().setAction("DescribeImages"); @@ -6308,8 +6398,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImages44, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImages"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImages44, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImages"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6324,8 +6415,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeImages((com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -6420,9 +6511,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse createInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway createInternetGateway46) + com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway createInternetGateway46) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -6439,8 +6530,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInternetGateway46, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInternetGateway46, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createInternetGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6453,11 +6545,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse)object; @@ -6520,11 +6613,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway createInternetGateway46, + com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway createInternetGateway46, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[23].getName()); _operationClient.getOptions().setAction("CreateInternetGateway"); @@ -6538,8 +6631,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInternetGateway46, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInternetGateway46, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createInternetGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6554,8 +6648,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateInternetGateway((com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -6650,9 +6745,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse disassociateRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable disassociateRouteTable48) + com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable disassociateRouteTable48) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -6669,8 +6764,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateRouteTable48, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateRouteTable48, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateRouteTable"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6683,11 +6779,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse)object; @@ -6750,11 +6848,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdisassociateRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable disassociateRouteTable48, + com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable disassociateRouteTable48, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[24].getName()); _operationClient.getOptions().setAction("DisassociateRouteTable"); @@ -6768,8 +6866,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateRouteTable48, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateRouteTable48, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateRouteTable"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6784,8 +6883,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdisassociateRouteTable((com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -6880,9 +6980,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse replaceNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry replaceNetworkAclEntry50) + com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry replaceNetworkAclEntry50) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -6899,8 +6999,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclEntry50, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclEntry50, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclEntry"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -6913,11 +7014,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse)object; @@ -6980,11 +7083,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreplaceNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry replaceNetworkAclEntry50, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry replaceNetworkAclEntry50, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[25].getName()); _operationClient.getOptions().setAction("ReplaceNetworkAclEntry"); @@ -6998,8 +7101,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclEntry50, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclEntry50, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclEntry"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7014,8 +7118,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultreplaceNetworkAclEntry((com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -7110,9 +7215,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress( - com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -7129,8 +7234,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupIngress52, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupIngress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupIngress52, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupIngress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7143,11 +7249,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse)object; @@ -7210,11 +7318,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startauthorizeSecurityGroupIngress( - com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52, + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress authorizeSecurityGroupIngress52, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[26].getName()); _operationClient.getOptions().setAction("AuthorizeSecurityGroupIngress"); @@ -7228,8 +7336,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupIngress52, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupIngress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupIngress52, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupIngress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7244,8 +7353,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultauthorizeSecurityGroupIngress((com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -7340,9 +7450,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse describeSnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute describeSnapshotAttribute54) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute describeSnapshotAttribute54) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -7359,8 +7469,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshotAttribute54, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshotAttribute54, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshotAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7373,11 +7484,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse)object; @@ -7440,11 +7553,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute describeSnapshotAttribute54, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute describeSnapshotAttribute54, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[27].getName()); _operationClient.getOptions().setAction("DescribeSnapshotAttribute"); @@ -7458,8 +7571,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshotAttribute54, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshotAttribute54, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshotAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7474,8 +7588,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSnapshotAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -7570,9 +7685,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse createVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGateway createVpnGateway56) + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGateway createVpnGateway56) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -7589,8 +7704,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnGateway56, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnGateway56, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7603,11 +7719,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse)object; @@ -7670,11 +7787,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGateway createVpnGateway56, + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGateway createVpnGateway56, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[28].getName()); _operationClient.getOptions().setAction("CreateVpnGateway"); @@ -7688,8 +7805,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnGateway56, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnGateway56, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7704,8 +7822,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateVpnGateway((com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -7800,9 +7919,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse resetInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute resetInstanceAttribute58) + com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute resetInstanceAttribute58) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -7819,8 +7938,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetInstanceAttribute58, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetInstanceAttribute58, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetInstanceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7833,11 +7953,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse)object; @@ -7900,11 +8022,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startresetInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute resetInstanceAttribute58, + com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute resetInstanceAttribute58, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[29].getName()); _operationClient.getOptions().setAction("ResetInstanceAttribute"); @@ -7918,8 +8040,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetInstanceAttribute58, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetInstanceAttribute58, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetInstanceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -7934,8 +8057,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultresetInstanceAttribute((com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -8030,9 +8154,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse createTags( - com.amazon.ec2.client.AmazonEC2Stub.CreateTags createTags60) + com.amazon.ec2.client.AmazonEC2Stub.CreateTags createTags60) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -8049,8 +8173,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createTags60, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createTags60, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createTags"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8063,11 +8188,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse)object; @@ -8130,11 +8256,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateTags( - com.amazon.ec2.client.AmazonEC2Stub.CreateTags createTags60, + com.amazon.ec2.client.AmazonEC2Stub.CreateTags createTags60, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[30].getName()); _operationClient.getOptions().setAction("CreateTags"); @@ -8148,8 +8274,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createTags60, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createTags60, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createTags"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8164,8 +8291,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateTags((com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -8260,9 +8387,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress( - com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress62) + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress62) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -8279,8 +8406,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupEgress62, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupEgress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupEgress62, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupEgress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8293,11 +8421,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse)object; @@ -8360,11 +8490,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startauthorizeSecurityGroupEgress( - com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress62, + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress authorizeSecurityGroupEgress62, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[31].getName()); _operationClient.getOptions().setAction("AuthorizeSecurityGroupEgress"); @@ -8378,8 +8508,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupEgress62, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupEgress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), authorizeSecurityGroupEgress62, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "authorizeSecurityGroupEgress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8394,8 +8525,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultauthorizeSecurityGroupEgress((com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -8490,9 +8622,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse associateAddress( - com.amazon.ec2.client.AmazonEC2Stub.AssociateAddress associateAddress64) + com.amazon.ec2.client.AmazonEC2Stub.AssociateAddress associateAddress64) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -8509,8 +8641,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateAddress64, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateAddress64, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateAddress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8523,11 +8656,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse)object; @@ -8590,11 +8724,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startassociateAddress( - com.amazon.ec2.client.AmazonEC2Stub.AssociateAddress associateAddress64, + com.amazon.ec2.client.AmazonEC2Stub.AssociateAddress associateAddress64, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[32].getName()); _operationClient.getOptions().setAction("AssociateAddress"); @@ -8608,8 +8742,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateAddress64, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateAddress64, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateAddress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8624,8 +8759,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultassociateAddress((com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -8720,9 +8856,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse describeImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute describeImageAttribute66) + com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute describeImageAttribute66) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -8739,8 +8875,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImageAttribute66, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImageAttribute66, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImageAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8753,11 +8890,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse)object; @@ -8820,11 +8959,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute describeImageAttribute66, + com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute describeImageAttribute66, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[33].getName()); _operationClient.getOptions().setAction("DescribeImageAttribute"); @@ -8838,8 +8977,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImageAttribute66, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeImageAttribute66, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeImageAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8854,8 +8994,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeImageAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -8950,9 +9091,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse describeSpotPriceHistory( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory describeSpotPriceHistory68) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory describeSpotPriceHistory68) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -8969,8 +9110,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotPriceHistory68, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotPriceHistory"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotPriceHistory68, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotPriceHistory"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -8983,11 +9125,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse)object; @@ -9050,11 +9194,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSpotPriceHistory( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory describeSpotPriceHistory68, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory describeSpotPriceHistory68, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[34].getName()); _operationClient.getOptions().setAction("DescribeSpotPriceHistory"); @@ -9068,8 +9212,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotPriceHistory68, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotPriceHistory"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotPriceHistory68, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotPriceHistory"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9084,8 +9229,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSpotPriceHistory((com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -9180,9 +9326,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse modifySnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute modifySnapshotAttribute70) + com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute modifySnapshotAttribute70) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -9199,8 +9345,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifySnapshotAttribute70, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifySnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifySnapshotAttribute70, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifySnapshotAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9213,11 +9360,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse)object; @@ -9280,11 +9429,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmodifySnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute modifySnapshotAttribute70, + com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute modifySnapshotAttribute70, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[35].getName()); _operationClient.getOptions().setAction("ModifySnapshotAttribute"); @@ -9298,8 +9447,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifySnapshotAttribute70, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifySnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifySnapshotAttribute70, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifySnapshotAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9314,8 +9464,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmodifySnapshotAttribute((com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -9410,9 +9561,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests describeSpotInstanceRequests72) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests describeSpotInstanceRequests72) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -9429,8 +9580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotInstanceRequests72, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotInstanceRequests"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotInstanceRequests72, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotInstanceRequests"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9443,11 +9595,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse)object; @@ -9510,11 +9664,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSpotInstanceRequests( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests describeSpotInstanceRequests72, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests describeSpotInstanceRequests72, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[36].getName()); _operationClient.getOptions().setAction("DescribeSpotInstanceRequests"); @@ -9528,8 +9682,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotInstanceRequests72, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotInstanceRequests"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotInstanceRequests72, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotInstanceRequests"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9544,8 +9699,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSpotInstanceRequests((com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -9640,9 +9796,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse importInstance( - com.amazon.ec2.client.AmazonEC2Stub.ImportInstance importInstance74) + com.amazon.ec2.client.AmazonEC2Stub.ImportInstance importInstance74) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -9659,8 +9815,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importInstance74, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importInstance74, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9673,11 +9830,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse)object; @@ -9740,11 +9898,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startimportInstance( - com.amazon.ec2.client.AmazonEC2Stub.ImportInstance importInstance74, + com.amazon.ec2.client.AmazonEC2Stub.ImportInstance importInstance74, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[37].getName()); _operationClient.getOptions().setAction("ImportInstance"); @@ -9758,8 +9916,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importInstance74, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importInstance74, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9774,8 +9933,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultimportInstance((com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -9870,9 +10029,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse describeKeyPairs( - com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairs describeKeyPairs76) + com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairs describeKeyPairs76) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -9889,8 +10048,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeKeyPairs76, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeKeyPairs"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeKeyPairs76, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeKeyPairs"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -9903,11 +10063,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse)object; @@ -9970,11 +10131,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeKeyPairs( - com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairs describeKeyPairs76, + com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairs describeKeyPairs76, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[38].getName()); _operationClient.getOptions().setAction("DescribeKeyPairs"); @@ -9988,8 +10149,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeKeyPairs76, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeKeyPairs"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeKeyPairs76, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeKeyPairs"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10004,8 +10166,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeKeyPairs((com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -10100,9 +10263,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress( - com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress revokeSecurityGroupIngress78) + com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress revokeSecurityGroupIngress78) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -10119,8 +10282,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupIngress78, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupIngress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupIngress78, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupIngress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10133,11 +10297,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse)object; @@ -10200,11 +10366,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startrevokeSecurityGroupIngress( - com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress revokeSecurityGroupIngress78, + com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress revokeSecurityGroupIngress78, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[39].getName()); _operationClient.getOptions().setAction("RevokeSecurityGroupIngress"); @@ -10218,8 +10384,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupIngress78, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupIngress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupIngress78, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupIngress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10234,8 +10401,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultrevokeSecurityGroupIngress((com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -10330,9 +10498,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse createPlacementGroup( - com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroup createPlacementGroup80) + com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroup createPlacementGroup80) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -10349,8 +10517,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createPlacementGroup80, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createPlacementGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createPlacementGroup80, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createPlacementGroup"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10363,11 +10532,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse)object; @@ -10430,11 +10600,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreatePlacementGroup( - com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroup createPlacementGroup80, + com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroup createPlacementGroup80, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[40].getName()); _operationClient.getOptions().setAction("CreatePlacementGroup"); @@ -10448,8 +10618,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createPlacementGroup80, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createPlacementGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createPlacementGroup80, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createPlacementGroup"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10464,8 +10635,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreatePlacementGroup((com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -10560,9 +10732,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse deleteNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry deleteNetworkAclEntry82) + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry deleteNetworkAclEntry82) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -10579,8 +10751,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAclEntry82, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAclEntry82, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAclEntry"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10593,11 +10766,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse)object; @@ -10660,11 +10834,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteNetworkAclEntry( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry deleteNetworkAclEntry82, + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry deleteNetworkAclEntry82, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[41].getName()); _operationClient.getOptions().setAction("DeleteNetworkAclEntry"); @@ -10678,8 +10852,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAclEntry82, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAclEntry"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAclEntry82, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAclEntry"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10694,8 +10869,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteNetworkAclEntry((com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -10790,9 +10966,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse activateLicense( - com.amazon.ec2.client.AmazonEC2Stub.ActivateLicense activateLicense84) + com.amazon.ec2.client.AmazonEC2Stub.ActivateLicense activateLicense84) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -10809,8 +10985,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), activateLicense84, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "activateLicense"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), activateLicense84, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "activateLicense"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10823,11 +11000,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse)object; @@ -10890,11 +11068,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startactivateLicense( - com.amazon.ec2.client.AmazonEC2Stub.ActivateLicense activateLicense84, + com.amazon.ec2.client.AmazonEC2Stub.ActivateLicense activateLicense84, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[42].getName()); _operationClient.getOptions().setAction("ActivateLicense"); @@ -10908,8 +11086,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), activateLicense84, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "activateLicense"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), activateLicense84, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "activateLicense"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -10924,8 +11103,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultactivateLicense((com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -11020,9 +11199,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse deleteRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTable deleteRouteTable86) + com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTable deleteRouteTable86) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -11039,8 +11218,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRouteTable86, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRouteTable86, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRouteTable"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11053,11 +11233,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse)object; @@ -11120,11 +11301,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTable deleteRouteTable86, + com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTable deleteRouteTable86, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[43].getName()); _operationClient.getOptions().setAction("DeleteRouteTable"); @@ -11138,8 +11319,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRouteTable86, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRouteTable86, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRouteTable"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11154,8 +11336,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteRouteTable((com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -11250,9 +11433,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse unmonitorInstances( - com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstances unmonitorInstances88) + com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstances unmonitorInstances88) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -11269,8 +11452,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unmonitorInstances88, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "unmonitorInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unmonitorInstances88, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "unmonitorInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11283,11 +11467,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse)object; @@ -11350,11 +11535,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startunmonitorInstances( - com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstances unmonitorInstances88, + com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstances unmonitorInstances88, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[44].getName()); _operationClient.getOptions().setAction("UnmonitorInstances"); @@ -11368,8 +11553,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unmonitorInstances88, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "unmonitorInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unmonitorInstances88, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "unmonitorInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11384,8 +11570,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultunmonitorInstances((com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -11480,9 +11667,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse startInstances( - com.amazon.ec2.client.AmazonEC2Stub.StartInstances startInstances90) + com.amazon.ec2.client.AmazonEC2Stub.StartInstances startInstances90) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -11499,8 +11686,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), startInstances90, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "startInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), startInstances90, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "startInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11513,11 +11701,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse)object; @@ -11580,11 +11769,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startstartInstances( - com.amazon.ec2.client.AmazonEC2Stub.StartInstances startInstances90, + com.amazon.ec2.client.AmazonEC2Stub.StartInstances startInstances90, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[45].getName()); _operationClient.getOptions().setAction("StartInstances"); @@ -11598,8 +11787,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), startInstances90, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "startInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), startInstances90, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "startInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11614,8 +11804,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultstartInstances((com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -11710,9 +11900,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse confirmProductInstance( - com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance confirmProductInstance92) + com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance confirmProductInstance92) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -11729,8 +11919,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), confirmProductInstance92, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "confirmProductInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), confirmProductInstance92, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "confirmProductInstance"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11743,11 +11934,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse)object; @@ -11810,11 +12003,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startconfirmProductInstance( - com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance confirmProductInstance92, + com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance confirmProductInstance92, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[46].getName()); _operationClient.getOptions().setAction("ConfirmProductInstance"); @@ -11828,8 +12021,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), confirmProductInstance92, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "confirmProductInstance"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), confirmProductInstance92, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "confirmProductInstance"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11844,8 +12038,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultconfirmProductInstance((com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -11940,9 +12135,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute94) + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute94) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -11959,8 +12154,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaceAttribute94, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaceAttribute94, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -11973,11 +12169,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse)object; @@ -12040,11 +12238,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute94, + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute94, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[47].getName()); _operationClient.getOptions().setAction("DescribeNetworkInterfaceAttribute"); @@ -12058,8 +12256,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaceAttribute94, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaceAttribute94, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12074,8 +12273,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeNetworkInterfaceAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -12170,9 +12370,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse runInstances( - com.amazon.ec2.client.AmazonEC2Stub.RunInstances runInstances96) + com.amazon.ec2.client.AmazonEC2Stub.RunInstances runInstances96) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -12189,8 +12389,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), runInstances96, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "runInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), runInstances96, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "runInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12203,11 +12404,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse)object; @@ -12270,11 +12472,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startrunInstances( - com.amazon.ec2.client.AmazonEC2Stub.RunInstances runInstances96, + com.amazon.ec2.client.AmazonEC2Stub.RunInstances runInstances96, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[48].getName()); _operationClient.getOptions().setAction("RunInstances"); @@ -12288,8 +12490,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), runInstances96, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "runInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), runInstances96, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "runInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12304,8 +12507,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultrunInstances((com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -12400,9 +12603,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse createReservedInstancesListing( - com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing createReservedInstancesListing98) + com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing createReservedInstancesListing98) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -12419,8 +12622,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createReservedInstancesListing98, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createReservedInstancesListing"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createReservedInstancesListing98, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createReservedInstancesListing"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12433,11 +12637,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse)object; @@ -12500,11 +12706,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateReservedInstancesListing( - com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing createReservedInstancesListing98, + com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing createReservedInstancesListing98, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[49].getName()); _operationClient.getOptions().setAction("CreateReservedInstancesListing"); @@ -12518,8 +12724,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createReservedInstancesListing98, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createReservedInstancesListing"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createReservedInstancesListing98, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createReservedInstancesListing"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12534,8 +12741,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateReservedInstancesListing((com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -12630,9 +12838,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse createCustomerGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway createCustomerGateway100) + com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway createCustomerGateway100) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -12649,8 +12857,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createCustomerGateway100, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createCustomerGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createCustomerGateway100, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createCustomerGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12663,11 +12872,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse)object; @@ -12730,11 +12940,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateCustomerGateway( - com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway createCustomerGateway100, + com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway createCustomerGateway100, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[50].getName()); _operationClient.getOptions().setAction("CreateCustomerGateway"); @@ -12748,8 +12958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createCustomerGateway100, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createCustomerGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createCustomerGateway100, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createCustomerGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12764,8 +12975,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateCustomerGateway((com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -12860,9 +13072,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse createNetworkAcl( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAcl createNetworkAcl102) + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAcl createNetworkAcl102) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -12879,8 +13091,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAcl102, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAcl"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAcl102, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAcl"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12893,11 +13106,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse)object; @@ -12960,11 +13174,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateNetworkAcl( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAcl createNetworkAcl102, + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAcl createNetworkAcl102, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[51].getName()); _operationClient.getOptions().setAction("CreateNetworkAcl"); @@ -12978,8 +13192,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAcl102, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAcl"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkAcl102, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkAcl"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -12994,8 +13209,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateNetworkAcl((com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -13090,9 +13306,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse resetImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttribute resetImageAttribute104) + com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttribute resetImageAttribute104) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -13109,8 +13325,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetImageAttribute104, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetImageAttribute104, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetImageAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13123,11 +13340,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse)object; @@ -13190,11 +13408,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startresetImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttribute resetImageAttribute104, + com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttribute resetImageAttribute104, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[52].getName()); _operationClient.getOptions().setAction("ResetImageAttribute"); @@ -13208,8 +13426,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetImageAttribute104, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetImageAttribute104, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetImageAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13224,8 +13443,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultresetImageAttribute((com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -13320,9 +13540,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse modifyVolumeAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute modifyVolumeAttribute106) + com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute modifyVolumeAttribute106) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -13339,8 +13559,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyVolumeAttribute106, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyVolumeAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyVolumeAttribute106, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyVolumeAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13353,11 +13574,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse)object; @@ -13420,11 +13642,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmodifyVolumeAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute modifyVolumeAttribute106, + com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute modifyVolumeAttribute106, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[53].getName()); _operationClient.getOptions().setAction("ModifyVolumeAttribute"); @@ -13438,8 +13660,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyVolumeAttribute106, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyVolumeAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyVolumeAttribute106, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyVolumeAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13454,8 +13677,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmodifyVolumeAttribute((com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -13550,9 +13774,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse describeReservedInstances( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances describeReservedInstances108) + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances describeReservedInstances108) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -13569,8 +13793,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstances108, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstances108, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13583,11 +13808,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse)object; @@ -13650,11 +13877,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeReservedInstances( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances describeReservedInstances108, + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances describeReservedInstances108, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[54].getName()); _operationClient.getOptions().setAction("DescribeReservedInstances"); @@ -13668,8 +13895,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstances108, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstances108, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13684,8 +13912,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeReservedInstances((com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -13780,9 +14009,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse resetSnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute resetSnapshotAttribute110) + com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute resetSnapshotAttribute110) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -13799,8 +14028,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetSnapshotAttribute110, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetSnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetSnapshotAttribute110, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetSnapshotAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13813,11 +14043,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse)object; @@ -13880,11 +14112,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startresetSnapshotAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute resetSnapshotAttribute110, + com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute resetSnapshotAttribute110, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[55].getName()); _operationClient.getOptions().setAction("ResetSnapshotAttribute"); @@ -13898,8 +14130,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetSnapshotAttribute110, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "resetSnapshotAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), resetSnapshotAttribute110, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "resetSnapshotAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -13914,8 +14147,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultresetSnapshotAttribute((com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -14010,9 +14244,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse deleteVolume( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume deleteVolume112) + com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume deleteVolume112) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -14029,8 +14263,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVolume112, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVolume112, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVolume"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14043,11 +14278,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse)object; @@ -14110,11 +14346,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteVolume( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume deleteVolume112, + com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume deleteVolume112, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[56].getName()); _operationClient.getOptions().setAction("DeleteVolume"); @@ -14128,8 +14364,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVolume112, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVolume112, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVolume"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14144,8 +14381,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteVolume((com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -14240,9 +14477,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse describeAvailabilityZones( - com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones describeAvailabilityZones114) + com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones describeAvailabilityZones114) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -14259,8 +14496,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAvailabilityZones114, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAvailabilityZones"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAvailabilityZones114, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAvailabilityZones"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14273,11 +14511,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse)object; @@ -14340,11 +14580,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeAvailabilityZones( - com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones describeAvailabilityZones114, + com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones describeAvailabilityZones114, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[57].getName()); _operationClient.getOptions().setAction("DescribeAvailabilityZones"); @@ -14358,8 +14598,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAvailabilityZones114, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAvailabilityZones"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAvailabilityZones114, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAvailabilityZones"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14374,8 +14615,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeAvailabilityZones((com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -14470,9 +14712,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse createVpnConnection( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnection createVpnConnection116) + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnection createVpnConnection116) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -14489,8 +14731,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnection116, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnection"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnection116, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnection"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14503,11 +14746,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse)object; @@ -14570,11 +14814,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateVpnConnection( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnection createVpnConnection116, + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnection createVpnConnection116, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[58].getName()); _operationClient.getOptions().setAction("CreateVpnConnection"); @@ -14588,8 +14832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnection116, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnection"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnection116, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnection"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14604,8 +14849,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateVpnConnection((com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -14700,9 +14946,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse cancelBundleTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTask cancelBundleTask118) + com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTask cancelBundleTask118) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -14719,8 +14965,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelBundleTask118, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelBundleTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelBundleTask118, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelBundleTask"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14733,11 +14980,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse)object; @@ -14800,11 +15048,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcancelBundleTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTask cancelBundleTask118, + com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTask cancelBundleTask118, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[59].getName()); _operationClient.getOptions().setAction("CancelBundleTask"); @@ -14818,8 +15066,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelBundleTask118, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelBundleTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelBundleTask118, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelBundleTask"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14834,8 +15083,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcancelBundleTask((com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -14930,9 +15180,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation replaceNetworkAclAssociation120) + com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation replaceNetworkAclAssociation120) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -14949,8 +15199,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclAssociation120, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclAssociation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclAssociation120, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclAssociation"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -14963,11 +15214,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse)object; @@ -15030,11 +15283,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreplaceNetworkAclAssociation( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation replaceNetworkAclAssociation120, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation replaceNetworkAclAssociation120, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[60].getName()); _operationClient.getOptions().setAction("ReplaceNetworkAclAssociation"); @@ -15048,8 +15301,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclAssociation120, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclAssociation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceNetworkAclAssociation120, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceNetworkAclAssociation"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15064,8 +15318,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultreplaceNetworkAclAssociation((com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -15160,9 +15415,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse detachVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGateway detachVpnGateway122) + com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGateway detachVpnGateway122) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -15179,8 +15434,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVpnGateway122, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVpnGateway122, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVpnGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15193,11 +15449,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse)object; @@ -15260,11 +15517,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdetachVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGateway detachVpnGateway122, + com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGateway detachVpnGateway122, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[61].getName()); _operationClient.getOptions().setAction("DetachVpnGateway"); @@ -15278,8 +15535,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVpnGateway122, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVpnGateway122, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVpnGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15294,8 +15552,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdetachVpnGateway((com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -15390,9 +15649,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse describeSnapshots( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshots describeSnapshots124) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshots describeSnapshots124) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -15409,8 +15668,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshots124, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshots"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshots124, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshots"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15423,11 +15683,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse)object; @@ -15490,11 +15751,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSnapshots( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshots describeSnapshots124, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshots describeSnapshots124, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[62].getName()); _operationClient.getOptions().setAction("DescribeSnapshots"); @@ -15508,8 +15769,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshots124, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshots"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSnapshots124, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSnapshots"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15524,8 +15786,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSnapshots((com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -15620,9 +15883,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse deleteSubnet( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet deleteSubnet126) + com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet deleteSubnet126) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -15639,8 +15902,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSubnet126, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSubnet"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSubnet126, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSubnet"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15653,11 +15917,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse)object; @@ -15720,11 +15985,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteSubnet( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet deleteSubnet126, + com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet deleteSubnet126, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[63].getName()); _operationClient.getOptions().setAction("DeleteSubnet"); @@ -15738,8 +16003,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSubnet126, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSubnet"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSubnet126, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSubnet"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15754,8 +16020,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteSubnet((com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -15850,9 +16116,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse describeBundleTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasks describeBundleTasks128) + com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasks describeBundleTasks128) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -15869,8 +16135,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeBundleTasks128, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeBundleTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeBundleTasks128, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeBundleTasks"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15883,11 +16150,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse)object; @@ -15950,11 +16218,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeBundleTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasks describeBundleTasks128, + com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasks describeBundleTasks128, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[64].getName()); _operationClient.getOptions().setAction("DescribeBundleTasks"); @@ -15968,8 +16236,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeBundleTasks128, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeBundleTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeBundleTasks128, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeBundleTasks"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -15984,8 +16253,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeBundleTasks((com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -16080,9 +16350,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse createKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPair createKeyPair130) + com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPair createKeyPair130) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -16099,8 +16369,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createKeyPair130, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createKeyPair130, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createKeyPair"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16113,11 +16384,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse)object; @@ -16180,11 +16452,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPair createKeyPair130, + com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPair createKeyPair130, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[65].getName()); _operationClient.getOptions().setAction("CreateKeyPair"); @@ -16198,8 +16470,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createKeyPair130, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createKeyPair130, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createKeyPair"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16214,8 +16487,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateKeyPair((com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -16310,9 +16583,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse createImage( - com.amazon.ec2.client.AmazonEC2Stub.CreateImage createImage132) + com.amazon.ec2.client.AmazonEC2Stub.CreateImage createImage132) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -16329,8 +16602,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createImage132, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createImage132, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createImage"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16343,11 +16617,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse)object; @@ -16410,11 +16685,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateImage( - com.amazon.ec2.client.AmazonEC2Stub.CreateImage createImage132, + com.amazon.ec2.client.AmazonEC2Stub.CreateImage createImage132, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[66].getName()); _operationClient.getOptions().setAction("CreateImage"); @@ -16428,8 +16703,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createImage132, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createImage132, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createImage"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16444,8 +16720,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateImage((com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -16540,9 +16816,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse enableVgwRoutePropagation( - com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation enableVgwRoutePropagation134) + com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation enableVgwRoutePropagation134) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -16559,8 +16835,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVgwRoutePropagation134, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVgwRoutePropagation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVgwRoutePropagation134, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVgwRoutePropagation"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16573,11 +16850,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse)object; @@ -16640,11 +16919,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startenableVgwRoutePropagation( - com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation enableVgwRoutePropagation134, + com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation enableVgwRoutePropagation134, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[67].getName()); _operationClient.getOptions().setAction("EnableVgwRoutePropagation"); @@ -16658,8 +16937,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVgwRoutePropagation134, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVgwRoutePropagation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVgwRoutePropagation134, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVgwRoutePropagation"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16674,8 +16954,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultenableVgwRoutePropagation((com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -16770,9 +17051,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses( - com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses unassignPrivateIpAddresses136) + com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses unassignPrivateIpAddresses136) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -16789,8 +17070,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unassignPrivateIpAddresses136, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "unassignPrivateIpAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unassignPrivateIpAddresses136, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "unassignPrivateIpAddresses"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16803,11 +17085,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse)object; @@ -16870,11 +17154,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startunassignPrivateIpAddresses( - com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses unassignPrivateIpAddresses136, + com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses unassignPrivateIpAddresses136, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[68].getName()); _operationClient.getOptions().setAction("UnassignPrivateIpAddresses"); @@ -16888,8 +17172,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unassignPrivateIpAddresses136, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "unassignPrivateIpAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), unassignPrivateIpAddresses136, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "unassignPrivateIpAddresses"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -16904,8 +17189,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultunassignPrivateIpAddresses((com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -17000,9 +17286,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse deregisterImage( - com.amazon.ec2.client.AmazonEC2Stub.DeregisterImage deregisterImage138) + com.amazon.ec2.client.AmazonEC2Stub.DeregisterImage deregisterImage138) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -17019,8 +17305,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deregisterImage138, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deregisterImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deregisterImage138, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deregisterImage"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17033,11 +17320,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse)object; @@ -17100,11 +17388,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startderegisterImage( - com.amazon.ec2.client.AmazonEC2Stub.DeregisterImage deregisterImage138, + com.amazon.ec2.client.AmazonEC2Stub.DeregisterImage deregisterImage138, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[69].getName()); _operationClient.getOptions().setAction("DeregisterImage"); @@ -17118,8 +17406,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deregisterImage138, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deregisterImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deregisterImage138, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deregisterImage"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17134,8 +17423,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultderegisterImage((com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -17230,9 +17519,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute deleteVpnConnectionRoute140) + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute deleteVpnConnectionRoute140) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -17249,8 +17538,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnectionRoute140, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnectionRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnectionRoute140, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnectionRoute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17263,11 +17553,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse)object; @@ -17330,11 +17622,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteVpnConnectionRoute( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute deleteVpnConnectionRoute140, + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute deleteVpnConnectionRoute140, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[70].getName()); _operationClient.getOptions().setAction("DeleteVpnConnectionRoute"); @@ -17348,8 +17640,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnectionRoute140, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnectionRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnectionRoute140, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnectionRoute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17364,8 +17657,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteVpnConnectionRoute((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -17460,9 +17754,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse modifyImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttribute modifyImageAttribute142) + com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttribute modifyImageAttribute142) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -17479,8 +17773,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyImageAttribute142, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyImageAttribute142, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyImageAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17493,11 +17788,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse)object; @@ -17560,11 +17856,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmodifyImageAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttribute modifyImageAttribute142, + com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttribute modifyImageAttribute142, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[71].getName()); _operationClient.getOptions().setAction("ModifyImageAttribute"); @@ -17578,8 +17874,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyImageAttribute142, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyImageAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyImageAttribute142, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyImageAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17594,8 +17891,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmodifyImageAttribute((com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -17690,9 +17988,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse cancelConversionTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTask cancelConversionTask144) + com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTask cancelConversionTask144) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -17709,8 +18007,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelConversionTask144, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelConversionTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelConversionTask144, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelConversionTask"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17723,11 +18022,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse)object; @@ -17790,11 +18090,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcancelConversionTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTask cancelConversionTask144, + com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTask cancelConversionTask144, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[72].getName()); _operationClient.getOptions().setAction("CancelConversionTask"); @@ -17808,8 +18108,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelConversionTask144, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelConversionTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelConversionTask144, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelConversionTask"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17824,8 +18125,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcancelConversionTask((com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -17920,9 +18222,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse describeVolumes( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumes describeVolumes146) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumes describeVolumes146) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -17939,8 +18241,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumes146, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumes"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumes146, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumes"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -17953,11 +18256,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse)object; @@ -18020,11 +18324,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVolumes( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumes describeVolumes146, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumes describeVolumes146, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[73].getName()); _operationClient.getOptions().setAction("DescribeVolumes"); @@ -18038,8 +18342,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumes146, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumes"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumes146, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumes"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18054,8 +18359,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVolumes((com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -18150,9 +18455,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse cancelReservedInstancesListing( - com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing cancelReservedInstancesListing148) + com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing cancelReservedInstancesListing148) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -18169,8 +18474,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelReservedInstancesListing148, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelReservedInstancesListing"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelReservedInstancesListing148, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "cancelReservedInstancesListing"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18183,11 +18489,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse)object; @@ -18250,11 +18558,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcancelReservedInstancesListing( - com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing cancelReservedInstancesListing148, + com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing cancelReservedInstancesListing148, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[74].getName()); _operationClient.getOptions().setAction("CancelReservedInstancesListing"); @@ -18268,8 +18576,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelReservedInstancesListing148, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelReservedInstancesListing"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelReservedInstancesListing148, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelReservedInstancesListing"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18284,8 +18593,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcancelReservedInstancesListing((com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -18380,9 +18690,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse getPasswordData( - com.amazon.ec2.client.AmazonEC2Stub.GetPasswordData getPasswordData150) + com.amazon.ec2.client.AmazonEC2Stub.GetPasswordData getPasswordData150) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -18399,8 +18709,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getPasswordData150, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "getPasswordData"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getPasswordData150, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "getPasswordData"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18413,11 +18724,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse)object; @@ -18480,11 +18792,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startgetPasswordData( - com.amazon.ec2.client.AmazonEC2Stub.GetPasswordData getPasswordData150, + com.amazon.ec2.client.AmazonEC2Stub.GetPasswordData getPasswordData150, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[75].getName()); _operationClient.getOptions().setAction("GetPasswordData"); @@ -18498,8 +18810,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getPasswordData150, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "getPasswordData"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getPasswordData150, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "getPasswordData"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18514,8 +18827,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetPasswordData((com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -18610,9 +18923,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse allocateAddress( - com.amazon.ec2.client.AmazonEC2Stub.AllocateAddress allocateAddress152) + com.amazon.ec2.client.AmazonEC2Stub.AllocateAddress allocateAddress152) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -18629,8 +18942,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), allocateAddress152, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "allocateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), allocateAddress152, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "allocateAddress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18643,11 +18957,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse)object; @@ -18710,11 +19025,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startallocateAddress( - com.amazon.ec2.client.AmazonEC2Stub.AllocateAddress allocateAddress152, + com.amazon.ec2.client.AmazonEC2Stub.AllocateAddress allocateAddress152, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[76].getName()); _operationClient.getOptions().setAction("AllocateAddress"); @@ -18728,8 +19043,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), allocateAddress152, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "allocateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), allocateAddress152, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "allocateAddress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18744,8 +19060,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultallocateAddress((com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -18840,9 +19156,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse deleteSecurityGroup( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroup deleteSecurityGroup154) + com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroup deleteSecurityGroup154) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -18859,8 +19175,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSecurityGroup154, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSecurityGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSecurityGroup154, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSecurityGroup"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18873,11 +19190,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse)object; @@ -18940,11 +19258,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteSecurityGroup( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroup deleteSecurityGroup154, + com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroup deleteSecurityGroup154, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[77].getName()); _operationClient.getOptions().setAction("DeleteSecurityGroup"); @@ -18958,8 +19276,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSecurityGroup154, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSecurityGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSecurityGroup154, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSecurityGroup"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -18974,8 +19293,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteSecurityGroup((com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -19070,9 +19390,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse deletePlacementGroup( - com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroup deletePlacementGroup156) + com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroup deletePlacementGroup156) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -19089,8 +19409,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deletePlacementGroup156, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deletePlacementGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deletePlacementGroup156, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deletePlacementGroup"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19103,11 +19424,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse)object; @@ -19170,11 +19492,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeletePlacementGroup( - com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroup deletePlacementGroup156, + com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroup deletePlacementGroup156, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[78].getName()); _operationClient.getOptions().setAction("DeletePlacementGroup"); @@ -19188,8 +19510,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deletePlacementGroup156, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deletePlacementGroup"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deletePlacementGroup156, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deletePlacementGroup"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19204,8 +19527,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeletePlacementGroup((com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -19300,9 +19624,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse disassociateAddress( - com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddress disassociateAddress158) + com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddress disassociateAddress158) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -19319,8 +19643,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateAddress158, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateAddress158, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateAddress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19333,11 +19658,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse)object; @@ -19400,11 +19726,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdisassociateAddress( - com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddress disassociateAddress158, + com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddress disassociateAddress158, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[79].getName()); _operationClient.getOptions().setAction("DisassociateAddress"); @@ -19418,8 +19744,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateAddress158, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disassociateAddress158, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disassociateAddress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19434,8 +19761,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdisassociateAddress((com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -19530,9 +19858,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse deleteDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptions deleteDhcpOptions160) + com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptions deleteDhcpOptions160) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -19549,8 +19877,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteDhcpOptions160, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteDhcpOptions160, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteDhcpOptions"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19563,11 +19892,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse)object; @@ -19630,11 +19960,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptions deleteDhcpOptions160, + com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptions deleteDhcpOptions160, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[80].getName()); _operationClient.getOptions().setAction("DeleteDhcpOptions"); @@ -19648,8 +19978,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteDhcpOptions160, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteDhcpOptions160, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteDhcpOptions"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19664,8 +19995,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -19760,9 +20092,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -19779,8 +20111,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotDatafeedSubscription162, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotDatafeedSubscription162, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotDatafeedSubscription"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19793,11 +20126,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse)object; @@ -19860,11 +20195,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[81].getName()); _operationClient.getOptions().setAction("DescribeSpotDatafeedSubscription"); @@ -19878,8 +20213,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotDatafeedSubscription162, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSpotDatafeedSubscription162, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSpotDatafeedSubscription"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -19894,8 +20230,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSpotDatafeedSubscription((com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -19990,9 +20327,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse describeNetworkAcls( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAcls describeNetworkAcls164) + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAcls describeNetworkAcls164) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -20009,8 +20346,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkAcls164, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkAcls"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkAcls164, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkAcls"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20023,11 +20361,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse)object; @@ -20090,11 +20429,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeNetworkAcls( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAcls describeNetworkAcls164, + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAcls describeNetworkAcls164, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[82].getName()); _operationClient.getOptions().setAction("DescribeNetworkAcls"); @@ -20108,8 +20447,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkAcls164, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkAcls"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkAcls164, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkAcls"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20124,8 +20464,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeNetworkAcls((com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -20220,9 +20561,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse enableVolumeIO( - com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIO enableVolumeIO166) + com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIO enableVolumeIO166) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -20239,8 +20580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVolumeIO166, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVolumeIO"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVolumeIO166, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVolumeIO"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20253,11 +20595,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse)object; @@ -20320,11 +20663,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startenableVolumeIO( - com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIO enableVolumeIO166, + com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIO enableVolumeIO166, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[83].getName()); _operationClient.getOptions().setAction("EnableVolumeIO"); @@ -20338,8 +20681,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVolumeIO166, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVolumeIO"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), enableVolumeIO166, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "enableVolumeIO"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20354,8 +20698,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultenableVolumeIO((com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -20450,9 +20794,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse attachVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGateway attachVpnGateway168) + com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGateway attachVpnGateway168) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -20469,8 +20813,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVpnGateway168, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVpnGateway168, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVpnGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20483,11 +20828,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse)object; @@ -20550,11 +20896,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startattachVpnGateway( - com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGateway attachVpnGateway168, + com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGateway attachVpnGateway168, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[84].getName()); _operationClient.getOptions().setAction("AttachVpnGateway"); @@ -20568,8 +20914,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVpnGateway168, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVpnGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVpnGateway168, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVpnGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20584,8 +20931,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultattachVpnGateway((com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -20680,9 +21028,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse describeInternetGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways describeInternetGateways170) + com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways describeInternetGateways170) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -20699,8 +21047,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInternetGateways170, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInternetGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInternetGateways170, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInternetGateways"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20713,11 +21062,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse)object; @@ -20780,11 +21131,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeInternetGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways describeInternetGateways170, + com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways describeInternetGateways170, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[85].getName()); _operationClient.getOptions().setAction("DescribeInternetGateways"); @@ -20798,8 +21149,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInternetGateways170, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInternetGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInternetGateways170, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInternetGateways"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20814,8 +21166,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeInternetGateways((com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -20910,9 +21263,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse describeDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptions describeDhcpOptions172) + com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptions describeDhcpOptions172) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -20929,8 +21282,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeDhcpOptions172, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeDhcpOptions172, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeDhcpOptions"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -20943,11 +21297,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse)object; @@ -21010,11 +21365,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeDhcpOptions( - com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptions describeDhcpOptions172, + com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptions describeDhcpOptions172, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[86].getName()); _operationClient.getOptions().setAction("DescribeDhcpOptions"); @@ -21028,8 +21383,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeDhcpOptions172, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeDhcpOptions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeDhcpOptions172, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeDhcpOptions"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21044,8 +21400,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeDhcpOptions((com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -21140,9 +21497,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) + com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -21159,8 +21516,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSpotDatafeedSubscription174, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSpotDatafeedSubscription174, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createSpotDatafeedSubscription"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21173,11 +21531,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse)object; @@ -21240,11 +21600,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174, + com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[87].getName()); _operationClient.getOptions().setAction("CreateSpotDatafeedSubscription"); @@ -21258,8 +21618,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSpotDatafeedSubscription174, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSpotDatafeedSubscription174, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSpotDatafeedSubscription"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21274,8 +21635,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateSpotDatafeedSubscription((com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -21370,9 +21732,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse describeReservedInstancesListings( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings describeReservedInstancesListings176) + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings describeReservedInstancesListings176) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -21389,8 +21751,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesListings176, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesListings"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesListings176, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesListings"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21403,11 +21766,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse)object; @@ -21470,11 +21835,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeReservedInstancesListings( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings describeReservedInstancesListings176, + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings describeReservedInstancesListings176, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[88].getName()); _operationClient.getOptions().setAction("DescribeReservedInstancesListings"); @@ -21488,8 +21853,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesListings176, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesListings"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesListings176, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesListings"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21504,8 +21870,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeReservedInstancesListings((com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -21600,9 +21967,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse describeInstanceStatus( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus describeInstanceStatus178) + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus describeInstanceStatus178) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -21619,8 +21986,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceStatus178, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceStatus178, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceStatus"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21633,11 +22001,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse)object; @@ -21700,11 +22070,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeInstanceStatus( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus describeInstanceStatus178, + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus describeInstanceStatus178, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[89].getName()); _operationClient.getOptions().setAction("DescribeInstanceStatus"); @@ -21718,8 +22088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceStatus178, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceStatus178, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceStatus"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21734,8 +22105,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeInstanceStatus((com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -21830,9 +22202,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) + com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -21849,8 +22221,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyNetworkInterfaceAttribute180, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyNetworkInterfaceAttribute180, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "modifyNetworkInterfaceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21863,11 +22236,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse)object; @@ -21930,11 +22305,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmodifyNetworkInterfaceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180, + com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[90].getName()); _operationClient.getOptions().setAction("ModifyNetworkInterfaceAttribute"); @@ -21948,8 +22323,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyNetworkInterfaceAttribute180, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyNetworkInterfaceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyNetworkInterfaceAttribute180, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyNetworkInterfaceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -21964,8 +22340,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmodifyNetworkInterfaceAttribute((com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -22060,9 +22437,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse disableVgwRoutePropagation( - com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation disableVgwRoutePropagation182) + com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation disableVgwRoutePropagation182) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -22079,8 +22456,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disableVgwRoutePropagation182, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disableVgwRoutePropagation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disableVgwRoutePropagation182, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disableVgwRoutePropagation"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22093,11 +22471,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse)object; @@ -22160,11 +22540,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdisableVgwRoutePropagation( - com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation disableVgwRoutePropagation182, + com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation disableVgwRoutePropagation182, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[91].getName()); _operationClient.getOptions().setAction("DisableVgwRoutePropagation"); @@ -22178,8 +22558,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disableVgwRoutePropagation182, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "disableVgwRoutePropagation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), disableVgwRoutePropagation182, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "disableVgwRoutePropagation"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22194,8 +22575,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdisableVgwRoutePropagation((com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -22290,9 +22672,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse describeVolumeStatus( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatus describeVolumeStatus184) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatus describeVolumeStatus184) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -22309,8 +22691,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeStatus184, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeStatus184, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeStatus"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22323,11 +22706,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse)object; @@ -22390,11 +22774,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVolumeStatus( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatus describeVolumeStatus184, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatus describeVolumeStatus184, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[92].getName()); _operationClient.getOptions().setAction("DescribeVolumeStatus"); @@ -22408,8 +22792,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeStatus184, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVolumeStatus184, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVolumeStatus"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22424,8 +22809,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVolumeStatus((com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -22520,9 +22906,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse detachNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface detachNetworkInterface186) + com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface detachNetworkInterface186) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -22539,8 +22925,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachNetworkInterface186, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachNetworkInterface186, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachNetworkInterface"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22553,11 +22940,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse)object; @@ -22620,11 +23009,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdetachNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface detachNetworkInterface186, + com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface detachNetworkInterface186, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[93].getName()); _operationClient.getOptions().setAction("DetachNetworkInterface"); @@ -22638,8 +23027,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachNetworkInterface186, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachNetworkInterface186, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachNetworkInterface"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22654,8 +23044,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdetachNetworkInterface((com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -22750,9 +23141,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse describeSecurityGroups( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups describeSecurityGroups188) + com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups describeSecurityGroups188) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -22769,8 +23160,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSecurityGroups188, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSecurityGroups"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSecurityGroups188, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSecurityGroups"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22783,11 +23175,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse)object; @@ -22850,11 +23244,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeSecurityGroups( - com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups describeSecurityGroups188, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups describeSecurityGroups188, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[94].getName()); _operationClient.getOptions().setAction("DescribeSecurityGroups"); @@ -22868,8 +23262,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSecurityGroups188, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSecurityGroups"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeSecurityGroups188, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeSecurityGroups"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -22884,8 +23279,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeSecurityGroups((com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -22980,9 +23376,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse describeInstances( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstances describeInstances190) + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstances describeInstances190) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -22999,8 +23395,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstances190, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstances190, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23013,11 +23410,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse)object; @@ -23080,11 +23478,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeInstances( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstances describeInstances190, + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstances describeInstances190, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[95].getName()); _operationClient.getOptions().setAction("DescribeInstances"); @@ -23098,8 +23496,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstances190, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstances190, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23114,8 +23513,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeInstances((com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -23210,9 +23610,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse describeNetworkInterfaces( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces describeNetworkInterfaces192) + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces describeNetworkInterfaces192) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -23229,8 +23629,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaces192, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaces"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaces192, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaces"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23243,11 +23644,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse)object; @@ -23310,11 +23713,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeNetworkInterfaces( - com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces describeNetworkInterfaces192, + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces describeNetworkInterfaces192, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[96].getName()); _operationClient.getOptions().setAction("DescribeNetworkInterfaces"); @@ -23328,8 +23731,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaces192, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaces"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeNetworkInterfaces192, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeNetworkInterfaces"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23344,8 +23748,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeNetworkInterfaces((com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -23440,9 +23845,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse deleteKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPair deleteKeyPair194) + com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPair deleteKeyPair194) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -23459,8 +23864,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteKeyPair194, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteKeyPair194, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteKeyPair"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23473,11 +23879,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse)object; @@ -23540,11 +23947,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteKeyPair( - com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPair deleteKeyPair194, + com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPair deleteKeyPair194, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[97].getName()); _operationClient.getOptions().setAction("DeleteKeyPair"); @@ -23558,8 +23965,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteKeyPair194, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteKeyPair"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteKeyPair194, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteKeyPair"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23574,8 +23982,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteKeyPair((com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -23670,9 +24078,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse createSnapshot( - com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshot createSnapshot196) + com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshot createSnapshot196) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -23689,8 +24097,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSnapshot196, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSnapshot"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSnapshot196, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSnapshot"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23703,11 +24112,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse)object; @@ -23770,11 +24180,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateSnapshot( - com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshot createSnapshot196, + com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshot createSnapshot196, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[98].getName()); _operationClient.getOptions().setAction("CreateSnapshot"); @@ -23788,8 +24198,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSnapshot196, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createSnapshot"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createSnapshot196, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createSnapshot"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23804,8 +24215,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateSnapshot((com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -23900,9 +24311,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse describeVpnGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGateways describeVpnGateways198) + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGateways describeVpnGateways198) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -23919,8 +24330,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnGateways198, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnGateways198, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnGateways"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -23933,11 +24345,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse)object; @@ -24000,11 +24413,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeVpnGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGateways describeVpnGateways198, + com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGateways describeVpnGateways198, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[99].getName()); _operationClient.getOptions().setAction("DescribeVpnGateways"); @@ -24018,8 +24431,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnGateways198, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeVpnGateways198, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeVpnGateways"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24034,8 +24448,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeVpnGateways((com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -24130,9 +24545,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse deleteTags( - com.amazon.ec2.client.AmazonEC2Stub.DeleteTags deleteTags200) + com.amazon.ec2.client.AmazonEC2Stub.DeleteTags deleteTags200) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -24149,8 +24564,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteTags200, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteTags200, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteTags"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24163,11 +24579,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse)object; @@ -24230,11 +24647,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteTags( - com.amazon.ec2.client.AmazonEC2Stub.DeleteTags deleteTags200, + com.amazon.ec2.client.AmazonEC2Stub.DeleteTags deleteTags200, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[100].getName()); _operationClient.getOptions().setAction("DeleteTags"); @@ -24248,8 +24665,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteTags200, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteTags"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteTags200, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteTags"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24264,8 +24682,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteTags((com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -24360,9 +24778,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse deleteSnapshot( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshot deleteSnapshot202) + com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshot deleteSnapshot202) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -24379,8 +24797,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSnapshot202, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSnapshot"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSnapshot202, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSnapshot"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24393,11 +24812,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse)object; @@ -24460,11 +24880,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteSnapshot( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshot deleteSnapshot202, + com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshot deleteSnapshot202, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[101].getName()); _operationClient.getOptions().setAction("DeleteSnapshot"); @@ -24478,8 +24898,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSnapshot202, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSnapshot"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSnapshot202, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSnapshot"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24494,8 +24915,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteSnapshot((com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -24590,9 +25011,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse deleteCustomerGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway deleteCustomerGateway204) + com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway deleteCustomerGateway204) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -24609,8 +25030,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteCustomerGateway204, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteCustomerGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteCustomerGateway204, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteCustomerGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24623,11 +25045,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse)object; @@ -24690,11 +25113,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteCustomerGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway deleteCustomerGateway204, + com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway deleteCustomerGateway204, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[102].getName()); _operationClient.getOptions().setAction("DeleteCustomerGateway"); @@ -24708,8 +25131,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteCustomerGateway204, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteCustomerGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteCustomerGateway204, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteCustomerGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24724,8 +25148,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteCustomerGateway((com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -24820,9 +25245,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse createVolume( - com.amazon.ec2.client.AmazonEC2Stub.CreateVolume createVolume206) + com.amazon.ec2.client.AmazonEC2Stub.CreateVolume createVolume206) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -24839,8 +25264,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVolume206, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVolume206, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVolume"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24853,11 +25279,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse)object; @@ -24920,11 +25347,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateVolume( - com.amazon.ec2.client.AmazonEC2Stub.CreateVolume createVolume206, + com.amazon.ec2.client.AmazonEC2Stub.CreateVolume createVolume206, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[103].getName()); _operationClient.getOptions().setAction("CreateVolume"); @@ -24938,8 +25365,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVolume206, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVolume206, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVolume"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -24954,8 +25382,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateVolume((com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -25050,9 +25478,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse cancelExportTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelExportTask cancelExportTask208) + com.amazon.ec2.client.AmazonEC2Stub.CancelExportTask cancelExportTask208) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -25069,8 +25497,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelExportTask208, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelExportTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelExportTask208, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelExportTask"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25083,11 +25512,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse)object; @@ -25150,11 +25580,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcancelExportTask( - com.amazon.ec2.client.AmazonEC2Stub.CancelExportTask cancelExportTask208, + com.amazon.ec2.client.AmazonEC2Stub.CancelExportTask cancelExportTask208, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[104].getName()); _operationClient.getOptions().setAction("CancelExportTask"); @@ -25168,8 +25598,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelExportTask208, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelExportTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), cancelExportTask208, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "cancelExportTask"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25184,8 +25615,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcancelExportTask((com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -25280,9 +25712,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse registerImage( - com.amazon.ec2.client.AmazonEC2Stub.RegisterImage registerImage210) + com.amazon.ec2.client.AmazonEC2Stub.RegisterImage registerImage210) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -25299,8 +25731,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), registerImage210, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "registerImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), registerImage210, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "registerImage"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25313,11 +25746,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse)object; @@ -25380,11 +25814,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startregisterImage( - com.amazon.ec2.client.AmazonEC2Stub.RegisterImage registerImage210, + com.amazon.ec2.client.AmazonEC2Stub.RegisterImage registerImage210, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[105].getName()); _operationClient.getOptions().setAction("RegisterImage"); @@ -25398,8 +25832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), registerImage210, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "registerImage"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), registerImage210, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "registerImage"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25414,8 +25849,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultregisterImage((com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -25510,9 +25945,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse detachVolume( - com.amazon.ec2.client.AmazonEC2Stub.DetachVolume detachVolume212) + com.amazon.ec2.client.AmazonEC2Stub.DetachVolume detachVolume212) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -25529,8 +25964,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVolume212, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVolume212, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVolume"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25543,11 +25979,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse)object; @@ -25610,11 +26047,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdetachVolume( - com.amazon.ec2.client.AmazonEC2Stub.DetachVolume detachVolume212, + com.amazon.ec2.client.AmazonEC2Stub.DetachVolume detachVolume212, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[106].getName()); _operationClient.getOptions().setAction("DetachVolume"); @@ -25628,8 +26065,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVolume212, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachVolume212, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachVolume"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25644,8 +26082,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdetachVolume((com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -25740,9 +26178,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse stopInstances( - com.amazon.ec2.client.AmazonEC2Stub.StopInstances stopInstances214) + com.amazon.ec2.client.AmazonEC2Stub.StopInstances stopInstances214) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -25759,8 +26197,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), stopInstances214, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "stopInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), stopInstances214, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "stopInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25773,11 +26212,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse)object; @@ -25840,11 +26280,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startstopInstances( - com.amazon.ec2.client.AmazonEC2Stub.StopInstances stopInstances214, + com.amazon.ec2.client.AmazonEC2Stub.StopInstances stopInstances214, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[107].getName()); _operationClient.getOptions().setAction("StopInstances"); @@ -25858,8 +26298,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), stopInstances214, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "stopInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), stopInstances214, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "stopInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -25874,8 +26315,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultstopInstances((com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -25970,9 +26411,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse createRoute( - com.amazon.ec2.client.AmazonEC2Stub.CreateRoute createRoute216) + com.amazon.ec2.client.AmazonEC2Stub.CreateRoute createRoute216) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -25989,8 +26430,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRoute216, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRoute216, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createRoute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26003,11 +26445,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse)object; @@ -26070,11 +26513,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateRoute( - com.amazon.ec2.client.AmazonEC2Stub.CreateRoute createRoute216, + com.amazon.ec2.client.AmazonEC2Stub.CreateRoute createRoute216, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[108].getName()); _operationClient.getOptions().setAction("CreateRoute"); @@ -26088,8 +26531,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRoute216, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createRoute216, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createRoute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26104,8 +26548,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateRoute((com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -26200,9 +26644,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse releaseAddress( - com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddress releaseAddress218) + com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddress releaseAddress218) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -26219,8 +26663,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), releaseAddress218, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "releaseAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), releaseAddress218, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "releaseAddress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26233,11 +26678,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse)object; @@ -26300,11 +26746,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreleaseAddress( - com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddress releaseAddress218, + com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddress releaseAddress218, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[109].getName()); _operationClient.getOptions().setAction("ReleaseAddress"); @@ -26318,8 +26764,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), releaseAddress218, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "releaseAddress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), releaseAddress218, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "releaseAddress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26334,8 +26781,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultreleaseAddress((com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -26430,9 +26877,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse describeRouteTables( - com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTables describeRouteTables220) + com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTables describeRouteTables220) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -26449,8 +26896,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRouteTables220, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRouteTables"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRouteTables220, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRouteTables"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26463,11 +26911,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse)object; @@ -26530,11 +26979,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeRouteTables( - com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTables describeRouteTables220, + com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTables describeRouteTables220, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[110].getName()); _operationClient.getOptions().setAction("DescribeRouteTables"); @@ -26548,8 +26997,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRouteTables220, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRouteTables"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRouteTables220, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRouteTables"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26564,8 +27014,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeRouteTables((com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -26660,9 +27111,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse describeCustomerGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways describeCustomerGateways222) + com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways describeCustomerGateways222) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -26679,8 +27130,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeCustomerGateways222, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeCustomerGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeCustomerGateways222, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeCustomerGateways"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26693,11 +27145,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse)object; @@ -26760,11 +27214,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeCustomerGateways( - com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways describeCustomerGateways222, + com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways describeCustomerGateways222, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[111].getName()); _operationClient.getOptions().setAction("DescribeCustomerGateways"); @@ -26778,8 +27232,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeCustomerGateways222, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeCustomerGateways"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeCustomerGateways222, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeCustomerGateways"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26794,8 +27249,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeCustomerGateways((com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -26890,9 +27346,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse deleteNetworkAcl( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAcl deleteNetworkAcl224) + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAcl deleteNetworkAcl224) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -26909,8 +27365,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAcl224, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAcl"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAcl224, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAcl"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -26923,11 +27380,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse)object; @@ -26990,11 +27448,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteNetworkAcl( - com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAcl deleteNetworkAcl224, + com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAcl deleteNetworkAcl224, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[112].getName()); _operationClient.getOptions().setAction("DeleteNetworkAcl"); @@ -27008,8 +27466,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAcl224, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAcl"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteNetworkAcl224, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteNetworkAcl"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27024,8 +27483,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteNetworkAcl((com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -27120,9 +27580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse deleteRoute( - com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute deleteRoute226) + com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute deleteRoute226) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -27139,8 +27599,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRoute226, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRoute226, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRoute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27153,11 +27614,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse)object; @@ -27220,11 +27682,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteRoute( - com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute deleteRoute226, + com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute deleteRoute226, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[113].getName()); _operationClient.getOptions().setAction("DeleteRoute"); @@ -27238,8 +27700,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRoute226, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteRoute226, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteRoute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27254,8 +27717,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteRoute((com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -27350,9 +27813,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse rebootInstances( - com.amazon.ec2.client.AmazonEC2Stub.RebootInstances rebootInstances228) + com.amazon.ec2.client.AmazonEC2Stub.RebootInstances rebootInstances228) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -27369,8 +27832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), rebootInstances228, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "rebootInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), rebootInstances228, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "rebootInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27383,11 +27847,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse)object; @@ -27450,11 +27915,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startrebootInstances( - com.amazon.ec2.client.AmazonEC2Stub.RebootInstances rebootInstances228, + com.amazon.ec2.client.AmazonEC2Stub.RebootInstances rebootInstances228, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[114].getName()); _operationClient.getOptions().setAction("RebootInstances"); @@ -27468,8 +27933,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), rebootInstances228, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "rebootInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), rebootInstances228, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "rebootInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27484,8 +27950,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultrebootInstances((com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -27580,9 +28046,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse modifyInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute modifyInstanceAttribute230) + com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute modifyInstanceAttribute230) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -27599,8 +28065,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyInstanceAttribute230, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyInstanceAttribute230, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyInstanceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27613,11 +28080,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse)object; @@ -27680,11 +28149,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmodifyInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute modifyInstanceAttribute230, + com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute modifyInstanceAttribute230, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[115].getName()); _operationClient.getOptions().setAction("ModifyInstanceAttribute"); @@ -27698,8 +28167,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyInstanceAttribute230, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), modifyInstanceAttribute230, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "modifyInstanceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27714,8 +28184,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmodifyInstanceAttribute((com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -27810,9 +28281,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse terminateInstances( - com.amazon.ec2.client.AmazonEC2Stub.TerminateInstances terminateInstances232) + com.amazon.ec2.client.AmazonEC2Stub.TerminateInstances terminateInstances232) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -27829,8 +28300,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), terminateInstances232, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "terminateInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), terminateInstances232, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "terminateInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27843,11 +28315,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse)object; @@ -27910,11 +28383,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startterminateInstances( - com.amazon.ec2.client.AmazonEC2Stub.TerminateInstances terminateInstances232, + com.amazon.ec2.client.AmazonEC2Stub.TerminateInstances terminateInstances232, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[116].getName()); _operationClient.getOptions().setAction("TerminateInstances"); @@ -27928,8 +28401,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), terminateInstances232, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "terminateInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), terminateInstances232, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "terminateInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -27944,8 +28418,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultterminateInstances((com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -28040,9 +28515,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse createVpnConnectionRoute( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute createVpnConnectionRoute234) + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute createVpnConnectionRoute234) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -28059,8 +28534,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnectionRoute234, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnectionRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnectionRoute234, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnectionRoute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28073,11 +28549,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse)object; @@ -28140,11 +28618,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateVpnConnectionRoute( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute createVpnConnectionRoute234, + com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute createVpnConnectionRoute234, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[117].getName()); _operationClient.getOptions().setAction("CreateVpnConnectionRoute"); @@ -28158,8 +28636,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnectionRoute234, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnectionRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpnConnectionRoute234, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpnConnectionRoute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28174,8 +28653,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateVpnConnectionRoute((com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -28270,9 +28750,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse describeConversionTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks describeConversionTasks236) + com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks describeConversionTasks236) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -28289,8 +28769,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeConversionTasks236, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeConversionTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeConversionTasks236, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeConversionTasks"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28303,11 +28784,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse)object; @@ -28370,11 +28853,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeConversionTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks describeConversionTasks236, + com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks describeConversionTasks236, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[118].getName()); _operationClient.getOptions().setAction("DescribeConversionTasks"); @@ -28388,8 +28871,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeConversionTasks236, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeConversionTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeConversionTasks236, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeConversionTasks"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28404,8 +28888,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeConversionTasks((com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -28500,9 +28985,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse describeAddresses( - com.amazon.ec2.client.AmazonEC2Stub.DescribeAddresses describeAddresses238) + com.amazon.ec2.client.AmazonEC2Stub.DescribeAddresses describeAddresses238) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -28519,8 +29004,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAddresses238, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAddresses238, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAddresses"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28533,11 +29019,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse)object; @@ -28600,11 +29087,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeAddresses( - com.amazon.ec2.client.AmazonEC2Stub.DescribeAddresses describeAddresses238, + com.amazon.ec2.client.AmazonEC2Stub.DescribeAddresses describeAddresses238, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[119].getName()); _operationClient.getOptions().setAction("DescribeAddresses"); @@ -28618,8 +29105,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAddresses238, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeAddresses238, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeAddresses"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28634,8 +29122,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeAddresses((com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -28730,9 +29219,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse describeInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute describeInstanceAttribute240) + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute describeInstanceAttribute240) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -28749,8 +29238,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceAttribute240, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceAttribute240, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceAttribute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28763,11 +29253,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse)object; @@ -28830,11 +29322,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeInstanceAttribute( - com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute describeInstanceAttribute240, + com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute describeInstanceAttribute240, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[120].getName()); _operationClient.getOptions().setAction("DescribeInstanceAttribute"); @@ -28848,8 +29340,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceAttribute240, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceAttribute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeInstanceAttribute240, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeInstanceAttribute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28864,8 +29357,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeInstanceAttribute((com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -28960,9 +29454,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse attachInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway attachInternetGateway242) + com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway attachInternetGateway242) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -28979,8 +29473,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachInternetGateway242, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachInternetGateway242, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachInternetGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -28993,11 +29488,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse)object; @@ -29060,11 +29556,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startattachInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway attachInternetGateway242, + com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway attachInternetGateway242, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[121].getName()); _operationClient.getOptions().setAction("AttachInternetGateway"); @@ -29078,8 +29574,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachInternetGateway242, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachInternetGateway242, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachInternetGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29094,8 +29591,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultattachInternetGateway((com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -29190,9 +29688,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse createVpc( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpc createVpc244) + com.amazon.ec2.client.AmazonEC2Stub.CreateVpc createVpc244) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -29209,8 +29707,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpc244, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpc"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpc244, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpc"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29223,10 +29722,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse)object; @@ -29289,11 +29790,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateVpc( - com.amazon.ec2.client.AmazonEC2Stub.CreateVpc createVpc244, + com.amazon.ec2.client.AmazonEC2Stub.CreateVpc createVpc244, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[122].getName()); _operationClient.getOptions().setAction("CreateVpc"); @@ -29307,8 +29808,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpc244, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpc"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createVpc244, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createVpc"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29323,8 +29825,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateVpc((com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -29419,9 +29921,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse replaceRouteTableAssociation( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation replaceRouteTableAssociation246) + com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation replaceRouteTableAssociation246) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -29438,8 +29940,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRouteTableAssociation246, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRouteTableAssociation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRouteTableAssociation246, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRouteTableAssociation"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29452,11 +29955,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse)object; @@ -29519,11 +30024,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreplaceRouteTableAssociation( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation replaceRouteTableAssociation246, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation replaceRouteTableAssociation246, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[123].getName()); _operationClient.getOptions().setAction("ReplaceRouteTableAssociation"); @@ -29537,8 +30042,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRouteTableAssociation246, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRouteTableAssociation"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRouteTableAssociation246, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRouteTableAssociation"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29553,8 +30059,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultreplaceRouteTableAssociation((com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -29649,9 +30156,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse associateRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTable associateRouteTable248) + com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTable associateRouteTable248) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -29668,8 +30175,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateRouteTable248, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateRouteTable248, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateRouteTable"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29682,11 +30190,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse)object; @@ -29749,11 +30258,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startassociateRouteTable( - com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTable associateRouteTable248, + com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTable associateRouteTable248, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[124].getName()); _operationClient.getOptions().setAction("AssociateRouteTable"); @@ -29767,8 +30276,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateRouteTable248, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "associateRouteTable"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), associateRouteTable248, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "associateRouteTable"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29783,8 +30293,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultassociateRouteTable((com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -29879,9 +30390,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse detachInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway detachInternetGateway250) + com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway detachInternetGateway250) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -29898,8 +30409,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachInternetGateway250, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachInternetGateway250, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachInternetGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -29912,11 +30424,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse)object; @@ -29979,11 +30492,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdetachInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway detachInternetGateway250, + com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway detachInternetGateway250, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[125].getName()); _operationClient.getOptions().setAction("DetachInternetGateway"); @@ -29997,8 +30510,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachInternetGateway250, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "detachInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), detachInternetGateway250, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "detachInternetGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30013,8 +30527,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdetachInternetGateway((com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -30109,9 +30624,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering( - com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering252) + com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering252) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -30128,8 +30643,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), purchaseReservedInstancesOffering252, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "purchaseReservedInstancesOffering"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), purchaseReservedInstancesOffering252, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "purchaseReservedInstancesOffering"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30142,11 +30658,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse)object; @@ -30209,11 +30727,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startpurchaseReservedInstancesOffering( - com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering252, + com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering252, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[126].getName()); _operationClient.getOptions().setAction("PurchaseReservedInstancesOffering"); @@ -30227,8 +30745,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), purchaseReservedInstancesOffering252, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "purchaseReservedInstancesOffering"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), purchaseReservedInstancesOffering252, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "purchaseReservedInstancesOffering"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30243,8 +30762,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultpurchaseReservedInstancesOffering((com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -30339,9 +30859,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse importVolume( - com.amazon.ec2.client.AmazonEC2Stub.ImportVolume importVolume254) + com.amazon.ec2.client.AmazonEC2Stub.ImportVolume importVolume254) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -30358,8 +30878,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importVolume254, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importVolume254, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30372,11 +30893,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse)object; @@ -30439,11 +30961,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startimportVolume( - com.amazon.ec2.client.AmazonEC2Stub.ImportVolume importVolume254, + com.amazon.ec2.client.AmazonEC2Stub.ImportVolume importVolume254, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[127].getName()); _operationClient.getOptions().setAction("ImportVolume"); @@ -30457,8 +30979,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importVolume254, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), importVolume254, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30473,8 +30996,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultimportVolume((com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -30569,9 +31092,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse describeExportTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasks describeExportTasks256) + com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasks describeExportTasks256) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -30588,8 +31111,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeExportTasks256, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeExportTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeExportTasks256, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeExportTasks"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30602,11 +31126,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse)object; @@ -30669,11 +31194,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeExportTasks( - com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasks describeExportTasks256, + com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasks describeExportTasks256, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[128].getName()); _operationClient.getOptions().setAction("DescribeExportTasks"); @@ -30687,8 +31212,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeExportTasks256, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeExportTasks"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeExportTasks256, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeExportTasks"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30703,8 +31229,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeExportTasks((com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -30799,9 +31326,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse createInstanceExportTask( - com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask createInstanceExportTask258) + com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask createInstanceExportTask258) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -30818,8 +31345,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInstanceExportTask258, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createInstanceExportTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInstanceExportTask258, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createInstanceExportTask"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30832,11 +31360,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse)object; @@ -30899,11 +31429,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateInstanceExportTask( - com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask createInstanceExportTask258, + com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask createInstanceExportTask258, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[129].getName()); _operationClient.getOptions().setAction("CreateInstanceExportTask"); @@ -30917,8 +31447,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInstanceExportTask258, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createInstanceExportTask"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createInstanceExportTask258, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createInstanceExportTask"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -30933,8 +31464,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateInstanceExportTask((com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -31029,9 +31561,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse assignPrivateIpAddresses( - com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses assignPrivateIpAddresses260) + com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses assignPrivateIpAddresses260) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -31048,8 +31580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), assignPrivateIpAddresses260, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "assignPrivateIpAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), assignPrivateIpAddresses260, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "assignPrivateIpAddresses"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31062,11 +31595,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse)object; @@ -31129,11 +31664,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startassignPrivateIpAddresses( - com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses assignPrivateIpAddresses260, + com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses assignPrivateIpAddresses260, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[130].getName()); _operationClient.getOptions().setAction("AssignPrivateIpAddresses"); @@ -31147,8 +31682,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), assignPrivateIpAddresses260, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "assignPrivateIpAddresses"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), assignPrivateIpAddresses260, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "assignPrivateIpAddresses"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31163,8 +31699,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultassignPrivateIpAddresses((com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -31259,9 +31796,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse reportInstanceStatus( - com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatus reportInstanceStatus262) + com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatus reportInstanceStatus262) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -31278,8 +31815,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), reportInstanceStatus262, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "reportInstanceStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), reportInstanceStatus262, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "reportInstanceStatus"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31292,11 +31830,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse)object; @@ -31359,11 +31898,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreportInstanceStatus( - com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatus reportInstanceStatus262, + com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatus reportInstanceStatus262, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[131].getName()); _operationClient.getOptions().setAction("ReportInstanceStatus"); @@ -31377,8 +31916,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), reportInstanceStatus262, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "reportInstanceStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), reportInstanceStatus262, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "reportInstanceStatus"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31393,8 +31933,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultreportInstanceStatus((com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -31489,9 +32030,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings describeReservedInstancesOfferings264) + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings describeReservedInstancesOfferings264) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -31508,8 +32049,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesOfferings264, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesOfferings"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesOfferings264, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesOfferings"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31522,11 +32064,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse)object; @@ -31589,11 +32133,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeReservedInstancesOfferings( - com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings describeReservedInstancesOfferings264, + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings describeReservedInstancesOfferings264, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[132].getName()); _operationClient.getOptions().setAction("DescribeReservedInstancesOfferings"); @@ -31607,8 +32151,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesOfferings264, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesOfferings"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeReservedInstancesOfferings264, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "describeReservedInstancesOfferings"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31623,8 +32168,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeReservedInstancesOfferings((com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -31719,9 +32265,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse deleteVpnConnection( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnection deleteVpnConnection266) + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnection deleteVpnConnection266) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -31738,8 +32284,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnection266, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnection"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnection266, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnection"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31752,11 +32299,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse)object; @@ -31819,11 +32367,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteVpnConnection( - com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnection deleteVpnConnection266, + com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnection deleteVpnConnection266, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[133].getName()); _operationClient.getOptions().setAction("DeleteVpnConnection"); @@ -31837,8 +32385,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnection266, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnection"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteVpnConnection266, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteVpnConnection"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31853,8 +32402,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteVpnConnection((com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -31949,9 +32499,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse deleteInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway deleteInternetGateway268) + com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway deleteInternetGateway268) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -31968,8 +32518,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteInternetGateway268, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteInternetGateway268, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteInternetGateway"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -31982,11 +32533,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse)object; @@ -32049,11 +32601,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteInternetGateway( - com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway deleteInternetGateway268, + com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway deleteInternetGateway268, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[134].getName()); _operationClient.getOptions().setAction("DeleteInternetGateway"); @@ -32067,8 +32619,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteInternetGateway268, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteInternetGateway"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteInternetGateway268, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteInternetGateway"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32083,8 +32636,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteInternetGateway((com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -32179,9 +32733,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) + com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -32198,8 +32752,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSpotDatafeedSubscription270, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSpotDatafeedSubscription270, + optimizeContent(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSpotDatafeedSubscription"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32212,11 +32767,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse)object; @@ -32279,11 +32836,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdeleteSpotDatafeedSubscription( - com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270, + com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[135].getName()); _operationClient.getOptions().setAction("DeleteSpotDatafeedSubscription"); @@ -32297,8 +32854,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSpotDatafeedSubscription270, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSpotDatafeedSubscription"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteSpotDatafeedSubscription270, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "deleteSpotDatafeedSubscription"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32313,8 +32871,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteSpotDatafeedSubscription((com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -32409,9 +32968,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse attachNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface attachNetworkInterface272) + com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface attachNetworkInterface272) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -32428,8 +32987,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachNetworkInterface272, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachNetworkInterface272, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachNetworkInterface"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32442,11 +33002,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse)object; @@ -32509,11 +33071,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startattachNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface attachNetworkInterface272, + com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface attachNetworkInterface272, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[136].getName()); _operationClient.getOptions().setAction("AttachNetworkInterface"); @@ -32527,8 +33089,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachNetworkInterface272, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachNetworkInterface272, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachNetworkInterface"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32543,8 +33106,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultattachNetworkInterface((com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -32639,9 +33203,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse createNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface createNetworkInterface274) + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface createNetworkInterface274) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -32658,8 +33222,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkInterface274, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkInterface274, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkInterface"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32672,11 +33237,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse)object; @@ -32739,11 +33306,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startcreateNetworkInterface( - com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface createNetworkInterface274, + com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface createNetworkInterface274, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[137].getName()); _operationClient.getOptions().setAction("CreateNetworkInterface"); @@ -32757,8 +33324,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkInterface274, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkInterface"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createNetworkInterface274, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "createNetworkInterface"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32773,8 +33341,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateNetworkInterface((com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -32869,9 +33438,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress( - com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress revokeSecurityGroupEgress276) + com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress revokeSecurityGroupEgress276) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -32888,8 +33457,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupEgress276, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupEgress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupEgress276, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupEgress"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -32902,11 +33472,13 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse)object; @@ -32969,11 +33541,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startrevokeSecurityGroupEgress( - com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress revokeSecurityGroupEgress276, + com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress revokeSecurityGroupEgress276, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[138].getName()); _operationClient.getOptions().setAction("RevokeSecurityGroupEgress"); @@ -32987,8 +33559,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupEgress276, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupEgress"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), revokeSecurityGroupEgress276, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "revokeSecurityGroupEgress"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33003,8 +33576,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultrevokeSecurityGroupEgress((com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -33099,9 +33673,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse monitorInstances( - com.amazon.ec2.client.AmazonEC2Stub.MonitorInstances monitorInstances278) + com.amazon.ec2.client.AmazonEC2Stub.MonitorInstances monitorInstances278) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -33118,8 +33692,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), monitorInstances278, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "monitorInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), monitorInstances278, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "monitorInstances"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33132,11 +33707,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse)object; @@ -33199,11 +33775,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startmonitorInstances( - com.amazon.ec2.client.AmazonEC2Stub.MonitorInstances monitorInstances278, + com.amazon.ec2.client.AmazonEC2Stub.MonitorInstances monitorInstances278, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[139].getName()); _operationClient.getOptions().setAction("MonitorInstances"); @@ -33217,8 +33793,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), monitorInstances278, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "monitorInstances"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), monitorInstances278, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "monitorInstances"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33233,8 +33810,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultmonitorInstances((com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -33329,9 +33907,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse replaceRoute( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute replaceRoute280) + com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute replaceRoute280) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -33348,8 +33926,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRoute280, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRoute280, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRoute"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33362,11 +33941,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse)object; @@ -33429,11 +34009,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startreplaceRoute( - com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute replaceRoute280, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute replaceRoute280, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[140].getName()); _operationClient.getOptions().setAction("ReplaceRoute"); @@ -33447,8 +34027,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRoute280, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRoute"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), replaceRoute280, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "replaceRoute"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33463,8 +34044,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultreplaceRoute((com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -33559,9 +34140,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse attachVolume( - com.amazon.ec2.client.AmazonEC2Stub.AttachVolume attachVolume282) + com.amazon.ec2.client.AmazonEC2Stub.AttachVolume attachVolume282) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -33578,8 +34159,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVolume282, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVolume282, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVolume"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33592,11 +34174,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse)object; @@ -33659,11 +34242,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startattachVolume( - com.amazon.ec2.client.AmazonEC2Stub.AttachVolume attachVolume282, + com.amazon.ec2.client.AmazonEC2Stub.AttachVolume attachVolume282, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[141].getName()); _operationClient.getOptions().setAction("AttachVolume"); @@ -33677,8 +34260,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVolume282, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVolume"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), attachVolume282, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "attachVolume"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33693,8 +34277,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultattachVolume((com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -33789,9 +34373,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse getConsoleOutput( - com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutput getConsoleOutput284) + com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutput getConsoleOutput284) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -33808,8 +34392,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getConsoleOutput284, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "getConsoleOutput"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getConsoleOutput284, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "getConsoleOutput"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33822,11 +34407,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse)object; @@ -33889,11 +34475,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startgetConsoleOutput( - com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutput getConsoleOutput284, + com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutput getConsoleOutput284, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[142].getName()); _operationClient.getOptions().setAction("GetConsoleOutput"); @@ -33907,8 +34493,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getConsoleOutput284, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "getConsoleOutput"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getConsoleOutput284, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "getConsoleOutput"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -33923,8 +34510,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetConsoleOutput((com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -34019,9 +34607,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse describeRegions( - com.amazon.ec2.client.AmazonEC2Stub.DescribeRegions describeRegions286) + com.amazon.ec2.client.AmazonEC2Stub.DescribeRegions describeRegions286) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -34038,8 +34626,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRegions286, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRegions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRegions286, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRegions"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -34052,11 +34641,12 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse)object; @@ -34119,11 +34709,11 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { */ public void startdescribeRegions( - com.amazon.ec2.client.AmazonEC2Stub.DescribeRegions describeRegions286, + com.amazon.ec2.client.AmazonEC2Stub.DescribeRegions describeRegions286, - final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) + final com.amazon.ec2.client.AmazonEC2CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[143].getName()); _operationClient.getOptions().setAction("DescribeRegions"); @@ -34137,8 +34727,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRegions286, optimizeContent(new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRegions"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), describeRegions286, optimizeContent(new javax.xml.namespace.QName( + "http://ec2.amazonaws.com/doc/2012-08-15/", "describeRegions"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -34153,8 +34744,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdescribeRegions((com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -34382,7 +34973,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -34476,8 +35068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -34798,7 +35391,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -34846,8 +35440,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -35094,7 +35689,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -35203,8 +35799,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -35513,7 +36110,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -35651,8 +36249,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -35959,7 +36558,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -36041,8 +36641,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -36348,7 +36949,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -36486,8 +37088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -36832,7 +37435,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -36973,8 +37577,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -37285,7 +37890,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -37394,8 +38000,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -37721,7 +38328,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -37815,8 +38423,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -38041,7 +38650,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeRegionsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeRegionsSetItemType.class, list1)); + object.setItem((DescribeRegionsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeRegionsSetItemType.class, + list1)); } // End of if for expected property start element @@ -38069,7 +38679,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReportInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReportInstanceStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReportInstanceStatusResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -38137,7 +38748,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -38185,8 +38797,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -38433,7 +39046,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -38542,8 +39156,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -38828,7 +39443,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -38937,8 +39553,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -39710,7 +40327,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -39759,14 +40377,15 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localDisableApiTermination == null) { throw new org.apache.axis2.databinding.ADBException("disableApiTermination cannot be null!!"); } - localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, xmlWriter); + localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, + xmlWriter); } if (localInstanceInitiatedShutdownBehaviorTracker) { if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localRootDeviceNameTracker) { if (localRootDeviceName == null) { @@ -39838,8 +40457,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -40121,7 +40741,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(EmptyElementType.Factory.parse(reader)); @@ -40152,7 +40773,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(EmptyElementType.Factory.parse(reader)); @@ -40213,7 +40835,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVolumeAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -40281,7 +40904,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -40329,8 +40953,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -40601,7 +41226,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -40715,8 +41341,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -41021,7 +41648,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -41069,8 +41697,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -41216,7 +41845,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshot").equals(reader.getName())) { object.setCreateSnapshot(CreateSnapshotType.Factory.parse(reader)); @@ -41316,7 +41946,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -41425,8 +42056,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -41859,7 +42491,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -42074,8 +42707,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -42492,7 +43126,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -42606,8 +43241,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -42939,7 +43575,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -43077,8 +43714,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -43382,7 +44020,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -43430,8 +44069,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -43675,7 +44315,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -43723,8 +44364,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -43870,7 +44512,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstances").equals(reader.getName())) { object.setStopInstances(StopInstancesType.Factory.parse(reader)); @@ -43899,7 +44542,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceNetworkAclAssociation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceNetworkAclAssociation", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -43967,7 +44611,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -44015,8 +44660,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -44263,7 +44909,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -44372,8 +45019,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -44699,7 +45347,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -44793,8 +45442,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -45159,7 +45809,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -45253,8 +45904,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -45602,7 +46254,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -45716,8 +46369,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -45903,7 +46557,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -46382,7 +47037,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -46417,7 +47073,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesResponseSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesResponseSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesResponseSetItemType", xmlWriter); } @@ -46876,8 +47533,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -47155,7 +47813,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -47299,7 +47958,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -47436,7 +48096,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeKeyPairsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -47504,7 +48165,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -47552,8 +48214,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -47824,7 +48487,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -47938,8 +48602,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -48264,7 +48929,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -48402,8 +49068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -48707,7 +49374,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -48755,8 +49423,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -49028,7 +49697,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -49089,8 +49759,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -49377,7 +50048,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -49471,8 +50143,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -49697,7 +50370,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((ImportInstanceGroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(ImportInstanceGroupItemType.class, list1)); + object.setItem((ImportInstanceGroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(ImportInstanceGroupItemType.class, + list1)); } // End of if for expected property start element @@ -49793,7 +50467,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -49841,8 +50516,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -50130,7 +50806,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -50224,8 +50901,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -50573,7 +51251,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -50650,7 +51329,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localSpotDatafeedSubscription == null) { throw new org.apache.axis2.databinding.ADBException("spotDatafeedSubscription cannot be null!!"); } - localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription"), factory, xmlWriter); + localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -50687,8 +51367,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -50892,7 +51573,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { object.setSpotDatafeedSubscription(SpotDatafeedSubscriptionType.Factory.parse(reader)); @@ -51058,7 +51740,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -51231,8 +51914,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -51593,7 +52277,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -51628,7 +52313,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":CancelSpotInstanceRequestsResponseSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":CancelSpotInstanceRequestsResponseSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelSpotInstanceRequestsResponseSetItemType", xmlWriter); } @@ -51734,8 +52420,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -51922,7 +52609,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -52070,7 +52758,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -52208,8 +52897,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -52445,7 +53135,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeletePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeletePlacementGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeletePlacementGroupResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -52513,7 +53204,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -52561,8 +53253,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -52833,7 +53526,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -52947,8 +53641,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -53249,7 +53944,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -53358,8 +54054,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -53641,7 +54338,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -53689,8 +54387,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -53836,7 +54535,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshot").equals(reader.getName())) { object.setDeleteSnapshot(DeleteSnapshotType.Factory.parse(reader)); @@ -53865,8 +54565,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeCustomerGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeCustomerGatewaysResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeCustomerGatewaysResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -53934,7 +54634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -53982,8 +54683,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -54271,7 +54973,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -54365,8 +55068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -54862,7 +55566,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -55104,8 +55809,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -55728,7 +56434,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -56002,8 +56709,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -56714,7 +57422,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -57086,8 +57795,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -57631,7 +58341,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -57725,8 +58436,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -58047,7 +58759,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -58095,8 +58808,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -58340,7 +59054,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -58388,8 +59103,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -58535,7 +59251,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTable").equals(reader.getName())) { object.setDeleteRouteTable(DeleteRouteTableType.Factory.parse(reader)); @@ -58564,7 +59281,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RegisterImageResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImageResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -58632,7 +59350,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -58680,8 +59399,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -58969,7 +59689,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -59063,8 +59784,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -59502,7 +60224,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -59709,8 +60432,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -60073,7 +60797,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -60182,8 +60907,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -60465,7 +61191,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -60513,8 +61240,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -60809,7 +61537,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -60955,8 +61684,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -61307,7 +62037,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -61421,8 +62152,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -61775,7 +62507,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -61917,8 +62650,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -62271,7 +63005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -62365,8 +63100,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -62591,7 +63327,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((VpnConnectionIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VpnConnectionIdSetItemType.class, list1)); + object.setItem((VpnConnectionIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VpnConnectionIdSetItemType.class, + list1)); } // End of if for expected property start element @@ -62690,7 +63427,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -62799,8 +63537,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -63109,7 +63848,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -63223,8 +63963,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -63428,7 +64169,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTask").equals(reader.getName())) { object.setBundleInstanceTask(BundleInstanceTaskType.Factory.parse(reader)); @@ -63556,7 +64298,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -63694,8 +64437,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -64026,7 +64770,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -64164,8 +64909,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -64548,7 +65294,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -64641,8 +65388,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -64852,7 +65600,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "securityGroupIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "securityGroupIdSet").equals(reader.getName())) { object.setSecurityGroupIdSet(DescribeSecurityGroupsIdSetType.Factory.parse(reader)); @@ -65018,7 +65767,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -65185,8 +65935,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -65512,7 +66263,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -65560,8 +66312,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -65707,7 +66460,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpcResponse").equals(reader.getName())) { object.setDeleteVpcResponse(DeleteVpcResponseType.Factory.parse(reader)); @@ -65869,7 +66623,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -65988,8 +66743,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -66360,7 +67116,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -66454,8 +67211,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -66680,7 +67438,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((NetworkInterfaceIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(NetworkInterfaceIdSetItemType.class, list1)); + object.setItem((NetworkInterfaceIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + NetworkInterfaceIdSetItemType.class, list1)); } // End of if for expected property start element @@ -66776,7 +67535,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -66824,8 +67584,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -67113,7 +67874,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -67207,8 +67969,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -67461,7 +68224,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class TerminateInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -67529,7 +68293,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -67577,8 +68342,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -67849,7 +68615,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -67987,8 +68754,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -68292,7 +69060,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -68340,8 +69109,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -68487,7 +69257,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolume").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportVolume").equals(reader.getName())) { object.setImportVolume(ImportVolumeType.Factory.parse(reader)); @@ -68611,7 +69382,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -68749,8 +69521,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -69054,7 +69827,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -69102,8 +69876,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -69249,7 +70024,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstances").equals(reader.getName())) { object.setMonitorInstances(MonitorInstancesType.Factory.parse(reader)); @@ -69518,7 +70294,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -69750,8 +70527,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -69992,7 +70770,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -70247,7 +71026,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -70400,8 +71180,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -70687,7 +71468,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribePlacementGroups implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroups", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroups", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -70755,7 +71537,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -70803,8 +71586,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -70980,7 +71764,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeConversionTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeConversionTasksResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -71048,7 +71833,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -71096,8 +71882,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -71273,7 +72060,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceRouteTableAssociation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceRouteTableAssociation", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -71341,7 +72129,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -71389,8 +72178,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -71637,7 +72427,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -71746,8 +72537,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -72276,7 +73068,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -72311,7 +73104,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetItemType", xmlWriter); } @@ -72593,8 +73387,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -72844,7 +73639,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -72862,7 +73658,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -73304,7 +74101,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -73608,8 +74406,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -73839,7 +74638,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -73908,7 +74708,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -74090,7 +74891,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -74184,8 +74986,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -74623,7 +75426,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -74721,8 +75525,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -75235,7 +76040,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -75451,8 +76257,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -75857,7 +76664,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -75905,8 +76713,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -76177,7 +76986,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -76291,8 +77101,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -76529,7 +77340,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInstanceStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeInstanceStatusResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -76597,7 +77409,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -76645,8 +77458,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -76893,7 +77707,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -76975,8 +77790,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -77187,7 +78003,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSpotDatafeedSubscription", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateSpotDatafeedSubscription", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -77255,7 +78072,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -77303,8 +78121,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -77592,7 +78411,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -77686,8 +78506,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -78035,7 +78856,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -78176,8 +78998,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -78417,7 +79240,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AttachInternetGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -78485,7 +79309,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -78533,8 +79358,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -78822,7 +79648,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -78916,8 +79743,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -79142,7 +79970,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((NetworkAclAssociationType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(NetworkAclAssociationType.class, list1)); + object.setItem((NetworkAclAssociationType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(NetworkAclAssociationType.class, + list1)); } // End of if for expected property start element @@ -79282,7 +80111,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -79376,8 +80206,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -79742,7 +80573,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -79836,8 +80668,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -80161,7 +80994,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -80270,8 +81104,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -80580,7 +81415,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -80718,8 +81554,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -81050,7 +81887,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -81164,8 +82002,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -81552,7 +82391,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -81730,8 +82570,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -81952,7 +82793,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -82091,7 +82933,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -82173,8 +83016,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -82385,7 +83229,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVpnConnections implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnections", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -82453,7 +83298,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -82501,8 +83347,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -82790,7 +83637,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -82884,8 +83732,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -83207,7 +84056,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -83255,8 +84105,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -83527,7 +84378,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -83641,8 +84493,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -84668,7 +85521,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -85321,8 +86175,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -85958,7 +86813,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -85973,7 +86829,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "virtualizationType").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "virtualizationType").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -86110,7 +86967,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -86192,8 +87050,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -86371,7 +87230,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "conversionTaskIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "conversionTaskIdSet").equals(reader.getName())) { object.setConversionTaskIdSet(ConversionTaskIdSetType.Factory.parse(reader)); @@ -86503,7 +87363,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -86597,8 +87458,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -86945,7 +87807,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -87006,8 +87869,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -87182,7 +88046,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifyInstanceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -87250,7 +88115,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -87298,8 +88164,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -87543,7 +88410,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -87591,8 +88459,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -87738,7 +88607,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddress").equals(reader.getName())) { object.setAllocateAddress(AllocateAddressType.Factory.parse(reader)); @@ -87939,7 +88809,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -88088,8 +88959,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -88323,7 +89195,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "allowReassociation").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "allowReassociation").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -88452,7 +89325,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -88566,8 +89440,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -88804,7 +89679,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateNetworkAclEntryResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -88872,7 +89748,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -88920,8 +89797,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -89220,7 +90098,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -89308,8 +90187,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -89497,7 +90377,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewaySet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewaySet").equals(reader.getName())) { object.setCustomerGatewaySet(CustomerGatewayIdSetType.Factory.parse(reader)); @@ -89612,7 +90493,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -89660,8 +90542,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -89807,7 +90690,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstance").equals(reader.getName())) { object.setBundleInstance(BundleInstanceType.Factory.parse(reader)); @@ -89959,7 +90843,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -90101,8 +90986,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -90455,7 +91341,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -90549,8 +91436,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -91174,7 +92062,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -91467,8 +92356,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -91791,7 +92681,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -92042,7 +92933,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -92184,8 +93076,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -92387,7 +93280,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "associationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -92486,7 +93380,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -92595,8 +93490,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -92810,7 +93706,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RevokeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgress", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -92878,7 +93775,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -92926,8 +93824,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -93103,7 +94002,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeAvailabilityZones implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZones", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -93171,7 +94071,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -93219,8 +94120,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -93396,7 +94298,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RevokeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngress", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -93464,7 +94367,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -93512,8 +94416,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -93784,7 +94689,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -93922,8 +94828,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -94159,7 +95066,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateReservedInstancesListing implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateReservedInstancesListing", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateReservedInstancesListing", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -94227,7 +95135,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -94275,8 +95184,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -94609,7 +95519,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -94760,8 +95671,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -95114,7 +96026,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -95162,8 +96075,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -95309,7 +96223,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTags").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTags").equals(reader.getName())) { object.setDeleteTags(DeleteTagsType.Factory.parse(reader)); @@ -95519,7 +96434,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -95699,8 +96615,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -96307,7 +97224,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -96583,8 +97501,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -96881,7 +97800,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availableIpAddressCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -97044,7 +97964,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -97158,8 +98079,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -97467,7 +98389,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -97576,8 +98499,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -97859,7 +98783,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -97907,8 +98832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -98054,7 +98980,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "TerminateInstances").equals(reader.getName())) { object.setTerminateInstances(TerminateInstancesType.Factory.parse(reader)); @@ -98083,7 +99010,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class UnassignPrivateIpAddresses implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddresses", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98151,7 +99079,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -98199,8 +99128,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -98471,7 +99401,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -98585,8 +99516,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -98823,7 +99755,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifySnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifySnapshotAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -98891,7 +99824,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -98939,8 +99873,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -99184,7 +100119,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -99232,8 +100168,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -99379,7 +100316,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolume").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVolume").equals(reader.getName())) { object.setCreateVolume(CreateVolumeType.Factory.parse(reader)); @@ -99408,7 +100346,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteCustomerGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99476,7 +100415,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -99524,8 +100464,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -99701,7 +100642,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifyVolumeAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -99769,7 +100711,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -99817,8 +100760,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -99994,7 +100938,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeNetworkAclsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkAclsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -100062,7 +101007,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -100110,8 +101056,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -100382,7 +101329,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -100496,8 +101444,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -100802,7 +101751,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -100850,8 +101800,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -100997,7 +101948,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeKeyPairs").equals(reader.getName())) { object.setDescribeKeyPairs(DescribeKeyPairsType.Factory.parse(reader)); @@ -101121,7 +102073,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -101259,8 +102212,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -101591,7 +102545,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -101729,8 +102684,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -102037,7 +102993,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -102146,8 +103103,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -102456,7 +103414,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -102570,8 +103529,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -102941,7 +103901,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -103114,8 +104075,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -103381,7 +104343,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteNetworkInterface implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterface", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -103449,7 +104412,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -103497,8 +104461,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -103742,7 +104707,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -103790,8 +104756,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -103937,7 +104904,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumes").equals(reader.getName())) { object.setDescribeVolumes(DescribeVolumesType.Factory.parse(reader)); @@ -104104,7 +105072,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -104246,8 +105215,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -104477,7 +105447,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeDhcpOptionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -104545,7 +105516,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -104593,8 +105565,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -104770,7 +105743,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteInternetGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -104838,7 +105812,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -104886,8 +105861,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -105159,7 +106135,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -105220,8 +106197,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -105464,7 +106442,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -105512,8 +106491,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -105659,7 +106639,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImage").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImage").equals(reader.getName())) { object.setCreateImage(CreateImageType.Factory.parse(reader)); @@ -105756,7 +106737,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -105804,8 +106786,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -106104,7 +107087,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -106246,8 +107230,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -106659,7 +107644,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -106865,8 +107851,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -107315,7 +108302,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -107514,8 +108502,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -107996,7 +108985,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -108176,8 +109166,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -108400,7 +109391,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { object.setLaunchSpecification(ImportInstanceLaunchSpecificationType.Factory.parse(reader)); @@ -108432,7 +109424,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "keepPartialImports").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "keepPartialImports").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -108603,7 +109596,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -108749,8 +109743,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -108944,7 +109939,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "routeTableAssociationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -109006,7 +110002,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeImagesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImagesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -109074,7 +110071,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -109122,8 +110120,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -109370,7 +110369,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -109479,8 +110479,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -109762,7 +110763,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -109810,8 +110812,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -110082,7 +111085,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -110196,8 +111200,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -110546,7 +111551,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -110640,8 +111646,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -110894,7 +111901,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceNetworkAclEntry implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntry", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -110962,7 +111970,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -111010,8 +112019,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -111299,7 +112309,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -111393,8 +112404,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -111743,7 +112755,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -111881,8 +112894,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -112118,7 +113132,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class GetConsoleOutputResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutputResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutputResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -112186,7 +113201,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -112234,8 +113250,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -112523,7 +113540,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -112617,8 +113635,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -112939,7 +113958,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -112987,8 +114007,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -113134,7 +114155,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstances").equals(reader.getName())) { object.setStartInstances(StartInstancesType.Factory.parse(reader)); @@ -113721,7 +114743,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -113736,7 +114759,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeInstanceAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeInstanceAttributeResponseTypeChoice_type0", xmlWriter); } @@ -113770,14 +114794,15 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localDisableApiTermination == null) { throw new org.apache.axis2.databinding.ADBException("disableApiTermination cannot be null!!"); } - localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, xmlWriter); + localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, + xmlWriter); } if (localInstanceInitiatedShutdownBehaviorTracker) { if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localRootDeviceNameTracker) { if (localRootDeviceName == null) { @@ -113849,8 +114874,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -114132,7 +115158,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(NullableAttributeBooleanValueType.Factory.parse(reader)); @@ -114163,7 +115190,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(InstanceBlockDeviceMappingResponseType.Factory.parse(reader)); @@ -114319,7 +115347,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -114460,8 +115489,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -114666,7 +115696,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -114820,7 +115851,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -114966,8 +115998,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -115342,7 +116375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -115461,8 +116495,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -115879,7 +116914,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -116057,8 +117093,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -116296,7 +117333,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "targetEnvironment").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "targetEnvironment").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -116583,7 +117621,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -116827,8 +117866,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -117349,7 +118389,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -117494,8 +118535,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -117898,7 +118940,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118103,8 +119146,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -118396,7 +119440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateNetworkInterfaceResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -118464,7 +119509,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118512,8 +119558,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -118760,7 +119807,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -118869,8 +119917,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -119049,7 +120098,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -119241,7 +120291,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119446,8 +120497,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -119807,7 +120859,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -119855,8 +120908,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -120002,7 +121056,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetConsoleOutput").equals(reader.getName())) { object.setGetConsoleOutput(GetConsoleOutputType.Factory.parse(reader)); @@ -120031,7 +121086,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class StopInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StopInstancesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -120099,7 +121155,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -120147,8 +121204,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -120419,7 +121477,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -120533,8 +121592,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -120890,7 +121950,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -121063,8 +122124,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -121425,7 +122487,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -121539,8 +122602,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -121838,7 +122902,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -121886,8 +122951,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -122033,7 +123099,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpc").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpc").equals(reader.getName())) { object.setDeleteVpc(DeleteVpcType.Factory.parse(reader)); @@ -122062,7 +123129,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateVpnConnectionRoute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionRoute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionRoute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -122130,7 +123198,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -122178,8 +123247,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -122355,7 +123425,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DisableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagation", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -122423,7 +123494,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -122471,8 +123543,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -122719,7 +123792,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -122828,8 +123902,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -123043,7 +124118,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateNetworkAclResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -123111,7 +124187,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123159,8 +124236,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -123431,7 +124509,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123545,8 +124624,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -123732,7 +124812,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -123844,7 +124925,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123892,8 +124974,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -124039,7 +125122,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RunInstances").equals(reader.getName())) { object.setRunInstances(RunInstancesType.Factory.parse(reader)); @@ -124180,7 +125264,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -124274,8 +125359,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -124623,7 +125709,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -124737,8 +125824,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -125067,7 +126155,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -125161,8 +126250,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -125618,7 +126708,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -125833,8 +126924,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -126305,7 +127397,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126424,8 +127517,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -126637,7 +127731,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpConfigurationSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpConfigurationSet").equals(reader.getName())) { object.setDhcpConfigurationSet(DhcpConfigurationItemSetType.Factory.parse(reader)); @@ -126797,7 +127892,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126891,8 +127987,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -127254,7 +128351,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -127368,8 +128466,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -127674,7 +128773,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -127722,8 +128822,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -128022,7 +129123,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -128110,8 +129212,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -128346,8 +129449,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeNetworkInterfacesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfacesResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeNetworkInterfacesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -128415,7 +129518,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -128463,8 +129567,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -128640,7 +129745,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeConversionTasks implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasks", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeConversionTasks", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -128708,7 +129814,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -128756,8 +129863,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -129001,7 +130109,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -129049,8 +130158,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -129196,7 +130306,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddresses").equals(reader.getName())) { object.setDescribeAddresses(DescribeAddressesType.Factory.parse(reader)); @@ -129337,7 +130448,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -129431,8 +130543,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -129819,7 +130932,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -129938,8 +131052,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -130260,7 +131375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -130308,8 +131424,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -130580,7 +131697,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -130721,8 +131839,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -131030,7 +132149,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -131078,8 +132198,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -131225,7 +132346,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddress").equals(reader.getName())) { object.setAssociateAddress(AssociateAddressType.Factory.parse(reader)); @@ -131322,7 +132444,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -131370,8 +132493,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -131517,7 +132641,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGateway").equals(reader.getName())) { object.setCreateVpnGateway(CreateVpnGatewayType.Factory.parse(reader)); @@ -131658,7 +132783,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -131752,8 +132878,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -132118,7 +133245,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -132212,8 +133340,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -132562,7 +133691,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -132676,8 +133806,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -132914,7 +134045,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVolumeStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeVolumeStatusResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -132982,7 +134114,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -133030,8 +134163,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -133316,7 +134450,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -133403,8 +134538,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -133747,7 +134883,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -133834,8 +134971,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -134164,7 +135302,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -134302,8 +135441,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -134634,7 +135774,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -134721,8 +135862,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -135051,7 +136193,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -135189,8 +136332,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -135538,7 +136682,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -135632,8 +136777,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -135858,7 +137004,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((AvailabilityZoneMessageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(AvailabilityZoneMessageType.class, list1)); + object.setItem((AvailabilityZoneMessageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(AvailabilityZoneMessageType.class, + list1)); } // End of if for expected property start element @@ -136005,7 +137152,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -136178,8 +137326,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -136445,7 +137594,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class EnableVolumeIOResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIOResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -136513,7 +137663,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -136561,8 +137712,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -136738,7 +137890,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ResetSnapshotAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -136806,7 +137959,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -136854,8 +138008,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -137099,7 +138254,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -137147,8 +138303,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -137392,7 +138549,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -137440,8 +138598,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -137587,7 +138746,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVolumeIO").equals(reader.getName())) { object.setEnableVolumeIO(EnableVolumeIOType.Factory.parse(reader)); @@ -137684,7 +138844,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -137732,8 +138893,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -138190,7 +139352,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -138443,8 +139606,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -138783,7 +139947,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ipPermissionsEgress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ipPermissionsEgress").equals(reader.getName())) { object.setIpPermissionsEgress(IpPermissionSetType.Factory.parse(reader)); @@ -138830,7 +139995,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RebootInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -138898,7 +140064,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -138946,8 +140113,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -139684,7 +140852,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -140170,8 +141339,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -140470,7 +141640,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -140608,7 +141779,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -140625,7 +141797,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { object.setLaunchSpecification(LaunchSpecificationResponseType.Factory.parse(reader)); @@ -140674,7 +141847,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -140706,7 +141880,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchedAvailabilityZone").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -140852,7 +142027,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -140946,8 +142122,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -141172,7 +142349,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DhcpConfigurationItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DhcpConfigurationItemType.class, list1)); + object.setItem((DhcpConfigurationItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DhcpConfigurationItemType.class, + list1)); } // End of if for expected property start element @@ -141271,7 +142449,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -141380,8 +142559,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -141805,7 +142985,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -142014,8 +143195,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -142294,7 +143476,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -142326,7 +143509,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteNetworkAclEntry implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntry", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -142394,7 +143578,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -142442,8 +143627,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -142714,7 +143900,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -142852,8 +144039,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -143157,7 +144345,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143205,8 +144394,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -143352,7 +144542,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAcl").equals(reader.getName())) { object.setCreateNetworkAcl(CreateNetworkAclType.Factory.parse(reader)); @@ -143381,7 +144572,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AttachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AttachNetworkInterfaceResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -143449,7 +144641,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143497,8 +144690,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -143793,7 +144987,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143939,8 +145134,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -144152,7 +145348,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -144291,7 +145488,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -144429,8 +145627,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -144666,7 +145865,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelExportTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTaskResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTaskResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -144734,7 +145934,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -144782,8 +145983,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -144959,7 +146161,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class UnmonitorInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -145027,7 +146230,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -145075,8 +146279,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -145347,7 +146552,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -145461,8 +146667,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -145866,7 +147073,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -146022,8 +147230,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -146332,7 +147541,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyVolumeAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyVolumeAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -146400,7 +147610,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -146448,8 +147659,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -146737,7 +147949,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -146831,8 +148044,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -147392,7 +148606,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -147407,7 +148622,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeImageAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeImageAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeImageAttributeResponseTypeChoice_type0", xmlWriter); } @@ -147483,8 +148699,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -147728,7 +148945,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -147822,7 +149040,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem); list.add(param); - this.localItem = (DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]); + this.localItem = + (DescribeReservedInstancesOfferingsResponseSetItemType[])list.toArray(new DescribeReservedInstancesOfferingsResponseSetItemType[list.size()]); } @@ -147861,7 +149080,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -147896,7 +149116,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetType", xmlWriter); } @@ -147955,8 +149176,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -148305,7 +149527,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -148443,8 +149666,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -148680,7 +149904,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class StartInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "StartInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -148748,7 +149973,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -148796,8 +150022,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -148973,8 +150200,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInternetGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInternetGatewaysResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeInternetGatewaysResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -149042,7 +150269,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -149090,8 +150318,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -149267,7 +150496,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateSnapshotResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSnapshotResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -149335,7 +150565,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -149383,8 +150614,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -149655,7 +150887,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -149769,8 +151002,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -149974,7 +151208,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { object.setReservedInstancesSet(DescribeReservedInstancesResponseSetType.Factory.parse(reader)); @@ -150119,7 +151354,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -150213,8 +151449,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -150653,7 +151890,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -150857,8 +152095,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -151331,7 +152570,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -151511,8 +152751,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -151872,7 +153113,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -151981,8 +153223,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -152291,7 +153534,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152405,8 +153649,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -152610,7 +153855,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "securityGroupInfo").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "securityGroupInfo").equals(reader.getName())) { object.setSecurityGroupInfo(SecurityGroupSetType.Factory.parse(reader)); @@ -152711,7 +153957,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152759,8 +154006,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -152906,7 +154154,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTags").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeTags").equals(reader.getName())) { object.setDescribeTags(DescribeTagsType.Factory.parse(reader)); @@ -153047,7 +154296,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -153141,8 +154391,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -153367,7 +154618,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((CustomerGatewayIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(CustomerGatewayIdSetItemType.class, list1)); + object.setItem((CustomerGatewayIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + CustomerGatewayIdSetItemType.class, list1)); } // End of if for expected property start element @@ -153533,7 +154785,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -153548,7 +154801,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeVolumeAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeVolumeAttributeResponseTypeChoice_type0", xmlWriter); } @@ -153600,8 +154854,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -153889,7 +155144,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -154003,8 +155259,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -154399,7 +155656,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -154574,8 +155832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -154773,7 +156032,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -154930,7 +156190,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -154978,8 +156239,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -155641,7 +156903,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155992,7 +157255,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localPrivateIpAddressesSet == null) { throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!"); } - localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, xmlWriter); + localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, + xmlWriter); } xmlWriter.writeEndElement(); @@ -156029,8 +157293,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -156304,7 +157569,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -156506,7 +157772,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(InstancePrivateIpAddressesSetType.Factory.parse(reader)); @@ -156538,7 +157805,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteSnapshotResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSnapshotResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -156606,7 +157874,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -156654,8 +157923,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -156969,7 +158239,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -156994,7 +158265,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localCreateVolumePermission == null) { throw new org.apache.axis2.databinding.ADBException("createVolumePermission cannot be null!!"); } - localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, xmlWriter); + localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, + xmlWriter); } if (localProductCodesTracker) { if (localProductCodes == null) { @@ -157036,8 +158308,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -157199,7 +158472,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(EmptyElementType.Factory.parse(reader)); @@ -157301,7 +158575,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -157410,8 +158685,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -157625,7 +158901,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateVpnGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -157693,7 +158970,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -157741,8 +159019,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -157986,7 +159265,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -158034,8 +159314,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -158181,7 +159462,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGateway").equals(reader.getName())) { object.setAttachVpnGateway(AttachVpnGatewayType.Factory.parse(reader)); @@ -158281,7 +159563,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -158390,8 +159673,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -158785,7 +160069,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -158939,8 +160224,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -159137,7 +160423,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -159255,7 +160542,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159396,8 +160684,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -159705,7 +160994,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -159753,8 +161043,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -160001,7 +161292,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -160110,8 +161402,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -160325,7 +161618,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateKeyPairResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPairResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -160393,7 +161687,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -160441,8 +161736,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -160713,7 +162009,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -160851,8 +162148,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -161207,7 +162505,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -161380,8 +162679,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -161759,7 +163059,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -161853,8 +163154,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -162079,7 +163381,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((VolumeStatusDetailsItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusDetailsItemType.class, list1)); + object.setItem((VolumeStatusDetailsItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusDetailsItemType.class, + list1)); } // End of if for expected property start element @@ -162202,7 +163505,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -162337,8 +163641,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -162570,8 +163875,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DisableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisableVgwRoutePropagationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DisableVgwRoutePropagationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -162639,7 +163944,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -162687,8 +163993,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -162959,7 +164266,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -163073,8 +164381,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -163278,7 +164587,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewaySet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewaySet").equals(reader.getName())) { object.setInternetGatewaySet(InternetGatewaySetType.Factory.parse(reader)); @@ -163406,7 +164716,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -163547,8 +164858,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -163900,7 +165212,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -163994,8 +165307,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -164343,7 +165657,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -164457,8 +165772,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -164807,7 +166123,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -164901,8 +166218,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -165156,7 +166474,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeRouteTablesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRouteTablesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -165224,7 +166543,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -165272,8 +166592,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -165518,7 +166839,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -165566,8 +166888,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -165876,7 +167199,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -166049,8 +167373,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -166387,7 +167712,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -166496,8 +167822,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -166711,7 +168038,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSpotPriceHistory implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotPriceHistory", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotPriceHistory", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -166779,7 +168107,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -166827,8 +168156,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -167072,7 +168402,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -167120,8 +168451,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -167267,7 +168599,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImage").equals(reader.getName())) { object.setDeregisterImage(DeregisterImageType.Factory.parse(reader)); @@ -168073,7 +169406,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -168607,8 +169941,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -169106,7 +170441,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -169153,7 +170489,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -169237,7 +170574,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { object.setNetworkInterfaceSet(InstanceNetworkInterfaceSetRequestType.Factory.parse(reader)); @@ -169252,7 +170590,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { object.setIamInstanceProfile(IamInstanceProfileRequestType.Factory.parse(reader)); @@ -169396,7 +170735,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -169510,8 +170850,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -169715,7 +171056,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTask").equals(reader.getName())) { object.setBundleInstanceTask(BundleInstanceTaskType.Factory.parse(reader)); @@ -169860,7 +171202,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -169954,8 +171297,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -170303,7 +171647,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -170441,8 +171786,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -171029,7 +172375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -171146,7 +172493,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localProductDescriptionSet == null) { throw new org.apache.axis2.databinding.ADBException("productDescriptionSet cannot be null!!"); } - localProductDescriptionSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet"), factory, xmlWriter); + localProductDescriptionSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet"), factory, + xmlWriter); } if (localFilterSetTracker) { if (localFilterSet == null) { @@ -171288,8 +172636,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -171579,7 +172928,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescriptionSet").equals(reader.getName())) { object.setProductDescriptionSet(ProductDescriptionSetType.Factory.parse(reader)); @@ -171763,7 +173113,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -171869,8 +173220,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -172081,8 +173433,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaceAttribute", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeNetworkInterfaceAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -172150,7 +173502,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -172198,8 +173551,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -172595,7 +173949,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -172835,8 +174190,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -173052,7 +174408,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -173270,7 +174627,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -173408,8 +174766,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -173740,7 +175099,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -173854,8 +175214,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -174041,7 +175402,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -174197,7 +175559,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -174291,8 +175654,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -174640,7 +176004,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -174778,8 +176143,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -175015,8 +176381,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionRouteResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateVpnConnectionRouteResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -175084,7 +176450,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -175132,8 +176499,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -175404,7 +176772,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -175542,8 +176911,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -175865,7 +177235,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -175971,8 +177342,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -176183,8 +177555,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteVpnConnectionRouteResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionRouteResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteVpnConnectionRouteResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -176252,7 +177624,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -176300,8 +177673,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -176477,8 +177851,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeReservedInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -176546,7 +177920,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -176594,8 +177969,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -176883,7 +178259,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -176977,8 +178354,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -177203,7 +178581,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((RouteTableAssociationType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(RouteTableAssociationType.class, list1)); + object.setItem((RouteTableAssociationType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(RouteTableAssociationType.class, + list1)); } // End of if for expected property start element @@ -177299,7 +178678,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -177347,8 +178727,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -177494,7 +178875,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpcResponse").equals(reader.getName())) { object.setCreateVpcResponse(CreateVpcResponseType.Factory.parse(reader)); @@ -177591,7 +178973,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -177639,8 +179022,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -177887,7 +179271,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -177996,8 +179381,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -178176,7 +179562,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -178306,7 +179693,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178444,8 +179832,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -178793,7 +180182,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178887,8 +180277,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -179210,7 +180601,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -179258,8 +180650,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -179405,7 +180798,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTags").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTags").equals(reader.getName())) { object.setCreateTags(CreateTagsType.Factory.parse(reader)); @@ -179529,7 +180923,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -179643,8 +181038,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -179848,7 +181244,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(CreateVolumePermissionOperationType.Factory.parse(reader)); @@ -179976,7 +181373,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -180090,8 +181488,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -180423,7 +181822,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -180537,8 +181937,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -180894,7 +182295,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -181064,8 +182466,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -181256,7 +182659,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -181439,7 +182843,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -181533,8 +182938,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -181855,7 +183261,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -181903,8 +183310,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -182285,7 +183693,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182446,8 +183855,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -182911,7 +184321,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -183030,8 +184441,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -183407,7 +184819,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -183495,8 +184908,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -183799,7 +185213,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -183847,8 +185262,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -184095,7 +185511,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184204,8 +185621,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -184419,7 +185837,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ConfirmProductInstanceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstanceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ConfirmProductInstanceResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -184487,7 +185906,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184535,8 +185955,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -184807,7 +186228,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184921,8 +186343,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -185159,7 +186582,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeReservedInstances implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstances", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -185227,7 +186651,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -185275,8 +186700,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -185520,7 +186946,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -185568,8 +186995,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -185715,7 +187143,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnmonitorInstances").equals(reader.getName())) { object.setUnmonitorInstances(MonitorInstancesType.Factory.parse(reader)); @@ -185744,7 +187173,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DetachNetworkInterface implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterface", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -185812,7 +187242,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -185860,8 +187291,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -186146,7 +187578,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -186191,7 +187624,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localSpotInstanceRequestIdSet == null) { throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestIdSet cannot be null!!"); } - localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet"), factory, xmlWriter); + localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet"), factory, + xmlWriter); if (localFilterSetTracker) { if (localFilterSet == null) { throw new org.apache.axis2.databinding.ADBException("filterSet cannot be null!!"); @@ -186233,8 +187667,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -186420,7 +187855,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { object.setSpotInstanceRequestIdSet(SpotInstanceRequestIdSetType.Factory.parse(reader)); @@ -186536,7 +187972,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -186584,8 +188021,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -186870,7 +188308,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -186957,8 +188396,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -187144,7 +188584,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayIdSet").equals(reader.getName())) { object.setInternetGatewayIdSet(InternetGatewayIdSetType.Factory.parse(reader)); @@ -187304,7 +188745,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -187398,8 +188840,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -187785,7 +189228,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -187955,8 +189399,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -188330,7 +189775,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -188424,8 +189870,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -188797,7 +190244,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -188967,8 +190415,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -189325,7 +190774,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -189439,8 +190889,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -189644,7 +191095,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewaySet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewaySet").equals(reader.getName())) { object.setCustomerGatewaySet(CustomerGatewaySetType.Factory.parse(reader)); @@ -189677,7 +191129,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteKeyPairResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPairResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -189745,7 +191198,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -189793,8 +191247,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -189970,7 +191425,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AssociateAddressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateAddressResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -190038,7 +191494,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -190086,8 +191543,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -190375,7 +191833,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -190469,8 +191928,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -190884,7 +192344,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -191059,8 +192520,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -191327,7 +192789,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeLicensesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicensesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicensesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -191395,7 +192858,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -191443,8 +192907,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -191729,7 +193194,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -191867,8 +193333,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -192199,7 +193666,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -192337,8 +193805,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -192669,7 +194138,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -192807,8 +194277,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -193044,7 +194515,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AuthorizeSecurityGroupEgress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupEgress", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -193112,7 +194584,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -193160,8 +194633,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -193449,7 +194923,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -193543,8 +195018,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -193769,7 +195245,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeSnapshotsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeSnapshotsSetItemType.class, list1)); + object.setItem((DescribeSnapshotsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + DescribeSnapshotsSetItemType.class, list1)); } // End of if for expected property start element @@ -193892,7 +195369,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194030,8 +195508,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -194267,7 +195746,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRouteTableResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -194335,7 +195815,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194383,8 +195864,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -194655,7 +196137,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -194769,8 +196252,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -194956,7 +196440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -194974,7 +196459,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(AssignPrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -195119,7 +196605,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195213,8 +196700,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -195538,7 +197026,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195573,7 +197062,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsSetItemType", xmlWriter); } @@ -195647,8 +197137,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -195863,8 +197354,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSpotPriceHistoryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotPriceHistoryResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotPriceHistoryResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -195932,7 +197423,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -195980,8 +197472,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -196157,7 +197650,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVpnGatewaysResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnGatewaysResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -196225,7 +197719,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -196273,8 +197768,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -196559,7 +198055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -196700,8 +198197,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -197036,7 +198534,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -197177,8 +198676,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -197994,7 +199494,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -198368,8 +199869,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -198809,7 +200311,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -198856,7 +200359,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { object.setNetworkInterfaceSet(InstanceNetworkInterfaceSetRequestType.Factory.parse(reader)); @@ -198871,7 +200375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { object.setIamInstanceProfile(IamInstanceProfileRequestType.Factory.parse(reader)); @@ -199032,7 +200537,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -199126,8 +200632,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -199451,7 +200958,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -199560,8 +201068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -199870,7 +201379,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -199984,8 +201494,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -200222,7 +201733,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetSnapshotAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetSnapshotAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -200290,7 +201802,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -200338,8 +201851,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -200515,7 +202029,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSecurityGroups implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroups", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -200583,7 +202098,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -200631,8 +202147,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -200904,7 +202421,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -200965,8 +202483,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -201237,7 +202756,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -201298,8 +202818,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -201542,7 +203063,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -201590,8 +203112,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -201767,7 +203290,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetImageAttributeResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -201835,7 +203359,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -201883,8 +203408,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -202128,7 +203654,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202176,8 +203703,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -202465,7 +203993,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202559,8 +204088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -202785,8 +204315,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((SpotInstanceRequestIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SpotInstanceRequestIdSetItemType.class, - list1)); + object.setItem((SpotInstanceRequestIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + SpotInstanceRequestIdSetItemType.class, list1)); } // End of if for expected property start element @@ -202885,7 +204415,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -202994,8 +204525,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -203209,7 +204741,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteInternetGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -203277,7 +204810,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -203325,8 +204859,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -203570,7 +205105,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -203618,8 +205154,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -203765,7 +205302,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstances").equals(reader.getName())) { object.setDescribeInstances(DescribeInstancesType.Factory.parse(reader)); @@ -203927,7 +205465,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -204094,8 +205633,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -204448,7 +205988,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -204562,8 +206103,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -204985,7 +206527,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -205084,8 +206627,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -205460,7 +207004,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -205601,8 +207146,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -205977,7 +207523,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -206106,8 +207653,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -206293,7 +207841,7 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // handle attribute "version" java.lang.String tempAttribVersion = - reader.getAttributeValue(null, "version"); + reader.getAttributeValue(null, "version"); if (tempAttribVersion != null) { java.lang.String content = tempAttribVersion; @@ -206310,7 +207858,7 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // handle attribute "encoding" java.lang.String tempAttribEncoding = - reader.getAttributeValue(null, "encoding"); + reader.getAttributeValue(null, "encoding"); if (tempAttribEncoding != null) { java.lang.String content = tempAttribEncoding; @@ -206434,7 +207982,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -206543,8 +208092,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -206853,7 +208403,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -206967,8 +208518,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -207314,7 +208866,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207401,8 +208954,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -207588,7 +209142,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "placementGroupSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "placementGroupSet").equals(reader.getName())) { object.setPlacementGroupSet(DescribePlacementGroupsInfoType.Factory.parse(reader)); @@ -207636,7 +209191,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyNetworkInterfaceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifyNetworkInterfaceAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -207704,7 +209260,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207752,8 +209309,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -208024,7 +209582,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208162,8 +209721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -209033,7 +210593,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -209515,7 +211076,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localPrivateIpAddressesSet == null) { throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!"); } - localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, xmlWriter); + localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, + xmlWriter); } xmlWriter.writeEndElement(); @@ -209552,8 +211114,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -209863,7 +211426,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -210151,7 +211715,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(NetworkInterfacePrivateIpAddressesSetType.Factory.parse(reader)); @@ -210278,7 +211843,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -210392,8 +211958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -210630,7 +212197,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeBundleTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeBundleTasksResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -210698,7 +212266,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -210746,8 +212315,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -211084,7 +212654,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211259,8 +212830,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -211595,7 +213167,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211643,8 +213216,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -211790,7 +213364,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPair").equals(reader.getName())) { object.setImportKeyPair(ImportKeyPairType.Factory.parse(reader)); @@ -211887,7 +213462,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -211935,8 +213511,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -212207,7 +213784,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -212348,8 +213926,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -212589,7 +214168,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreatePlacementGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreatePlacementGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreatePlacementGroupResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -212657,7 +214237,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -212705,8 +214286,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -213005,7 +214587,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213093,8 +214676,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -213441,7 +215025,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213535,8 +215120,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -213885,7 +215471,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -214023,8 +215610,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -214372,7 +215960,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -214466,8 +216055,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -214819,7 +216409,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -214913,8 +216504,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -215236,7 +216828,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -215345,8 +216938,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -215679,7 +217273,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -215849,8 +217444,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -216077,7 +217673,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importManifestUrl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importManifestUrl").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -216112,7 +217709,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteNetworkInterfaceResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -216180,7 +217778,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -216228,8 +217827,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -216405,7 +218005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInternetGateways implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInternetGateways", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInternetGateways", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -216473,7 +218074,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -216521,8 +218123,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -216769,7 +218372,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -216878,8 +218482,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -217226,7 +218831,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -217372,8 +218978,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -217586,7 +219193,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotPriceHistorySet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotPriceHistorySet").equals(reader.getName())) { object.setSpotPriceHistorySet(SpotPriceHistorySetType.Factory.parse(reader)); @@ -217779,7 +219387,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -217957,8 +219566,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -218359,7 +219969,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -218453,8 +220064,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -218802,7 +220414,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -218940,8 +220553,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -219248,7 +220862,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -219354,8 +220969,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -219677,7 +221293,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -219771,8 +221388,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -220121,7 +221739,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -220262,8 +221881,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -220598,7 +222218,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -220712,8 +222333,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -221038,7 +222660,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -221179,8 +222802,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -221600,7 +223224,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -221673,8 +223298,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -221956,7 +223582,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -222001,7 +223628,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localSpotInstanceRequestIdSet == null) { throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestIdSet cannot be null!!"); } - localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet"), factory, xmlWriter); + localSpotInstanceRequestIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -222038,8 +223666,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -222217,7 +223846,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestIdSet").equals(reader.getName())) { object.setSpotInstanceRequestIdSet(SpotInstanceRequestIdSetType.Factory.parse(reader)); @@ -222250,7 +223880,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AllocateAddressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AllocateAddressResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -222318,7 +223949,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -222366,8 +223998,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -222614,7 +224247,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -222723,8 +224357,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -223033,7 +224668,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -223174,8 +224810,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -223510,7 +225147,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -223648,8 +225286,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -223885,7 +225524,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ResetInstanceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -223953,7 +225593,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -224001,8 +225642,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -224273,7 +225915,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -224308,7 +225951,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseType", xmlWriter); } @@ -224350,8 +225994,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, - xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), + factory, xmlWriter); xmlWriter.writeEndElement(); @@ -224388,8 +226032,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -224698,7 +226343,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -224807,8 +226453,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -224987,7 +226634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -225155,7 +226803,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -225190,7 +226839,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":NetworkInterfacePrivateIpAddressesSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":NetworkInterfacePrivateIpAddressesSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "NetworkInterfacePrivateIpAddressesSetItemType", xmlWriter); } @@ -225298,8 +226948,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -225558,7 +227209,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVpnConnectionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpnConnectionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeVpnConnectionsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -225626,7 +227278,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -225674,8 +227327,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -225946,7 +227600,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -226060,8 +227715,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -226298,7 +227954,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DetachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DetachInternetGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -226366,7 +228023,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -226414,8 +228072,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -226714,7 +228373,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -226856,8 +228516,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -227169,7 +228830,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -227278,8 +228940,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -227458,7 +229121,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -227561,7 +229225,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -227609,8 +229274,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -227857,7 +229523,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -227939,8 +229606,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -228118,7 +229786,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpConfigurationSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpConfigurationSet").equals(reader.getName())) { object.setDhcpConfigurationSet(DhcpConfigurationItemSetType.Factory.parse(reader)); @@ -228222,7 +229891,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -228331,8 +230001,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -228658,7 +230329,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -228752,8 +230424,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -228978,8 +230651,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((SpotInstanceRequestSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SpotInstanceRequestSetItemType.class, - list1)); + object.setItem((SpotInstanceRequestSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + SpotInstanceRequestSetItemType.class, list1)); } // End of if for expected property start element @@ -229007,7 +230680,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DetachVpnGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -229075,7 +230749,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -229123,8 +230798,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -229395,7 +231071,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -229533,8 +231210,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -229841,7 +231519,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -229950,8 +231629,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -230165,7 +231845,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeExportTasksResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeExportTasksResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -230233,7 +231914,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -230281,8 +231963,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -230570,7 +232253,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -230664,8 +232348,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -230890,7 +232575,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((InternetGatewayIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(InternetGatewayIdSetItemType.class, list1)); + object.setItem((InternetGatewayIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + InternetGatewayIdSetItemType.class, list1)); } // End of if for expected property start element @@ -230986,7 +232672,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -231034,8 +232721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -231310,7 +232998,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -231404,8 +233093,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -231815,7 +233505,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232017,8 +233708,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -232272,7 +233964,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -232374,7 +234067,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232422,8 +234116,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -232569,7 +234264,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateTagsResponse").equals(reader.getName())) { object.setCreateTagsResponse(CreateTagsResponseType.Factory.parse(reader)); @@ -232666,7 +234362,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -232714,8 +234411,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -232861,7 +234559,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicense").equals(reader.getName())) { object.setActivateLicense(ActivateLicenseType.Factory.parse(reader)); @@ -232958,7 +234657,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -233006,8 +234706,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -233183,7 +234884,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RequestSpotInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RequestSpotInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "RequestSpotInstancesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -233251,7 +234953,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -233299,8 +235002,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -233575,7 +235279,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -233669,8 +235374,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -233922,7 +235628,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelReservedInstancesListing implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelReservedInstancesListing", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CancelReservedInstancesListing", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -233990,7 +235697,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -234038,8 +235746,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -234310,7 +236019,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -234451,8 +236161,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -234692,7 +236403,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ActivateLicenseResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicenseResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ActivateLicenseResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -234760,7 +236472,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -234808,8 +236521,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -235097,7 +236811,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235191,8 +236906,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -235417,7 +237133,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((VolumeStatusActionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusActionItemType.class, list1)); + object.setItem((VolumeStatusActionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusActionItemType.class, + list1)); } // End of if for expected property start element @@ -235445,7 +237162,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSnapshotsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -235513,7 +237231,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235561,8 +237280,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -235919,7 +237639,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -236129,8 +237850,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -236667,7 +238389,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -236682,8 +238405,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", - xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + + ":DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeNetworkInterfaceAttributeResponseTypeChoice_type0", xmlWriter); } @@ -236747,8 +238470,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -237048,7 +238772,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -237157,8 +238882,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -237443,7 +239169,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -237552,8 +239279,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -237862,7 +239590,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238003,8 +239732,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -238425,7 +240155,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238608,8 +240339,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -239016,7 +240748,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -239154,8 +240887,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -239486,7 +241220,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -239627,8 +241362,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -239980,7 +241716,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -240074,8 +241811,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -240300,8 +242038,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((InstanceStatusDetailsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(InstanceStatusDetailsSetItemType.class, - list1)); + object.setItem((InstanceStatusDetailsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + InstanceStatusDetailsSetItemType.class, list1)); } // End of if for expected property start element @@ -240376,7 +242114,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -240453,8 +242192,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -240635,7 +242375,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSubnetsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnetsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnetsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -240703,7 +242444,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -240751,8 +242493,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -241147,7 +242890,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -241362,8 +243106,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -241700,8 +243445,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotDatafeedSubscription", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotDatafeedSubscription", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -241769,7 +243514,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -241817,8 +243563,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -242106,7 +243853,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -242200,8 +243948,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -242426,8 +244175,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeImagesExecutableByType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeImagesExecutableByType.class, - list1)); + object.setItem((DescribeImagesExecutableByType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + DescribeImagesExecutableByType.class, list1)); } // End of if for expected property start element @@ -242526,7 +244275,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -242635,8 +244385,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -242918,7 +244669,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -242966,8 +244718,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -243211,7 +244964,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -243259,8 +245013,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -243406,7 +245161,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTable").equals(reader.getName())) { object.setCreateRouteTable(CreateRouteTableType.Factory.parse(reader)); @@ -243616,7 +245372,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -243850,8 +245607,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -244129,7 +245887,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "acceptedRouteCount").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "acceptedRouteCount").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -244164,8 +245923,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class UnassignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "UnassignPrivateIpAddressesResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "UnassignPrivateIpAddressesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -244233,7 +245992,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -244281,8 +246041,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -244529,7 +246290,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -244638,8 +246400,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -244965,7 +246728,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -245059,8 +246823,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -245285,7 +247050,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((SecurityGroupIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SecurityGroupIdSetItemType.class, list1)); + object.setItem((SecurityGroupIdSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SecurityGroupIdSetItemType.class, + list1)); } // End of if for expected property start element @@ -245384,7 +247150,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -245493,8 +247260,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -245673,7 +247441,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -245803,7 +247572,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -245917,8 +247687,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -246250,7 +248021,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -246388,8 +248160,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -246768,7 +248541,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -246973,8 +248747,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -247404,7 +249179,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -247492,8 +249268,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -247829,7 +249606,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -247923,8 +249701,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -248177,7 +249956,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AttachInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AttachInternetGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -248245,7 +250025,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -248293,8 +250074,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -248470,7 +250252,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AuthorizeSecurityGroupIngress implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngress", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupIngress", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -248538,7 +250321,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -248586,8 +250370,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -248862,7 +250647,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -248956,8 +250742,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -249179,7 +250966,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((ProductDescriptionSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(ProductDescriptionSetItemType.class, list1)); + object.setItem((ProductDescriptionSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + ProductDescriptionSetItemType.class, list1)); } // End of if for expected property start element @@ -249569,7 +251357,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -249831,8 +251620,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -250242,8 +252032,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequestsResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CancelSpotInstanceRequestsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -250311,7 +252101,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -250359,8 +252150,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -250648,7 +252440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -250742,8 +252535,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -252368,7 +254162,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -253353,8 +255148,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -254266,7 +256062,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(InstanceBlockDeviceMappingResponseType.Factory.parse(reader)); @@ -254281,7 +256078,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceLifecycle").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceLifecycle").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -254298,7 +256096,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -254330,7 +256129,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "virtualizationType").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "virtualizationType").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -254396,7 +256196,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { object.setNetworkInterfaceSet(InstanceNetworkInterfaceSetType.Factory.parse(reader)); @@ -254411,7 +256212,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { object.setIamInstanceProfile(IamInstanceProfileResponseType.Factory.parse(reader)); @@ -254682,7 +256484,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -254761,8 +256564,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -255110,7 +256914,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -255145,7 +256950,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeNetworkInterfaceAttributeResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeNetworkInterfaceAttributeResponseType", xmlWriter); } @@ -255256,8 +257062,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -255469,7 +257276,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -255608,7 +257416,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -255749,8 +257558,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -256058,7 +257868,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -256106,8 +257917,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -256253,7 +258065,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteTagsResponse").equals(reader.getName())) { object.setDeleteTagsResponse(DeleteTagsResponseType.Factory.parse(reader)); @@ -256353,7 +258166,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -256462,8 +258276,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -256745,7 +258560,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -256793,8 +258609,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -256940,7 +258757,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstance").equals(reader.getName())) { object.setImportInstance(ImportInstanceType.Factory.parse(reader)); @@ -257064,7 +258882,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -257205,8 +259024,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -257558,7 +259378,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -257652,8 +259473,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -258016,7 +259838,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -258154,8 +259977,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -258391,7 +260215,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetInstanceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetInstanceAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -258459,7 +260284,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -258507,8 +260333,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -258779,7 +260606,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -258893,8 +260721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -259226,7 +261055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -259364,8 +261194,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -259713,7 +261544,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -259807,8 +261639,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -260170,7 +262003,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -260311,8 +262145,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -260518,7 +262353,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "targetEnvironment").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "targetEnvironment").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -260647,7 +262483,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -260761,8 +262598,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -260966,7 +262804,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "placementGroupSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "placementGroupSet").equals(reader.getName())) { object.setPlacementGroupSet(PlacementGroupSetType.Factory.parse(reader)); @@ -261276,7 +263115,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -261641,8 +263481,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -262135,7 +263976,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -262244,8 +264086,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -262554,7 +264397,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -262631,8 +264475,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, - xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), + factory, xmlWriter); xmlWriter.writeEndElement(); @@ -262669,8 +264513,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -263020,7 +264865,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -263114,8 +264960,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -263340,7 +265187,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((BlockDeviceMappingItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(BlockDeviceMappingItemType.class, list1)); + object.setItem((BlockDeviceMappingItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(BlockDeviceMappingItemType.class, + list1)); } // End of if for expected property start element @@ -263368,7 +265216,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeNetworkInterfaces implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeNetworkInterfaces", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -263436,7 +265285,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -263484,8 +265334,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -263729,7 +265580,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -263777,8 +265629,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -263924,7 +265777,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAcl").equals(reader.getName())) { object.setDeleteNetworkAcl(DeleteNetworkAclType.Factory.parse(reader)); @@ -264096,7 +265950,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -264301,8 +266156,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -264706,7 +266562,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -264800,8 +266657,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -265122,7 +266980,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -265170,8 +267029,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -265470,7 +267330,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -265612,8 +267473,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -265949,7 +267811,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -266087,8 +267950,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -266289,7 +268153,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -266419,7 +268284,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -266560,8 +268426,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -266766,7 +268633,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -266982,7 +268850,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267219,8 +269088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -267450,7 +269320,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -267609,7 +269480,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -267718,8 +269590,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -267933,8 +269806,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RevokeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupIngressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "RevokeSecurityGroupIngressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -268002,7 +269875,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -268050,8 +269924,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -268322,7 +270197,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -268460,8 +270336,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -268697,7 +270574,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceNetworkAclEntryResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -268765,7 +270643,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -268813,8 +270692,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -269058,7 +270938,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -269106,8 +270987,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -269470,7 +271352,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -269547,7 +271430,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localPrivateIpAddressesSet == null) { throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!"); } - localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, xmlWriter); + localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, + xmlWriter); } if (localSecondaryPrivateIpAddressCountTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; @@ -269644,8 +271528,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -269842,7 +271727,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -269860,7 +271746,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(AssignPrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -269895,7 +271782,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "allowReassignment").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "allowReassignment").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -270317,7 +272205,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -270352,8 +272241,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType", - xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", + namespacePrefix + ":DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseSetItemType", xmlWriter); } @@ -270746,8 +272635,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -271115,7 +273005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -271220,7 +273111,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "pricingDetailsSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "pricingDetailsSet").equals(reader.getName())) { object.setPricingDetailsSet(PricingDetailsSetType.Factory.parse(reader)); @@ -271347,7 +273239,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -271461,8 +273354,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -271767,7 +273661,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -271815,8 +273710,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -271962,7 +273858,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSubnets").equals(reader.getName())) { object.setDescribeSubnets(DescribeSubnetsType.Factory.parse(reader)); @@ -272090,7 +273987,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -272184,8 +274082,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -272407,7 +274306,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((InstanceCountsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(InstanceCountsSetItemType.class, list1)); + object.setItem((InstanceCountsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(InstanceCountsSetItemType.class, + list1)); } // End of if for expected property start element @@ -272436,8 +274336,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceRouteTableAssociationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRouteTableAssociationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceRouteTableAssociationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -272505,7 +274405,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -272553,8 +274454,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -272730,7 +274632,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSnapshotAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -272798,7 +274701,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -272846,8 +274750,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -273371,7 +275276,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -273468,8 +275374,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -273711,7 +275618,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(EmptyElementType.Factory.parse(reader)); @@ -273731,7 +275639,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceTypeCategory").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceTypeCategory").equals(reader.getName())) { object.setInstanceTypeCategory(EmptyElementType.Factory.parse(reader)); @@ -273847,7 +275756,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -273988,8 +275898,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -274324,7 +276235,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -274462,8 +276374,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -274767,7 +276680,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -274815,8 +276729,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -275087,7 +277002,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -275122,7 +277038,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":PurchaseReservedInstancesOfferingResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":PurchaseReservedInstancesOfferingResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "PurchaseReservedInstancesOfferingResponseType", xmlWriter); } @@ -275228,8 +277145,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -275434,7 +277352,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -275650,7 +277569,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -275833,8 +277753,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -276214,7 +278135,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -276262,8 +278184,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -276577,7 +278500,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -276698,8 +278622,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -276863,7 +278788,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -277036,7 +278962,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -277157,8 +279084,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -277428,7 +279356,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -277537,8 +279466,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -277821,7 +279751,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -277869,8 +279800,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -278046,7 +279978,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAddressesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -278114,7 +280047,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -278162,8 +280096,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -278478,7 +280413,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -278596,8 +280532,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -278887,7 +280824,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -279025,8 +280963,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -279371,7 +281310,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -279458,8 +281398,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -279693,7 +281634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVolumesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -279761,7 +281703,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -279809,8 +281752,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -280081,7 +282025,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -280222,8 +282167,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -280428,7 +282374,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -280558,7 +282505,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -280672,8 +282620,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -281022,7 +282971,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281116,8 +283066,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -281631,7 +283582,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281877,8 +283829,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -282290,7 +284243,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282399,8 +284353,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -282682,7 +284637,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -282730,8 +284686,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -282877,7 +284834,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshots").equals(reader.getName())) { object.setDescribeSnapshots(DescribeSnapshotsType.Factory.parse(reader)); @@ -282906,7 +284864,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class MonitorInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "MonitorInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -282974,7 +284933,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -283022,8 +284982,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -283332,7 +285293,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -283475,8 +285437,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -283848,7 +285811,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -283942,8 +285906,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -284315,7 +286280,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -284461,8 +286427,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -284917,7 +286884,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -285125,8 +287093,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -285531,7 +287500,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -285625,8 +287595,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -286018,7 +287989,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -286139,8 +288111,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -286435,7 +288408,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -286460,7 +288434,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localCreateVolumePermission == null) { throw new org.apache.axis2.databinding.ADBException("createVolumePermission cannot be null!!"); } - localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, xmlWriter); + localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, + xmlWriter); } } @@ -286496,8 +288471,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -286651,7 +288627,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(EmptyElementType.Factory.parse(reader)); @@ -286672,7 +288649,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelConversionTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelConversionTaskResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CancelConversionTaskResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -286740,7 +288718,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -286788,8 +288767,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -287036,7 +289016,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -287145,8 +289126,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -287603,7 +289585,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -287899,8 +289882,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -288226,7 +290210,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -288329,7 +290314,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -288377,8 +290363,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -288524,7 +290511,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSubnet").equals(reader.getName())) { object.setCreateSubnet(CreateSubnetType.Factory.parse(reader)); @@ -288553,7 +290541,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSecurityGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -288621,7 +290610,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -288669,8 +290659,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -288941,7 +290932,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -289082,8 +291074,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -289435,7 +291428,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -289529,8 +291523,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -289755,8 +291750,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribePlacementGroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribePlacementGroupItemType.class, - list1)); + object.setItem((DescribePlacementGroupItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + DescribePlacementGroupItemType.class, list1)); } // End of if for expected property start element @@ -289879,7 +291874,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -290017,8 +292013,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -290366,7 +292363,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -290460,8 +292458,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -290686,7 +292685,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((VolumeStatusEventItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusEventItemType.class, list1)); + object.setItem((VolumeStatusEventItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(VolumeStatusEventItemType.class, + list1)); } // End of if for expected property start element @@ -290782,7 +292782,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -290830,8 +292831,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -290977,7 +292979,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicense").equals(reader.getName())) { object.setDeactivateLicense(DeactivateLicenseType.Factory.parse(reader)); @@ -291074,7 +293077,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291122,8 +293126,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -291269,7 +293274,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRoute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceRoute").equals(reader.getName())) { object.setReplaceRoute(ReplaceRouteType.Factory.parse(reader)); @@ -291298,7 +293304,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteCustomerGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteCustomerGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -291366,7 +293373,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291414,8 +293422,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -291703,7 +293712,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -291797,8 +293807,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -292023,7 +294034,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((PricingDetailsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(PricingDetailsSetItemType.class, list1)); + object.setItem((PricingDetailsSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(PricingDetailsSetItemType.class, + list1)); } // End of if for expected property start element @@ -292122,7 +294134,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -292231,8 +294244,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -292655,7 +294669,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -292894,8 +294909,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -293179,7 +295195,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "uploadPolicySignature").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -293260,7 +295277,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -293337,8 +295355,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -293519,7 +295538,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeRegionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -293587,7 +295607,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -293635,8 +295656,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -293969,7 +295991,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294174,8 +296197,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -294466,8 +296490,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AuthorizeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupEgressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupEgressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -294535,7 +296559,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294583,8 +296608,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -294760,7 +296786,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteNetworkAclResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -294828,7 +296855,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -294876,8 +296904,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -295191,7 +297220,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -295333,8 +297363,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -295536,7 +297567,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "groupName").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "groupName").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -295635,7 +297667,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -295744,8 +297777,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -296027,7 +298061,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -296075,8 +298110,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -296222,7 +298258,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpc").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpc").equals(reader.getName())) { object.setCreateVpc(CreateVpcType.Factory.parse(reader)); @@ -296251,8 +298288,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeReservedInstancesOfferings implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesOfferings", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesOfferings", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -296320,7 +298357,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -296368,8 +298406,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -296545,8 +298584,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInstanceAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttributeResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeInstanceAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -296614,7 +298653,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -296662,8 +298702,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -296924,7 +298965,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -297006,8 +299048,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -297290,7 +299333,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -297399,8 +299443,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -297579,7 +299624,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -297709,7 +299755,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -297823,8 +299870,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -298028,7 +300076,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(SpotInstanceRequestSetType.Factory.parse(reader)); @@ -298156,7 +300205,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -298294,8 +300344,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -298626,7 +300677,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -298740,8 +300792,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -298945,7 +300998,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneInfo").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneInfo").equals(reader.getName())) { object.setAvailabilityZoneInfo(AvailabilityZoneSetType.Factory.parse(reader)); @@ -299090,7 +301144,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -299184,8 +301239,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -299438,7 +301494,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateInternetGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -299506,7 +301563,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -299554,8 +301612,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -300054,7 +302113,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -300391,8 +302451,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -300719,7 +302780,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -300736,7 +302798,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceOwnerId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -300954,7 +303017,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -301191,8 +303255,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -301622,7 +303687,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -301716,8 +303782,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -302103,7 +304170,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -302249,8 +304317,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -302582,7 +304651,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -302630,8 +304700,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -302902,7 +304973,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -303016,8 +305088,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -303563,7 +305636,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -303903,8 +305977,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -304438,7 +306513,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -304576,8 +306652,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -304908,7 +306985,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -305046,8 +307124,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -305283,7 +307362,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ResetNetworkInterfaceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ResetNetworkInterfaceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ResetNetworkInterfaceAttribute", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -305351,7 +307431,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -305399,8 +307480,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -305688,7 +307770,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -305782,8 +307865,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -306131,7 +308215,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -306269,8 +308354,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -306577,7 +308663,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -306686,8 +308773,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -306866,7 +308954,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -307039,7 +309128,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -307106,8 +309196,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -307368,7 +309459,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -307416,8 +309508,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -307563,7 +309656,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolume").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVolume").equals(reader.getName())) { object.setAttachVolume(AttachVolumeType.Factory.parse(reader)); @@ -307704,7 +309798,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -307798,8 +309893,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -308024,8 +310120,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeKeyPairsResponseItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeKeyPairsResponseItemType.class, - list1)); + object.setItem((DescribeKeyPairsResponseItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + DescribeKeyPairsResponseItemType.class, list1)); } // End of if for expected property start element @@ -308165,7 +310261,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -308259,8 +310356,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -308485,7 +310583,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeSnapshotsOwnerType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeSnapshotsOwnerType.class, list1)); + object.setItem((DescribeSnapshotsOwnerType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeSnapshotsOwnerType.class, + list1)); } // End of if for expected property start element @@ -308608,7 +310707,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -308749,8 +310849,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -309128,7 +311229,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -309249,8 +311351,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -309629,7 +311732,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -309783,8 +311887,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -309981,7 +312086,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -310004,7 +312110,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AttachVpnGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachVpnGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -310072,7 +312179,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -310120,8 +312228,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -310297,7 +312406,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequests", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotInstanceRequests", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -310365,7 +312475,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -310413,8 +312524,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -310658,7 +312770,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -310706,8 +312819,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -310853,7 +312967,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGateway").equals(reader.getName())) { object.setDeleteVpnGateway(DeleteVpnGatewayType.Factory.parse(reader)); @@ -310953,7 +313068,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -311062,8 +313178,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -311348,7 +313465,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -311457,8 +313575,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -311852,7 +313971,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -311952,8 +314072,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -312238,7 +314359,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -312347,8 +314469,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -312633,7 +314756,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -312742,8 +314866,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -312957,7 +315082,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ImportKeyPairResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportKeyPairResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -313025,7 +315151,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -313073,8 +315200,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -313362,7 +315490,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -313456,8 +315585,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -313710,7 +315840,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelSpotInstanceRequests implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelSpotInstanceRequests", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -313778,7 +315909,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -313826,8 +315958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -314074,7 +316207,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -314183,8 +316317,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -314398,7 +316533,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DisassociateRouteTable implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTable", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -314466,7 +316602,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -314514,8 +316651,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -314829,7 +316967,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -314971,8 +317110,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -315579,7 +317719,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -315820,7 +317961,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localPrivateIpAddressesSet == null) { throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!"); } - localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, xmlWriter); + localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, + xmlWriter); } if (localSecondaryPrivateIpAddressCountTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; @@ -315887,8 +318029,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -316125,7 +318268,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -316226,7 +318370,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -316243,7 +318388,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(PrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -316366,7 +318512,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -316475,8 +318622,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -316802,7 +318950,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -316896,8 +319045,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -317236,7 +319386,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -317342,8 +319493,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -317554,8 +319706,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AuthorizeSecurityGroupIngressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AuthorizeSecurityGroupIngressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AuthorizeSecurityGroupIngressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -317623,7 +319775,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -317671,8 +319824,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -317848,7 +320002,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DisassociateAddressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateAddressResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -317916,7 +320071,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -317964,8 +320120,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -318236,7 +320393,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -318323,8 +320481,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -318836,7 +320995,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -319198,8 +321358,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -319731,7 +321892,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -319825,8 +321987,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -320147,7 +322310,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -320195,8 +322359,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -320342,7 +322507,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddress").equals(reader.getName())) { object.setReleaseAddress(ReleaseAddressType.Factory.parse(reader)); @@ -320470,7 +322636,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -320564,8 +322731,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -320787,8 +322955,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((PriceScheduleRequestSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(PriceScheduleRequestSetItemType.class, - list1)); + object.setItem((PriceScheduleRequestSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + PriceScheduleRequestSetItemType.class, list1)); } // End of if for expected property start element @@ -320912,7 +323080,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -321050,8 +323219,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -321358,7 +323528,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -321467,8 +323638,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -321820,7 +323992,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -321835,7 +324008,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSnapshotAttributeResponseTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeSnapshotAttributeResponseTypeChoice_type0", xmlWriter); } @@ -321845,7 +324019,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localCreateVolumePermission == null) { throw new org.apache.axis2.databinding.ADBException("createVolumePermission cannot be null!!"); } - localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, xmlWriter); + localCreateVolumePermission.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission"), factory, + xmlWriter); } if (localProductCodesTracker) { if (localProductCodes == null) { @@ -321887,8 +324062,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -322050,7 +324226,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { // from anyAttributes. java.util.Vector handledAttributes = new java.util.Vector(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createVolumePermission").equals(reader.getName())) { object.setCreateVolumePermission(CreateVolumePermissionListType.Factory.parse(reader)); @@ -322152,7 +324329,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -322261,8 +324439,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -322547,7 +324726,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -322656,8 +324836,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -322939,7 +325120,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -322987,8 +325169,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -323164,8 +325347,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateInstanceExportTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInstanceExportTaskResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateInstanceExportTaskResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -323233,7 +325416,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -323281,8 +325465,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -323458,7 +325643,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInstancesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstancesResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -323526,7 +325712,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -323574,8 +325761,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -323884,7 +326072,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -324003,8 +326192,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -324198,7 +326388,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -324332,7 +326523,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -324380,8 +326572,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -324527,7 +326720,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordData").equals(reader.getName())) { object.setGetPasswordData(GetPasswordDataType.Factory.parse(reader)); @@ -324627,7 +326821,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -324709,8 +326904,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -324992,7 +327188,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -325101,8 +327298,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -325473,7 +327671,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -325669,8 +327868,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -326096,7 +328296,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -326270,8 +328471,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -326649,7 +328851,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -326743,8 +328946,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -327092,7 +329296,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -327230,8 +329435,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -327586,7 +329792,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -327759,8 +329966,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -327955,7 +330163,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -328094,7 +330303,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -328142,8 +330352,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -328387,7 +330598,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -328435,8 +330647,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -328582,7 +330795,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTask").equals(reader.getName())) { object.setCancelBundleTask(CancelBundleTaskType.Factory.parse(reader)); @@ -328682,7 +330896,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -328791,8 +331006,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -329006,7 +331222,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeVolumeAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVolumeAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeVolumeAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -329074,7 +331291,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -329122,8 +331340,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -329442,7 +331661,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -329647,8 +331867,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -330008,7 +332229,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -330056,8 +332278,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -330203,7 +332426,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeLicenses").equals(reader.getName())) { object.setDescribeLicenses(DescribeLicensesType.Factory.parse(reader)); @@ -330342,7 +332566,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -330453,8 +332678,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -330758,7 +332984,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -330867,8 +333094,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -331177,7 +333405,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -331315,8 +333544,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -331664,7 +333894,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -331758,8 +333989,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -332012,8 +334244,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class PurchaseReservedInstancesOffering implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "PurchaseReservedInstancesOffering", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "PurchaseReservedInstancesOffering", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -332081,7 +334313,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -332129,8 +334362,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -332401,7 +334635,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -332542,8 +334777,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -332882,7 +335118,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -332976,8 +335213,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -333199,7 +335437,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((MonitorInstancesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(MonitorInstancesSetItemType.class, list1)); + object.setItem((MonitorInstancesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(MonitorInstancesSetItemType.class, + list1)); } // End of if for expected property start element @@ -333228,7 +335467,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -333296,7 +335536,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -333344,8 +335585,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -333606,7 +335848,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -333715,8 +335958,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -333931,7 +336175,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInstanceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -333999,7 +336244,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -334047,8 +336293,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -334295,7 +336542,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -334404,8 +336652,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -334687,7 +336936,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -334735,8 +336985,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -334882,7 +337133,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSubnet").equals(reader.getName())) { object.setDeleteSubnet(DeleteSubnetType.Factory.parse(reader)); @@ -335006,7 +337258,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -335147,8 +337400,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -335353,7 +337607,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "publicKeyMaterial").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "publicKeyMaterial").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -335388,7 +337643,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribePlacementGroupsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribePlacementGroupsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribePlacementGroupsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -335456,7 +337712,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -335504,8 +337761,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -335681,7 +337939,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateCustomerGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateCustomerGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -335749,7 +338008,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -335797,8 +338057,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -336069,7 +338330,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -336210,8 +338472,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -336546,7 +338809,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -336660,8 +338924,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -336898,8 +339163,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AssignPrivateIpAddressesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssignPrivateIpAddressesResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AssignPrivateIpAddressesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -336967,7 +339232,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -337015,8 +339281,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -337263,7 +339530,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -337372,8 +339640,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -337587,7 +339856,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ConfirmProductInstance implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConfirmProductInstance", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -337655,7 +339925,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -337703,8 +339974,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -338041,7 +340313,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -338162,8 +340435,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -338360,7 +340634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { object.setReservedInstancesSet(DescribeReservedInstancesSetType.Factory.parse(reader)); @@ -338424,7 +340699,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReleaseAddressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReleaseAddressResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -338492,7 +340768,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -338540,8 +340817,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -338717,7 +340995,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class EnableVgwRoutePropagation implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagation", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -338785,7 +341064,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -338833,8 +341113,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -339078,7 +341359,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -339126,8 +341408,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -339273,7 +341556,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcs").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeVpcs").equals(reader.getName())) { object.setDescribeVpcs(DescribeVpcsType.Factory.parse(reader)); @@ -339414,7 +341698,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -339508,8 +341793,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -339830,7 +342116,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -339878,8 +342165,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -340025,7 +342313,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptions").equals(reader.getName())) { object.setDeleteDhcpOptions(DeleteDhcpOptionsType.Factory.parse(reader)); @@ -340054,7 +342343,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateNetworkInterface implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkInterface", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -340122,7 +342412,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -340170,8 +342461,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -340442,7 +342734,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -340556,8 +342849,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -340761,7 +343055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bundleInstanceTasksSet").equals(reader.getName())) { object.setBundleInstanceTasksSet(BundleInstanceTasksSetType.Factory.parse(reader)); @@ -340903,7 +343198,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -341044,8 +343340,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -341397,7 +343694,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -341491,8 +343789,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -341840,7 +344139,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -341981,8 +344281,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -342317,7 +344618,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -342458,8 +344760,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -342646,7 +344949,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -342794,7 +345098,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -342908,8 +345213,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -343269,7 +345575,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -343411,8 +345718,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -343653,7 +345961,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CancelBundleTaskResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTaskResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelBundleTaskResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -343721,7 +346030,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -343769,8 +346079,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -344041,7 +346352,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -344179,8 +346491,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -344416,7 +346729,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateInstanceExportTask implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInstanceExportTask", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInstanceExportTask", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -344484,7 +346798,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -344532,8 +346847,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -344804,7 +347120,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -344945,8 +347262,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -345257,7 +347575,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -345339,8 +347658,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -345551,7 +347871,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ModifyImageAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -345619,7 +347940,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -345667,8 +347989,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -345939,7 +348262,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -346053,8 +348377,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -346386,7 +348711,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -346500,8 +348826,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -346738,7 +349065,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class BundleInstanceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BundleInstanceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -346806,7 +349134,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -346854,8 +349183,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -347099,7 +349429,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -347147,8 +349478,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -347294,7 +349626,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CancelExportTask").equals(reader.getName())) { object.setCancelExportTask(CancelExportTaskType.Factory.parse(reader)); @@ -347435,7 +349768,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -347529,8 +349863,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -347755,7 +350090,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeVolumesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeVolumesSetItemType.class, list1)); + object.setItem((DescribeVolumesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeVolumesSetItemType.class, + list1)); } // End of if for expected property start element @@ -348007,7 +350343,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -348243,8 +350580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -348672,7 +351010,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -348766,8 +351105,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -349178,7 +351518,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -349380,8 +351721,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -349617,7 +351959,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importManifestUrl").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importManifestUrl").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -349792,7 +352135,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -349880,8 +352224,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -350211,7 +352556,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350349,8 +352695,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -350681,7 +353028,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -350795,8 +353143,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -351000,7 +353349,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { object.setNetworkInterfaceSet(NetworkInterfaceSetType.Factory.parse(reader)); @@ -351142,7 +353492,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -351229,8 +353580,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -351416,7 +353768,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneSet").equals(reader.getName())) { object.setAvailabilityZoneSet(DescribeAvailabilityZonesSetType.Factory.parse(reader)); @@ -351464,7 +353817,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifySnapshotAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifySnapshotAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -351532,7 +353886,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -351580,8 +353935,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -351856,7 +354212,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -351950,8 +354307,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -352203,8 +354561,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ReplaceNetworkAclAssociationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ReplaceNetworkAclAssociationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "ReplaceNetworkAclAssociationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -352272,7 +354630,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -352320,8 +354679,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -352596,7 +354956,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -352690,8 +355051,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -353100,7 +355462,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -353305,8 +355668,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -353693,7 +356057,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -353831,8 +356196,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -354163,7 +356529,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -354301,8 +356668,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -354633,7 +357001,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -354710,8 +357079,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesListingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingsSet cannot be null!!"); } - localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), factory, - xmlWriter); + localReservedInstancesListingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingsSet"), + factory, xmlWriter); xmlWriter.writeEndElement(); @@ -354748,8 +357117,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -355058,7 +357428,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -355167,8 +357538,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -355382,7 +357754,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ModifyInstanceAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ModifyInstanceAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -355450,7 +357823,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -355498,8 +357872,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -355787,7 +358162,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -355881,8 +358257,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -356258,7 +358635,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -356303,7 +358681,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localNetworkInterfaceIdSet == null) { throw new org.apache.axis2.databinding.ADBException("networkInterfaceIdSet cannot be null!!"); } - localNetworkInterfaceIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet"), factory, xmlWriter); + localNetworkInterfaceIdSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet"), factory, + xmlWriter); } if (localFilterSetTracker) { if (localFilterSet == null) { @@ -356346,8 +358725,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -356535,7 +358915,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceIdSet").equals(reader.getName())) { object.setNetworkInterfaceIdSet(NetworkInterfaceIdSetType.Factory.parse(reader)); @@ -356694,7 +359075,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -356788,8 +359170,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -357175,7 +359558,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -357267,8 +359651,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -357621,7 +360006,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -357682,8 +360068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -357927,7 +360314,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -357975,8 +360363,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -358152,7 +360541,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DisassociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DisassociateRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DisassociateRouteTableResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -358220,7 +360610,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -358268,8 +360659,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -358516,7 +360908,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -358625,8 +361018,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -358952,7 +361346,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -359046,8 +361441,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -359300,7 +361696,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeImageAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttributeResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeImageAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -359368,7 +361765,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -359416,8 +361814,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -359731,7 +362130,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -359798,8 +362198,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -360126,7 +362527,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -360296,8 +362698,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -360670,7 +363073,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -360757,8 +363161,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -361104,7 +363509,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -361198,8 +363604,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -361424,7 +363831,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((SpotPriceHistorySetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SpotPriceHistorySetItemType.class, list1)); + object.setItem((SpotPriceHistorySetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(SpotPriceHistorySetItemType.class, + list1)); } // End of if for expected property start element @@ -361523,7 +363931,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -361632,8 +364041,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -361959,7 +364369,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -362053,8 +364464,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -362279,7 +364691,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((AttachmentSetItemResponseType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(AttachmentSetItemResponseType.class, list1)); + object.setItem((AttachmentSetItemResponseType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + AttachmentSetItemResponseType.class, list1)); } // End of if for expected property start element @@ -362307,7 +364720,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class GetPasswordDataResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordDataResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "GetPasswordDataResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -362375,7 +364789,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -362423,8 +364838,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -362671,7 +365087,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -362780,8 +365197,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -363090,7 +365508,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -363228,8 +365647,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -363560,7 +365980,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -363698,8 +366119,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -364020,7 +366442,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -364129,8 +366552,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -364414,7 +366838,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -364462,8 +366887,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -364901,7 +367327,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -365050,7 +367477,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localPrivateIpAddressesSet == null) { throw new org.apache.axis2.databinding.ADBException("privateIpAddressesSet cannot be null!!"); } - localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, xmlWriter); + localPrivateIpAddressesSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet"), factory, + xmlWriter); } if (localSecondaryPrivateIpAddressCountTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; @@ -365117,8 +367545,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -365403,7 +367832,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "privateIpAddressesSet").equals(reader.getName())) { object.setPrivateIpAddressesSet(PrivateIpAddressesSetRequestType.Factory.parse(reader)); @@ -365574,7 +368004,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -365720,8 +368151,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -365977,7 +368409,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRouteTableResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -366045,7 +368478,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -366093,8 +368527,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -366270,7 +368705,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteVpnGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnGatewayResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -366338,7 +368774,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -366386,8 +368823,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -366701,7 +369139,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -366789,8 +369228,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -367137,7 +369577,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -367225,8 +369666,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -367530,7 +369972,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -367578,8 +370021,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -367865,7 +370309,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -368003,8 +370448,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -368335,7 +370781,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -368473,8 +370920,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -368822,7 +371270,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -368916,8 +371365,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -369309,7 +371759,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -369324,7 +371775,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":AuthorizeSecurityGroupIngressTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":AuthorizeSecurityGroupIngressTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AuthorizeSecurityGroupIngressTypeChoice_type0", xmlWriter); } @@ -369430,8 +371882,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -369740,7 +372193,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -369878,8 +372332,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -370081,7 +372536,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -370227,7 +372683,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -370321,8 +372778,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -370547,7 +373005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((InternetGatewayAttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(InternetGatewayAttachmentType.class, list1)); + object.setItem((InternetGatewayAttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + InternetGatewayAttachmentType.class, list1)); } // End of if for expected property start element @@ -370575,7 +373034,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AssignPrivateIpAddresses implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssignPrivateIpAddresses", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssignPrivateIpAddresses", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -370643,7 +373103,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -370691,8 +373152,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -370868,7 +373330,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -370936,7 +373399,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -370984,8 +373448,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -371328,7 +373793,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -371559,8 +374025,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -371835,7 +374302,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -372137,7 +374605,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -372411,8 +374880,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -372890,7 +375360,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -372905,8 +375376,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0", - xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + + ":InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "InstanceBlockDeviceMappingResponseItemTypeChoice_type0", xmlWriter); } @@ -372952,8 +375423,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -373223,7 +375695,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -373364,8 +375837,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -373652,7 +376126,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -373729,8 +376204,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -373979,7 +376455,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -374027,8 +376504,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -374174,7 +376652,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolume").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVolume").equals(reader.getName())) { object.setDetachVolume(DetachVolumeType.Factory.parse(reader)); @@ -374298,7 +376777,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -374436,8 +376916,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -374870,7 +377351,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -375048,8 +377530,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -375451,7 +377934,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -375592,8 +378076,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -375833,8 +378318,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSnapshotAttributeResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSnapshotAttributeResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSnapshotAttributeResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -375902,7 +378387,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -375950,8 +378436,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -376222,7 +378709,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -376357,8 +378845,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -376685,7 +379174,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -376799,8 +379289,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -377132,7 +379623,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -377246,8 +379738,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -377484,7 +379977,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteSpotDatafeedSubscription implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteSpotDatafeedSubscription", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteSpotDatafeedSubscription", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -377552,7 +380046,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -377600,8 +380095,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -377889,7 +380385,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -377983,8 +380480,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -378209,7 +380707,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeInstancesItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeInstancesItemType.class, list1)); + object.setItem((DescribeInstancesItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeInstancesItemType.class, + list1)); } // End of if for expected property start element @@ -378428,7 +380927,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -378694,8 +381194,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -379000,7 +381501,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -379103,7 +381605,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -379151,8 +381654,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -379298,7 +381802,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RebootInstances").equals(reader.getName())) { object.setRebootInstances(RebootInstancesType.Factory.parse(reader)); @@ -379396,7 +381901,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -379444,8 +381950,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -379621,7 +382128,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DetachInternetGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachInternetGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -379689,7 +382197,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -379737,8 +382246,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -379914,7 +382424,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeCustomerGateways implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeCustomerGateways", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeCustomerGateways", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -379982,7 +382493,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -380030,8 +382542,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -380278,7 +382791,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -380387,8 +382901,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -380714,7 +383229,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -380808,8 +383324,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -381062,7 +383579,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSecurityGroupsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSecurityGroupsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSecurityGroupsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -381130,7 +383648,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -381178,8 +383697,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -381355,7 +383875,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeregisterImageResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImageResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeregisterImageResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -381423,7 +383944,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -381471,8 +383993,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -381767,7 +384290,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -381913,8 +384437,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -382126,7 +384651,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "destinationCidrBlock").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -382238,7 +384764,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -382286,8 +384813,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -382433,7 +384961,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateKeyPair").equals(reader.getName())) { object.setCreateKeyPair(CreateKeyPairType.Factory.parse(reader)); @@ -382533,7 +385062,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -382642,8 +385172,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -382928,7 +385459,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -383037,8 +385569,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -383323,7 +385856,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -383432,8 +385966,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -383718,7 +386253,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -383827,8 +386363,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -384007,7 +386544,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -384154,7 +386692,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -384248,8 +386787,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -384570,7 +387110,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -384618,8 +387159,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -385020,7 +387562,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -385200,8 +387743,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -385473,7 +388017,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "includeAllInstances").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "includeAllInstances").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -385619,7 +388164,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -385713,8 +388259,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -385939,7 +388486,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeBundleTasksItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeBundleTasksItemType.class, list1)); + object.setItem((DescribeBundleTasksItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeBundleTasksItemType.class, + list1)); } // End of if for expected property start element @@ -386079,7 +388627,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -386173,8 +388722,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -386498,7 +389048,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -386607,8 +389158,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -386893,7 +389445,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -386928,7 +389481,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingSetItemType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingSetItemType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingSetItemType", xmlWriter); } @@ -387002,8 +389556,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -387182,7 +389737,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -387329,7 +389885,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -387423,8 +389980,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -387773,7 +390331,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -387911,8 +390470,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -388219,7 +390779,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -388328,8 +390889,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -388638,7 +391200,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -388752,8 +391315,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -389085,7 +391649,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -389223,8 +391788,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -389531,7 +392097,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -389640,8 +392207,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -389855,7 +392423,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteNetworkAclEntryResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteNetworkAclEntryResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DeleteNetworkAclEntryResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -389923,7 +392492,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -389971,8 +392541,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -390216,7 +392787,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -390264,8 +392836,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -390411,7 +392984,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions").equals(reader.getName())) { object.setCreateDhcpOptions(CreateDhcpOptionsType.Factory.parse(reader)); @@ -390535,7 +393109,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -390673,8 +393248,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -391005,7 +393581,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -391146,8 +393723,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -391387,7 +393965,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeactivateLicenseResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeactivateLicenseResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -391455,7 +394034,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -391503,8 +394083,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -391775,7 +394356,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -391889,8 +394471,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -392195,7 +394778,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -392243,8 +394827,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -392390,7 +394975,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachVpnGateway").equals(reader.getName())) { object.setDetachVpnGateway(DetachVpnGatewayType.Factory.parse(reader)); @@ -392514,7 +395100,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -392655,8 +395242,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -392964,7 +395552,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -393012,8 +395601,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -393159,7 +395749,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRoute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteRoute").equals(reader.getName())) { object.setDeleteRoute(DeleteRouteType.Factory.parse(reader)); @@ -393300,7 +395891,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -393394,8 +395986,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -393760,7 +396353,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -393854,8 +396448,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -394203,7 +396798,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -394341,8 +396937,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -394578,7 +397175,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateNetworkAclEntry implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateNetworkAclEntry", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -394646,7 +397244,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -394694,8 +397293,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -394966,7 +397566,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -395080,8 +397681,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -395857,7 +398459,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -395902,8 +398505,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesOfferingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!"); } - localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, - xmlWriter); + localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), + factory, xmlWriter); } if (localInstanceTypeTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; @@ -396294,8 +398897,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -396612,7 +399216,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "productDescription").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -396678,7 +399283,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "includeMarketplace").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "includeMarketplace").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -397027,7 +399633,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -397042,7 +399649,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ModifyNetworkInterfaceAttributeTypeChoice_type0", xmlWriter); } @@ -397106,8 +399714,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -397431,7 +400040,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -397569,8 +400179,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -397806,7 +400417,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AttachNetworkInterface implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AttachNetworkInterface", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -397874,7 +400486,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -397922,8 +400535,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -398099,7 +400713,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeImageAttribute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImageAttribute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -398167,7 +400782,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -398215,8 +400831,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -398515,7 +401132,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -398603,8 +401221,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -398934,7 +401553,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -399075,8 +401695,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -399384,7 +402005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -399432,8 +402054,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -399579,7 +402202,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeImages").equals(reader.getName())) { object.setDescribeImages(DescribeImagesType.Factory.parse(reader)); @@ -399703,7 +402327,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -399817,8 +402442,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -400150,7 +402776,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -400264,8 +402891,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -400614,7 +403242,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -400708,8 +403337,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -401436,7 +404066,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -401485,14 +404116,15 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localDisableApiTermination == null) { throw new org.apache.axis2.databinding.ADBException("disableApiTermination cannot be null!!"); } - localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, xmlWriter); + localDisableApiTermination.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination"), factory, + xmlWriter); } if (localInstanceInitiatedShutdownBehaviorTracker) { if (localInstanceInitiatedShutdownBehavior == null) { throw new org.apache.axis2.databinding.ADBException("instanceInitiatedShutdownBehavior cannot be null!!"); } - localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceInitiatedShutdownBehavior"), - factory, xmlWriter); + localInstanceInitiatedShutdownBehavior.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "instanceInitiatedShutdownBehavior"), factory, xmlWriter); } if (localBlockDeviceMappingTracker) { if (localBlockDeviceMapping == null) { @@ -401552,8 +404184,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -401819,7 +404452,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "disableApiTermination").equals(reader.getName())) { object.setDisableApiTermination(AttributeBooleanValueType.Factory.parse(reader)); @@ -401840,7 +404474,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(InstanceBlockDeviceMappingType.Factory.parse(reader)); @@ -402024,7 +404659,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -402194,8 +404830,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -402552,7 +405189,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -402666,8 +405304,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -402871,7 +405510,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(CancelSpotInstanceRequestsResponseSetType.Factory.parse(reader)); @@ -403442,7 +406082,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -403810,8 +406451,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -404228,7 +406870,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -404275,7 +406918,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceSet").equals(reader.getName())) { object.setNetworkInterfaceSet(InstanceNetworkInterfaceSetRequestType.Factory.parse(reader)); @@ -404290,7 +406934,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "iamInstanceProfile").equals(reader.getName())) { object.setIamInstanceProfile(IamInstanceProfileRequestType.Factory.parse(reader)); @@ -404339,7 +406984,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateCustomerGateway implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -404407,7 +407053,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -404455,8 +407102,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -404741,7 +407389,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -404828,8 +407477,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -405134,7 +407784,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -405216,8 +407867,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -405421,7 +408073,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DetachNetworkInterfaceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DetachNetworkInterfaceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DetachNetworkInterfaceResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -405489,7 +408142,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -405537,8 +408191,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -405826,7 +408481,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -405920,8 +408576,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -406408,7 +409065,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -406624,8 +409282,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -407050,7 +409709,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -407164,8 +409824,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -407490,7 +410151,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -407604,8 +410266,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -407954,7 +410617,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -408048,8 +410712,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -408274,7 +410939,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((LicenseCapacitySetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(LicenseCapacitySetItemType.class, list1)); + object.setItem((LicenseCapacitySetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(LicenseCapacitySetItemType.class, + list1)); } // End of if for expected property start element @@ -408370,7 +411036,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -408418,8 +411085,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -408714,7 +411382,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -408887,8 +411556,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -409083,7 +411753,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkAclAssociationId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -409334,7 +412005,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -409349,7 +412021,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingItemTypeChoice_type0", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":InstanceBlockDeviceMappingItemTypeChoice_type0", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "InstanceBlockDeviceMappingItemTypeChoice_type0", xmlWriter); } @@ -409434,8 +412107,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -409744,7 +412418,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -409882,8 +412557,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -410324,7 +413000,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -410485,8 +413162,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -410770,7 +413448,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "propagatingVgwSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "propagatingVgwSet").equals(reader.getName())) { object.setPropagatingVgwSet(PropagatingVgwSetType.Factory.parse(reader)); @@ -410913,7 +413592,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -411027,8 +413707,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -411336,7 +414017,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -411418,8 +414100,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -411725,7 +414408,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -411839,8 +414523,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -412165,7 +414850,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -412306,8 +414992,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -412680,7 +415367,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -412715,7 +415403,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesOfferingsResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesOfferingsResponseType", xmlWriter); } @@ -412757,8 +415446,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesOfferingsSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesOfferingsSet cannot be null!!"); } - localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), factory, - xmlWriter); + localReservedInstancesOfferingsSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesOfferingsSet"), + factory, xmlWriter); if (localNextTokenTracker) { namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (!namespace.equals("")) { @@ -412827,8 +415516,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -413204,7 +415894,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -413298,8 +415989,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -413622,7 +416314,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -413670,8 +416363,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -413847,7 +416541,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteVpnConnectionRoute implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionRoute", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVpnConnectionRoute", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -413915,7 +416610,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -413963,8 +416659,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -414249,7 +416946,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -414336,8 +417034,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -414639,7 +417338,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -414687,8 +417387,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -414834,7 +417535,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolume").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteVolume").equals(reader.getName())) { object.setDeleteVolume(DeleteVolumeType.Factory.parse(reader)); @@ -414863,8 +417565,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeAvailabilityZonesResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeAvailabilityZonesResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeAvailabilityZonesResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -414932,7 +417634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -414980,8 +417683,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -415157,7 +417861,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateVpnConnectionResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateVpnConnectionResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -415225,7 +417930,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -415273,8 +417979,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -415450,7 +418157,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeInstanceStatus implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeInstanceStatus", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -415518,7 +418226,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -415566,8 +418275,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -415855,7 +418565,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -415949,8 +418660,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -416203,7 +418915,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateInternetGatewayResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateInternetGatewayResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "CreateInternetGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -416271,7 +418984,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -416319,8 +419033,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -416608,7 +419323,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -416702,8 +419418,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -417052,7 +419769,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -417190,8 +419908,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -417694,7 +420413,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -417974,8 +420694,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -418365,7 +421086,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ExtensionMapper { - public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception { + public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) + throws java.lang.Exception { if ("http://ec2.amazonaws.com/doc/2012-08-15/".equals(namespaceURI) && "CreateInternetGatewayType".equals(typeName)) { @@ -422075,7 +424797,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -422120,8 +424843,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localReservedInstancesListingSet == null) { throw new org.apache.axis2.databinding.ADBException("reservedInstancesListingSet cannot be null!!"); } - localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), factory, - xmlWriter); + localReservedInstancesListingSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesListingSet"), + factory, xmlWriter); } if (localReservedInstancesSetTracker) { if (localReservedInstancesSet == null) { @@ -422170,8 +424893,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -422383,7 +425107,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "reservedInstancesSet").equals(reader.getName())) { object.setReservedInstancesSet(DescribeReservedInstancesSetType.Factory.parse(reader)); @@ -422525,7 +425250,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -422560,7 +425286,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSpotDatafeedSubscriptionResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeSpotDatafeedSubscriptionResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeSpotDatafeedSubscriptionResponseType", xmlWriter); } @@ -422602,7 +425329,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { if (localSpotDatafeedSubscription == null) { throw new org.apache.axis2.databinding.ADBException("spotDatafeedSubscription cannot be null!!"); } - localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription"), factory, xmlWriter); + localSpotDatafeedSubscription.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -422639,8 +425367,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -422844,7 +425573,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotDatafeedSubscription").equals(reader.getName())) { object.setSpotDatafeedSubscription(SpotDatafeedSubscriptionType.Factory.parse(reader)); @@ -422989,7 +425719,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -423083,8 +425814,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -423674,7 +426406,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -423985,8 +426718,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -424347,7 +427081,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "blockDeviceMapping").equals(reader.getName())) { object.setBlockDeviceMapping(BlockDeviceMappingType.Factory.parse(reader)); @@ -424379,7 +427114,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AssociateRouteTableResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateRouteTableResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -424447,7 +427183,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -424495,8 +427232,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -424743,7 +427481,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -424852,8 +427591,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -425032,7 +427772,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -425272,7 +428013,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -425457,8 +428199,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -425901,7 +428644,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -425995,8 +428739,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -426361,7 +429106,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -426455,8 +429201,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -426805,7 +429552,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -426940,8 +429688,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -427173,7 +429922,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DeleteDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteDhcpOptionsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -427241,7 +429991,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -427289,8 +430040,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -427561,7 +430313,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -427675,8 +430428,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -427880,7 +430634,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "spotInstanceRequestSet").equals(reader.getName())) { object.setSpotInstanceRequestSet(SpotInstanceRequestSetType.Factory.parse(reader)); @@ -428104,7 +430859,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -428373,8 +431129,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -428786,7 +431543,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -428834,8 +431592,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -428981,7 +431740,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRoute").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateRoute").equals(reader.getName())) { object.setCreateRoute(CreateRouteType.Factory.parse(reader)); @@ -429119,7 +431879,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -429260,8 +432021,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -429548,7 +432310,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -429625,8 +432388,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -429902,7 +432666,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -429937,7 +432702,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeResponseType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":ModifyNetworkInterfaceAttributeResponseType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ModifyNetworkInterfaceAttributeResponseType", xmlWriter); } @@ -430040,8 +432806,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -430372,7 +433139,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -430510,8 +433278,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -430859,7 +433628,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -430894,7 +433664,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { java.lang.String namespacePrefix = registerPrefix(xmlWriter, "http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)) { - writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType", xmlWriter); + writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", namespacePrefix + ":DescribeReservedInstancesListingsResponseSetType", + xmlWriter); } else { writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "DescribeReservedInstancesListingsResponseSetType", xmlWriter); } @@ -430953,8 +433724,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -431303,7 +434075,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -431444,8 +434217,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -431632,7 +434406,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "internetGatewayId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -431753,7 +434528,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -431801,8 +434577,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -432046,7 +434823,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -432094,8 +434872,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -432241,7 +435020,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RegisterImage").equals(reader.getName())) { object.setRegisterImage(RegisterImageType.Factory.parse(reader)); @@ -432403,7 +435183,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -432549,8 +435330,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -432763,7 +435545,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceStatusSet").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceStatusSet").equals(reader.getName())) { object.setInstanceStatusSet(InstanceStatusSetType.Factory.parse(reader)); @@ -432813,7 +435596,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class CreateSecurityGroupResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "CreateSecurityGroupResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -432881,7 +435665,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -432929,8 +435714,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -433286,7 +436072,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -433359,8 +436146,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -433762,7 +436550,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -434031,8 +436820,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -434488,7 +437278,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -434582,8 +437373,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -434808,7 +437600,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeAddressesItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeAddressesItemType.class, list1)); + object.setItem((DescribeAddressesItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeAddressesItemType.class, + list1)); } // End of if for expected property start element @@ -434948,7 +437741,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -435042,8 +437836,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -435391,7 +438186,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -435505,8 +438301,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -435855,7 +438652,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -435949,8 +438747,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -436175,8 +438974,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((CreateVolumePermissionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(CreateVolumePermissionItemType.class, - list1)); + object.setItem((CreateVolumePermissionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + CreateVolumePermissionItemType.class, list1)); } // End of if for expected property start element @@ -436299,7 +439098,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -436413,8 +439213,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -436739,7 +439540,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -436853,8 +439655,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -437155,7 +439958,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -437264,8 +440068,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -437444,7 +440249,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "networkInterfaceId").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -437574,7 +440380,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -437688,8 +440495,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -438035,7 +440843,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -438122,8 +440931,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -438357,7 +441167,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class ImportInstanceResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ImportInstanceResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -438425,7 +441236,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -438473,8 +441285,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -438650,8 +441463,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class RevokeSecurityGroupEgressResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "RevokeSecurityGroupEgressResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "RevokeSecurityGroupEgressResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -438719,7 +441532,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -438767,8 +441581,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -438944,8 +441759,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class EnableVgwRoutePropagationResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "EnableVgwRoutePropagationResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "EnableVgwRoutePropagationResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -439013,7 +441828,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -439061,8 +441877,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -439238,7 +442055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class AssociateDhcpOptionsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "AssociateDhcpOptionsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "AssociateDhcpOptionsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -439306,7 +442124,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -439354,8 +442173,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -439854,7 +442674,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -440165,8 +442986,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -440508,7 +443330,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZoneGroup").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -440525,7 +443348,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "launchSpecification").equals(reader.getName())) { object.setLaunchSpecification(LaunchSpecificationRequestType.Factory.parse(reader)); @@ -440653,7 +443477,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -440767,8 +443592,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -441005,8 +443831,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeSpotInstanceRequestsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeSpotInstanceRequestsResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeSpotInstanceRequestsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -441074,7 +443900,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -441122,8 +443949,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -441394,7 +444222,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -441508,8 +444337,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -441858,7 +444688,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -441952,8 +444783,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -442319,7 +445151,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -442413,8 +445246,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -442639,7 +445473,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((RecurringChargesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(RecurringChargesSetItemType.class, list1)); + object.setItem((RecurringChargesSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(RecurringChargesSetItemType.class, + list1)); } // End of if for expected property start element @@ -442735,7 +445570,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -442783,8 +445619,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -442930,7 +445767,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DeleteKeyPair").equals(reader.getName())) { object.setDeleteKeyPair(DeleteKeyPairType.Factory.parse(reader)); @@ -443054,7 +445892,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -443192,8 +446031,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -443541,7 +446381,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -443635,8 +446476,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -443861,8 +446703,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } // call the converter utility to convert and set the array - object.setItem((DescribeImagesResponseItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(DescribeImagesResponseItemType.class, - list1)); + object.setItem((DescribeImagesResponseItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + DescribeImagesResponseItemType.class, list1)); } // End of if for expected property start element @@ -443958,7 +446800,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -444006,8 +446849,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -444183,8 +447027,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { public static class DescribeReservedInstancesListings implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeReservedInstancesListings", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "DescribeReservedInstancesListings", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")) { @@ -444252,7 +447096,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -444300,8 +447145,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -444545,7 +447391,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -444593,8 +447440,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -444740,7 +447588,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { while (!reader.isEndElement()) { if (reader.isStartElement()) { - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "DescribeRegions").equals(reader.getName())) { object.setDescribeRegions(DescribeRegionsType.Factory.parse(reader)); @@ -444855,7 +447704,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -444961,8 +447811,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -445268,7 +448119,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -445409,8 +448261,9 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -445648,7 +448501,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroups.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445679,7 +448533,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445689,7 +448544,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445703,7 +448559,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -445720,7 +448577,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445740,7 +448598,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445760,7 +448619,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445780,7 +448640,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445810,7 +448671,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445824,7 +448686,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -445861,7 +448724,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445871,7 +448735,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntry.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445881,7 +448746,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445901,7 +448767,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445911,7 +448778,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445942,7 +448810,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445982,7 +448851,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -445992,7 +448862,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterface.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446002,7 +448873,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446042,7 +448914,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446062,7 +448935,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446072,7 +448946,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnections.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446082,7 +448957,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446102,7 +448978,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446112,7 +448989,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446122,7 +449000,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446132,7 +449011,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTable.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446142,7 +449022,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446152,7 +449033,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntry.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446162,7 +449044,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446172,7 +449055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446186,14 +449070,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446207,7 +449093,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446224,7 +449111,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446234,7 +449122,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446244,7 +449133,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446274,7 +449164,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446288,7 +449179,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446305,7 +449197,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446315,7 +449208,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446325,7 +449219,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446335,7 +449230,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistory.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446356,7 +449252,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446377,7 +449274,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446391,7 +449289,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446408,7 +449307,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446428,7 +449328,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446438,7 +449339,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446452,7 +449354,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446469,7 +449372,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446479,7 +449383,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntry.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446489,7 +449394,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446509,7 +449415,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446529,7 +449436,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446549,7 +449457,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446569,7 +449478,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446579,7 +449489,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstance.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446589,7 +449500,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446603,7 +449515,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446614,7 +449527,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446641,7 +449555,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446655,14 +449570,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446672,7 +449589,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446692,7 +449610,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446712,7 +449631,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446722,7 +449642,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446732,7 +449653,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446742,7 +449664,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstances.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446756,14 +449679,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446773,7 +449698,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446803,7 +449729,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZones.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446817,7 +449744,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446834,7 +449762,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446854,7 +449783,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446864,7 +449794,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446878,7 +449809,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -446895,7 +449827,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446915,7 +449848,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446955,7 +449889,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -446975,7 +449910,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447005,7 +449941,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagation.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447019,14 +449956,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447040,7 +449979,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447057,7 +449997,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447067,7 +450008,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRoute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447098,7 +450040,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447118,7 +450061,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447138,7 +450082,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447148,7 +450093,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447162,7 +450108,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447179,7 +450126,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447199,7 +450147,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447219,7 +450168,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447239,7 +450189,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447259,7 +450210,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447279,7 +450231,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447304,7 +450257,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447321,7 +450275,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447341,7 +450296,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447361,7 +450317,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447371,7 +450328,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGateways.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447402,7 +450360,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447412,7 +450371,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447426,7 +450386,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447437,7 +450398,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447448,14 +450410,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatus.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447465,7 +450429,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447490,14 +450455,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447511,7 +450478,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447528,7 +450496,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447538,7 +450507,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterface.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447548,7 +450518,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447558,7 +450529,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroups.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447568,7 +450540,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447588,7 +450561,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447598,7 +450572,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaces.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447612,7 +450587,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -447629,7 +450605,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447649,7 +450626,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447669,7 +450647,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447709,7 +450688,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447719,7 +450699,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447729,7 +450710,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447769,7 +450751,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447789,7 +450772,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447829,7 +450813,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447869,7 +450854,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447889,7 +450875,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447899,7 +450886,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGateways.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447930,7 +450918,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447970,7 +450959,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -447980,7 +450970,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448011,7 +451002,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448021,7 +451013,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRoute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448042,7 +451035,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasks.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448073,7 +451067,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448083,7 +451078,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttribute.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448097,14 +451093,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448114,7 +451112,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448144,7 +451143,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448158,7 +451158,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448175,7 +451176,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448185,7 +451187,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448195,7 +451198,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448209,7 +451213,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448220,7 +451225,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448257,7 +451263,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448267,7 +451274,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTask.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448288,7 +451296,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddresses.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448319,7 +451328,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448333,7 +451343,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448344,7 +451355,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448361,7 +451373,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448371,7 +451384,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGateway.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448381,7 +451395,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448391,7 +451406,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448405,14 +451421,16 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterface.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448422,7 +451440,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448432,7 +451451,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterface.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448442,7 +451462,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448452,7 +451473,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgress.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448466,7 +451488,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -448483,7 +451506,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448543,7 +451567,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448563,7 +451588,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -448605,8 +451631,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448685,8 +451711,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteVpc param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448701,8 +451727,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequests param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448717,8 +451743,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateSubnet param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448813,8 +451839,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeTags param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeTags param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448861,8 +451887,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcs param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -448989,8 +452015,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449053,8 +452079,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateTags param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateTags param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449069,8 +452095,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449149,8 +452175,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequests param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449197,8 +452223,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngress param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449325,8 +452351,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449341,8 +452367,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.RunInstances param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.RunInstances param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449357,8 +452383,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListing param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449469,8 +452495,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteVolume param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449533,8 +452559,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449581,8 +452607,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnet param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449629,8 +452655,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateImage param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateImage param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449661,8 +452687,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddresses param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449757,8 +452783,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListing param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449869,8 +452895,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscription param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449965,8 +452991,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscription param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -449981,8 +453007,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListings param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450013,8 +453039,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttribute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450029,8 +453055,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450173,8 +453199,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteTags param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteTags param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450221,8 +453247,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateVolume param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateVolume param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450269,8 +453295,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DetachVolume param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DetachVolume param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450301,8 +453327,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateRoute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateRoute param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450381,8 +453407,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteRoute param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450525,8 +453551,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateVpc param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.CreateVpc param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450541,8 +453567,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociation param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450589,8 +453615,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOffering param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450605,8 +453631,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ImportVolume param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ImportVolume param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450685,8 +453711,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferings param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450733,8 +453759,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscription param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450813,8 +453839,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.ReplaceRoute param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -450829,8 +453855,8 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope - toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.AttachVolume param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.ec2.client.AmazonEC2Stub.AttachVolume param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { diff --git a/awsapi/src/com/amazon/s3/AccessControlList.java b/awsapi/src/com/amazon/s3/AccessControlList.java index 20117d3e405..ab78d99a90b 100644 --- a/awsapi/src/com/amazon/s3/AccessControlList.java +++ b/awsapi/src/com/amazon/s3/AccessControlList.java @@ -146,7 +146,8 @@ public class AccessControlList implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -212,9 +213,8 @@ public class AccessControlList implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/AccessControlPolicy.java b/awsapi/src/com/amazon/s3/AccessControlPolicy.java index af8d17f97ae..4fdce2ab102 100644 --- a/awsapi/src/com/amazon/s3/AccessControlPolicy.java +++ b/awsapi/src/com/amazon/s3/AccessControlPolicy.java @@ -125,7 +125,8 @@ public class AccessControlPolicy implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184,9 +185,8 @@ public class AccessControlPolicy implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java b/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java index 501a9b9fc97..efc830a63cf 100644 --- a/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java +++ b/awsapi/src/com/amazon/s3/AmazonCustomerByEmail.java @@ -101,7 +101,8 @@ public class AmazonCustomerByEmail extends com.amazon.s3.User implements org.apa } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class AmazonCustomerByEmail extends com.amazon.s3.User implements org.apa /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java index 528c5fd60a2..0e8c332e142 100644 --- a/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java +++ b/awsapi/src/com/amazon/s3/AmazonS3MessageReceiverInOut.java @@ -29,7 +29,8 @@ package com.amazon.s3; public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.AbstractInOutMessageReceiver { - public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) throws org.apache.axis2.AxisFault { + public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext) + throws org.apache.axis2.AxisFault { try { @@ -52,12 +53,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("getBucketLoggingStatus".equals(methodName)) { com.amazon.s3.GetBucketLoggingStatusResponse getBucketLoggingStatusResponse33 = null; - com.amazon.s3.GetBucketLoggingStatus wrappedParam = (com.amazon.s3.GetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.GetBucketLoggingStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.GetBucketLoggingStatus wrappedParam = + (com.amazon.s3.GetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetBucketLoggingStatus.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); getBucketLoggingStatusResponse33 = - skel.getBucketLoggingStatus(wrappedParam); + skel.getBucketLoggingStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getBucketLoggingStatusResponse33, false); } else @@ -65,12 +67,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("copyObject".equals(methodName)) { com.amazon.s3.CopyObjectResponse copyObjectResponse35 = null; - com.amazon.s3.CopyObject wrappedParam = (com.amazon.s3.CopyObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CopyObject.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.CopyObject wrappedParam = + (com.amazon.s3.CopyObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CopyObject.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); copyObjectResponse35 = - skel.copyObject(wrappedParam); + skel.copyObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), copyObjectResponse35, false); } else @@ -78,13 +81,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("getBucketAccessControlPolicy".equals(methodName)) { com.amazon.s3.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicyResponse37 = null; - com.amazon.s3.GetBucketAccessControlPolicy wrappedParam = (com.amazon.s3.GetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.s3.GetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.GetBucketAccessControlPolicy wrappedParam = + (com.amazon.s3.GetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.s3.GetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); getBucketAccessControlPolicyResponse37 = - skel.getBucketAccessControlPolicy(wrappedParam); + skel.getBucketAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getBucketAccessControlPolicyResponse37, false); } else @@ -92,12 +95,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("listBucket".equals(methodName)) { com.amazon.s3.ListBucketResponse listBucketResponse39 = null; - com.amazon.s3.ListBucket wrappedParam = (com.amazon.s3.ListBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListBucket.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.ListBucket wrappedParam = + (com.amazon.s3.ListBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListBucket.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); listBucketResponse39 = - skel.listBucket(wrappedParam); + skel.listBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), listBucketResponse39, false); } else @@ -105,12 +109,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("putObject".equals(methodName)) { com.amazon.s3.PutObjectResponse putObjectResponse41 = null; - com.amazon.s3.PutObject wrappedParam = (com.amazon.s3.PutObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObject.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.PutObject wrappedParam = + (com.amazon.s3.PutObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObject.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); putObjectResponse41 = - skel.putObject(wrappedParam); + skel.putObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), putObjectResponse41, false); } else @@ -118,12 +123,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("createBucket".equals(methodName)) { com.amazon.s3.CreateBucketResponse createBucketResponse43 = null; - com.amazon.s3.CreateBucket wrappedParam = (com.amazon.s3.CreateBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.CreateBucket.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.CreateBucket wrappedParam = + (com.amazon.s3.CreateBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.CreateBucket.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); createBucketResponse43 = - skel.createBucket(wrappedParam); + skel.createBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), createBucketResponse43, false); } else @@ -131,12 +137,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("listAllMyBuckets".equals(methodName)) { com.amazon.s3.ListAllMyBucketsResponse listAllMyBucketsResponse45 = null; - com.amazon.s3.ListAllMyBuckets wrappedParam = (com.amazon.s3.ListAllMyBuckets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.ListAllMyBuckets.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.ListAllMyBuckets wrappedParam = + (com.amazon.s3.ListAllMyBuckets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.ListAllMyBuckets.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); listAllMyBucketsResponse45 = - skel.listAllMyBuckets(wrappedParam); + skel.listAllMyBuckets(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), listAllMyBucketsResponse45, false); } else @@ -144,12 +151,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("getObject".equals(methodName)) { com.amazon.s3.GetObjectResponse getObjectResponse47 = null; - com.amazon.s3.GetObject wrappedParam = (com.amazon.s3.GetObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObject.class, - getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.GetObject wrappedParam = + (com.amazon.s3.GetObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObject.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); getObjectResponse47 = - skel.getObject(wrappedParam); + skel.getObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectResponse47, false); } else @@ -157,12 +165,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("deleteBucket".equals(methodName)) { com.amazon.s3.DeleteBucketResponse deleteBucketResponse49 = null; - com.amazon.s3.DeleteBucket wrappedParam = (com.amazon.s3.DeleteBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.DeleteBucket.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.DeleteBucket wrappedParam = + (com.amazon.s3.DeleteBucket)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.DeleteBucket.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteBucketResponse49 = - skel.deleteBucket(wrappedParam); + skel.deleteBucket(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteBucketResponse49, false); } else @@ -170,12 +179,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("setBucketLoggingStatus".equals(methodName)) { com.amazon.s3.SetBucketLoggingStatusResponse setBucketLoggingStatusResponse51 = null; - com.amazon.s3.SetBucketLoggingStatus wrappedParam = (com.amazon.s3.SetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.SetBucketLoggingStatus.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.SetBucketLoggingStatus wrappedParam = + (com.amazon.s3.SetBucketLoggingStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.SetBucketLoggingStatus.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); setBucketLoggingStatusResponse51 = - skel.setBucketLoggingStatus(wrappedParam); + skel.setBucketLoggingStatus(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setBucketLoggingStatusResponse51, false); } else @@ -183,13 +193,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("getObjectAccessControlPolicy".equals(methodName)) { com.amazon.s3.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicyResponse53 = null; - com.amazon.s3.GetObjectAccessControlPolicy wrappedParam = (com.amazon.s3.GetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.s3.GetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.GetObjectAccessControlPolicy wrappedParam = + (com.amazon.s3.GetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.s3.GetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); getObjectAccessControlPolicyResponse53 = - skel.getObjectAccessControlPolicy(wrappedParam); + skel.getObjectAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectAccessControlPolicyResponse53, false); } else @@ -197,12 +207,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("deleteObject".equals(methodName)) { com.amazon.s3.DeleteObjectResponse deleteObjectResponse55 = null; - com.amazon.s3.DeleteObject wrappedParam = (com.amazon.s3.DeleteObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.DeleteObject.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.DeleteObject wrappedParam = + (com.amazon.s3.DeleteObject)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.DeleteObject.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); deleteObjectResponse55 = - skel.deleteObject(wrappedParam); + skel.deleteObject(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), deleteObjectResponse55, false); } else @@ -210,13 +221,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("setBucketAccessControlPolicy".equals(methodName)) { com.amazon.s3.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicyResponse57 = null; - com.amazon.s3.SetBucketAccessControlPolicy wrappedParam = (com.amazon.s3.SetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.s3.SetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.SetBucketAccessControlPolicy wrappedParam = + (com.amazon.s3.SetBucketAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.s3.SetBucketAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); setBucketAccessControlPolicyResponse57 = - skel.setBucketAccessControlPolicy(wrappedParam); + skel.setBucketAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setBucketAccessControlPolicyResponse57, false); } else @@ -224,13 +235,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("setObjectAccessControlPolicy".equals(methodName)) { com.amazon.s3.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicyResponse59 = null; - com.amazon.s3.SetObjectAccessControlPolicy wrappedParam = (com.amazon.s3.SetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope() - .getBody() - .getFirstElement(), com.amazon.s3.SetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.SetObjectAccessControlPolicy wrappedParam = + (com.amazon.s3.SetObjectAccessControlPolicy)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), + com.amazon.s3.SetObjectAccessControlPolicy.class, getEnvelopeNamespaces(msgContext.getEnvelope())); setObjectAccessControlPolicyResponse59 = - skel.setObjectAccessControlPolicy(wrappedParam); + skel.setObjectAccessControlPolicy(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), setObjectAccessControlPolicyResponse59, false); } else @@ -238,12 +249,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("putObjectInline".equals(methodName)) { com.amazon.s3.PutObjectInlineResponse putObjectInlineResponse61 = null; - com.amazon.s3.PutObjectInline wrappedParam = (com.amazon.s3.PutObjectInline)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.PutObjectInline.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.PutObjectInline wrappedParam = + (com.amazon.s3.PutObjectInline)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.PutObjectInline.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); putObjectInlineResponse61 = - skel.putObjectInline(wrappedParam); + skel.putObjectInline(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), putObjectInlineResponse61, false); } else @@ -251,12 +263,13 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs if ("getObjectExtended".equals(methodName)) { com.amazon.s3.GetObjectExtendedResponse getObjectExtendedResponse63 = null; - com.amazon.s3.GetObjectExtended wrappedParam = (com.amazon.s3.GetObjectExtended)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), - com.amazon.s3.GetObjectExtended.class, getEnvelopeNamespaces(msgContext.getEnvelope())); + com.amazon.s3.GetObjectExtended wrappedParam = + (com.amazon.s3.GetObjectExtended)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.s3.GetObjectExtended.class, + getEnvelopeNamespaces(msgContext.getEnvelope())); getObjectExtendedResponse63 = - skel.getObjectExtended(wrappedParam); + skel.getObjectExtended(wrappedParam); envelope = toEnvelope(getSOAPFactory(msgContext), getObjectExtendedResponse63, false); @@ -592,8 +605,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetBucketLoggingStatusResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetBucketLoggingStatusResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -700,8 +713,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.ListAllMyBucketsResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.ListAllMyBucketsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -754,8 +767,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.SetBucketLoggingStatusResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.SetBucketLoggingStatusResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -844,8 +857,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.PutObjectInlineResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope + toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.PutObjectInlineResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); @@ -862,8 +875,8 @@ public class AmazonS3MessageReceiverInOut extends org.apache.axis2.receivers.Abs return wrappedElement; } - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetObjectExtendedResponse param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.GetObjectExtendedResponse param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope(); diff --git a/awsapi/src/com/amazon/s3/BucketLoggingStatus.java b/awsapi/src/com/amazon/s3/BucketLoggingStatus.java index 7636365fcfa..879b21a9d1b 100644 --- a/awsapi/src/com/amazon/s3/BucketLoggingStatus.java +++ b/awsapi/src/com/amazon/s3/BucketLoggingStatus.java @@ -115,7 +115,8 @@ public class BucketLoggingStatus implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -169,9 +170,8 @@ public class BucketLoggingStatus implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CanonicalUser.java b/awsapi/src/com/amazon/s3/CanonicalUser.java index 88eea88b06b..e12ceea47b8 100644 --- a/awsapi/src/com/amazon/s3/CanonicalUser.java +++ b/awsapi/src/com/amazon/s3/CanonicalUser.java @@ -139,7 +139,8 @@ public class CanonicalUser extends com.amazon.s3.User implements org.apache.axis } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -248,9 +249,8 @@ public class CanonicalUser extends com.amazon.s3.User implements org.apache.axis /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CopyObject.java b/awsapi/src/com/amazon/s3/CopyObject.java index 354f5a83203..0e42ab4c262 100644 --- a/awsapi/src/com/amazon/s3/CopyObject.java +++ b/awsapi/src/com/amazon/s3/CopyObject.java @@ -719,7 +719,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1215,9 +1216,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1712,7 +1712,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list6)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list6)); } // End of if for expected property start element @@ -1738,7 +1739,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -1755,7 +1757,8 @@ public class CopyObject implements org.apache.axis2.databinding.ADBBean { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) { java.lang.String content = reader.getElementText(); diff --git a/awsapi/src/com/amazon/s3/CopyObjectResponse.java b/awsapi/src/com/amazon/s3/CopyObjectResponse.java index f87ddff9f69..7769b4f8957 100644 --- a/awsapi/src/com/amazon/s3/CopyObjectResponse.java +++ b/awsapi/src/com/amazon/s3/CopyObjectResponse.java @@ -98,7 +98,8 @@ public class CopyObjectResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class CopyObjectResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CopyObjectResult.java b/awsapi/src/com/amazon/s3/CopyObjectResult.java index 122f31bc128..bdab18c8f3d 100644 --- a/awsapi/src/com/amazon/s3/CopyObjectResult.java +++ b/awsapi/src/com/amazon/s3/CopyObjectResult.java @@ -125,7 +125,8 @@ public class CopyObjectResult implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class CopyObjectResult implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CreateBucket.java b/awsapi/src/com/amazon/s3/CreateBucket.java index a1607813841..8f7cc0eab20 100644 --- a/awsapi/src/com/amazon/s3/CreateBucket.java +++ b/awsapi/src/com/amazon/s3/CreateBucket.java @@ -250,7 +250,8 @@ public class CreateBucket implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -435,9 +436,8 @@ public class CreateBucket implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java b/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java index ce8a2f1ab92..3f0c4e2733a 100644 --- a/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java +++ b/awsapi/src/com/amazon/s3/CreateBucketConfiguration.java @@ -101,7 +101,8 @@ public class CreateBucketConfiguration implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class CreateBucketConfiguration implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CreateBucketResponse.java b/awsapi/src/com/amazon/s3/CreateBucketResponse.java index 87d46541e6a..58504f51f5d 100644 --- a/awsapi/src/com/amazon/s3/CreateBucketResponse.java +++ b/awsapi/src/com/amazon/s3/CreateBucketResponse.java @@ -98,7 +98,8 @@ public class CreateBucketResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class CreateBucketResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/CreateBucketResult.java b/awsapi/src/com/amazon/s3/CreateBucketResult.java index 3555aa969af..ca202674db7 100644 --- a/awsapi/src/com/amazon/s3/CreateBucketResult.java +++ b/awsapi/src/com/amazon/s3/CreateBucketResult.java @@ -101,7 +101,8 @@ public class CreateBucketResult implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class CreateBucketResult implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/DeleteBucket.java b/awsapi/src/com/amazon/s3/DeleteBucket.java index 6413b457643..b116203b86e 100644 --- a/awsapi/src/com/amazon/s3/DeleteBucket.java +++ b/awsapi/src/com/amazon/s3/DeleteBucket.java @@ -250,7 +250,8 @@ public class DeleteBucket implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class DeleteBucket implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/DeleteBucketResponse.java b/awsapi/src/com/amazon/s3/DeleteBucketResponse.java index 0bd703d32bd..cc46b8f1cd4 100644 --- a/awsapi/src/com/amazon/s3/DeleteBucketResponse.java +++ b/awsapi/src/com/amazon/s3/DeleteBucketResponse.java @@ -98,7 +98,8 @@ public class DeleteBucketResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class DeleteBucketResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java b/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java index ee18d3065ea..91e80f3dd7e 100644 --- a/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java +++ b/awsapi/src/com/amazon/s3/DeleteMarkerEntry.java @@ -211,7 +211,8 @@ public class DeleteMarkerEntry implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -390,9 +391,8 @@ public class DeleteMarkerEntry implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/DeleteObject.java b/awsapi/src/com/amazon/s3/DeleteObject.java index 05c42bee202..754574053d2 100644 --- a/awsapi/src/com/amazon/s3/DeleteObject.java +++ b/awsapi/src/com/amazon/s3/DeleteObject.java @@ -274,7 +274,8 @@ public class DeleteObject implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -518,9 +519,8 @@ public class DeleteObject implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/DeleteObjectResponse.java b/awsapi/src/com/amazon/s3/DeleteObjectResponse.java index 440164dab5a..caf1a9cd4b9 100644 --- a/awsapi/src/com/amazon/s3/DeleteObjectResponse.java +++ b/awsapi/src/com/amazon/s3/DeleteObjectResponse.java @@ -98,7 +98,8 @@ public class DeleteObjectResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class DeleteObjectResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ExtensionMapper.java b/awsapi/src/com/amazon/s3/ExtensionMapper.java index fd2a6626a80..9e90777020c 100644 --- a/awsapi/src/com/amazon/s3/ExtensionMapper.java +++ b/awsapi/src/com/amazon/s3/ExtensionMapper.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class ExtensionMapper { - public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception { + public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) + throws java.lang.Exception { if ("http://s3.amazonaws.com/doc/2006-03-01/".equals(namespaceURI) && "PutObjectResult".equals(typeName)) { diff --git a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java index f4308b1bfff..b4b6eddbf5c 100644 --- a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java +++ b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicy.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class GetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -250,7 +251,8 @@ public class GetBucketAccessControlPolicy implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +464,8 @@ public class GetBucketAccessControlPolicy implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java index a101dc37e1f..eeb634f426d 100644 --- a/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java +++ b/awsapi/src/com/amazon/s3/GetBucketAccessControlPolicyResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetBucketAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -98,7 +99,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143,8 +145,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da if (localGetBucketAccessControlPolicyResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetBucketAccessControlPolicyResponse cannot be null!!"); } - localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse"), - factory, xmlWriter); + localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetBucketAccessControlPolicyResponse"), factory, xmlWriter); xmlWriter.writeEndElement(); @@ -153,9 +155,8 @@ public class GetBucketAccessControlPolicyResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java b/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java index a383c588ecd..cac715d7b8e 100644 --- a/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java +++ b/awsapi/src/com/amazon/s3/GetBucketLoggingStatus.java @@ -250,7 +250,8 @@ public class GetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -462,9 +463,8 @@ public class GetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java b/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java index 9f536303828..9b2d1ac2d24 100644 --- a/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java +++ b/awsapi/src/com/amazon/s3/GetBucketLoggingStatusResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class GetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -98,7 +99,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143,8 +145,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind if (localGetBucketLoggingStatusResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetBucketLoggingStatusResponse cannot be null!!"); } - localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"), factory, - xmlWriter); + localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"), + factory, xmlWriter); xmlWriter.writeEndElement(); @@ -153,9 +155,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -361,7 +362,8 @@ public class GetBucketLoggingStatusResponse implements org.apache.axis2.databind while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse").equals(reader.getName())) { object.setGetBucketLoggingStatusResponse(com.amazon.s3.BucketLoggingStatus.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/s3/GetObject.java b/awsapi/src/com/amazon/s3/GetObject.java index e3d456c12e9..b46072126eb 100644 --- a/awsapi/src/com/amazon/s3/GetObject.java +++ b/awsapi/src/com/amazon/s3/GetObject.java @@ -346,7 +346,8 @@ public class GetObject implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -677,9 +678,8 @@ public class GetObject implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java index 9f3109e3c02..bd12b4effa4 100644 --- a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java +++ b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicy.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class GetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -274,7 +275,8 @@ public class GetObjectAccessControlPolicy implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -518,9 +520,8 @@ public class GetObjectAccessControlPolicy implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java index 3df1d7eb23a..21ffb37065b 100644 --- a/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java +++ b/awsapi/src/com/amazon/s3/GetObjectAccessControlPolicyResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetObjectAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -98,7 +99,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -143,8 +145,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da if (localGetObjectAccessControlPolicyResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetObjectAccessControlPolicyResponse cannot be null!!"); } - localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse"), - factory, xmlWriter); + localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetObjectAccessControlPolicyResponse"), factory, xmlWriter); xmlWriter.writeEndElement(); @@ -153,9 +155,8 @@ public class GetObjectAccessControlPolicyResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectExtended.java b/awsapi/src/com/amazon/s3/GetObjectExtended.java index b5a46368aed..c3fcfb188a9 100644 --- a/awsapi/src/com/amazon/s3/GetObjectExtended.java +++ b/awsapi/src/com/amazon/s3/GetObjectExtended.java @@ -677,7 +677,8 @@ public class GetObjectExtended implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -1250,9 +1251,8 @@ public class GetObjectExtended implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java b/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java index 340025d0b10..c6e6d552233 100644 --- a/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java +++ b/awsapi/src/com/amazon/s3/GetObjectExtendedResponse.java @@ -98,7 +98,8 @@ public class GetObjectExtendedResponse implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class GetObjectExtendedResponse implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectResponse.java b/awsapi/src/com/amazon/s3/GetObjectResponse.java index ba7fd175ffb..bf29a6282ba 100644 --- a/awsapi/src/com/amazon/s3/GetObjectResponse.java +++ b/awsapi/src/com/amazon/s3/GetObjectResponse.java @@ -98,7 +98,8 @@ public class GetObjectResponse implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class GetObjectResponse implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/GetObjectResult.java b/awsapi/src/com/amazon/s3/GetObjectResult.java index 6e095278c77..e4991b536c5 100644 --- a/awsapi/src/com/amazon/s3/GetObjectResult.java +++ b/awsapi/src/com/amazon/s3/GetObjectResult.java @@ -214,7 +214,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache. } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -370,9 +371,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache. /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -669,7 +669,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache. } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list2)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list2)); } // End of if for expected property start element @@ -688,7 +689,8 @@ public class GetObjectResult extends com.amazon.s3.Result implements org.apache. } else { if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT && reader.getName().equals( - new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { + new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, + org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8"); object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id)); reader.next(); diff --git a/awsapi/src/com/amazon/s3/Grant.java b/awsapi/src/com/amazon/s3/Grant.java index 65959f2d407..118ea33471f 100644 --- a/awsapi/src/com/amazon/s3/Grant.java +++ b/awsapi/src/com/amazon/s3/Grant.java @@ -125,7 +125,8 @@ public class Grant implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184,9 +185,8 @@ public class Grant implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/Grantee.java b/awsapi/src/com/amazon/s3/Grantee.java index f053f1f0dfc..9cfc3932357 100644 --- a/awsapi/src/com/amazon/s3/Grantee.java +++ b/awsapi/src/com/amazon/s3/Grantee.java @@ -77,7 +77,8 @@ public abstract class Grantee implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -126,9 +127,8 @@ public abstract class Grantee implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/Group.java b/awsapi/src/com/amazon/s3/Group.java index 3c55efe5661..61ac082c15b 100644 --- a/awsapi/src/com/amazon/s3/Group.java +++ b/awsapi/src/com/amazon/s3/Group.java @@ -101,7 +101,8 @@ public class Group extends com.amazon.s3.Grantee implements org.apache.axis2.dat } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class Group extends com.amazon.s3.Grantee implements org.apache.axis2.dat /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListAllMyBuckets.java b/awsapi/src/com/amazon/s3/ListAllMyBuckets.java index b2450564cb8..649f83b7a48 100644 --- a/awsapi/src/com/amazon/s3/ListAllMyBuckets.java +++ b/awsapi/src/com/amazon/s3/ListAllMyBuckets.java @@ -188,7 +188,8 @@ public class ListAllMyBuckets implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -335,9 +336,8 @@ public class ListAllMyBuckets implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java index 5e7c5d684d6..d2be7bf2f5f 100644 --- a/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java +++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsEntry.java @@ -125,7 +125,8 @@ public class ListAllMyBucketsEntry implements org.apache.axis2.databinding.ADBBe } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class ListAllMyBucketsEntry implements org.apache.axis2.databinding.ADBBe /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java index ede2e3e2a8f..81256731306 100644 --- a/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java +++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsList.java @@ -142,7 +142,8 @@ public class ListAllMyBucketsList implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -208,9 +209,8 @@ public class ListAllMyBucketsList implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java index 7210bddbcb6..9fc512177d1 100644 --- a/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java +++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsResponse.java @@ -98,7 +98,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -360,7 +360,8 @@ public class ListAllMyBucketsResponse implements org.apache.axis2.databinding.AD while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) { object.setListAllMyBucketsResponse(com.amazon.s3.ListAllMyBucketsResult.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java b/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java index b86b7b79d3a..a9f225a96fe 100644 --- a/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java +++ b/awsapi/src/com/amazon/s3/ListAllMyBucketsResult.java @@ -125,7 +125,8 @@ public class ListAllMyBucketsResult implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -184,9 +185,8 @@ public class ListAllMyBucketsResult implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListBucket.java b/awsapi/src/com/amazon/s3/ListBucket.java index 3b7f995a6eb..ee198c04e27 100644 --- a/awsapi/src/com/amazon/s3/ListBucket.java +++ b/awsapi/src/com/amazon/s3/ListBucket.java @@ -403,7 +403,8 @@ public class ListBucket implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -744,9 +745,8 @@ public class ListBucket implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListBucketResponse.java b/awsapi/src/com/amazon/s3/ListBucketResponse.java index 4f7f40595e0..a8cae0ed618 100644 --- a/awsapi/src/com/amazon/s3/ListBucketResponse.java +++ b/awsapi/src/com/amazon/s3/ListBucketResponse.java @@ -98,7 +98,8 @@ public class ListBucketResponse implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class ListBucketResponse implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListBucketResult.java b/awsapi/src/com/amazon/s3/ListBucketResult.java index 21f26589be0..5a68a8c1f9a 100644 --- a/awsapi/src/com/amazon/s3/ListBucketResult.java +++ b/awsapi/src/com/amazon/s3/ListBucketResult.java @@ -468,7 +468,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -787,9 +788,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1135,7 +1135,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list1)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list1)); } // End of if for expected property start element @@ -1341,7 +1342,8 @@ public class ListBucketResult implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.PrefixEntry.class, list10)); + object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.s3.PrefixEntry.class, list10)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/s3/ListEntry.java b/awsapi/src/com/amazon/s3/ListEntry.java index d1764755272..4829e584e86 100644 --- a/awsapi/src/com/amazon/s3/ListEntry.java +++ b/awsapi/src/com/amazon/s3/ListEntry.java @@ -235,7 +235,8 @@ public class ListEntry implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -419,9 +420,8 @@ public class ListEntry implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListVersionsResponse.java b/awsapi/src/com/amazon/s3/ListVersionsResponse.java index aa61ebc2753..016f8a3afd0 100644 --- a/awsapi/src/com/amazon/s3/ListVersionsResponse.java +++ b/awsapi/src/com/amazon/s3/ListVersionsResponse.java @@ -98,7 +98,8 @@ public class ListVersionsResponse implements org.apache.axis2.databinding.ADBBea } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class ListVersionsResponse implements org.apache.axis2.databinding.ADBBea /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/ListVersionsResult.java b/awsapi/src/com/amazon/s3/ListVersionsResult.java index 45588083405..509c5d289ef 100644 --- a/awsapi/src/com/amazon/s3/ListVersionsResult.java +++ b/awsapi/src/com/amazon/s3/ListVersionsResult.java @@ -426,7 +426,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localListVersionsResultChoice_type0); list.add(param); - this.localListVersionsResultChoice_type0 = (com.amazon.s3.ListVersionsResultChoice_type0[])list.toArray(new com.amazon.s3.ListVersionsResultChoice_type0[list.size()]); + this.localListVersionsResultChoice_type0 = + (com.amazon.s3.ListVersionsResultChoice_type0[])list.toArray(new com.amazon.s3.ListVersionsResultChoice_type0[list.size()]); } @@ -530,7 +531,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -913,9 +915,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1278,7 +1279,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list1)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list1)); } // End of if for expected property start element @@ -1514,7 +1516,8 @@ public class ListVersionsResult implements org.apache.axis2.databinding.ADBBean } // call the converter utility to convert and set the array - object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.PrefixEntry.class, list12)); + object.setCommonPrefixes((com.amazon.s3.PrefixEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray( + com.amazon.s3.PrefixEntry.class, list12)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java b/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java index d8ff7973be4..85c466c7ee3 100644 --- a/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java +++ b/awsapi/src/com/amazon/s3/ListVersionsResultChoice_type0.java @@ -168,7 +168,8 @@ public class ListVersionsResultChoice_type0 implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -207,9 +208,8 @@ public class ListVersionsResultChoice_type0 implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/LocationConstraint.java b/awsapi/src/com/amazon/s3/LocationConstraint.java index 378c84a7415..f97e2dc8d30 100644 --- a/awsapi/src/com/amazon/s3/LocationConstraint.java +++ b/awsapi/src/com/amazon/s3/LocationConstraint.java @@ -107,7 +107,8 @@ public class LocationConstraint implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -167,9 +168,8 @@ public class LocationConstraint implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/LoggingSettings.java b/awsapi/src/com/amazon/s3/LoggingSettings.java index d15adb46710..b759bfb9306 100644 --- a/awsapi/src/com/amazon/s3/LoggingSettings.java +++ b/awsapi/src/com/amazon/s3/LoggingSettings.java @@ -163,7 +163,8 @@ public class LoggingSettings implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -281,9 +282,8 @@ public class LoggingSettings implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/MetadataDirective.java b/awsapi/src/com/amazon/s3/MetadataDirective.java index d5bf4bfb517..b3766861cc7 100644 --- a/awsapi/src/com/amazon/s3/MetadataDirective.java +++ b/awsapi/src/com/amazon/s3/MetadataDirective.java @@ -120,7 +120,8 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -319,9 +319,9 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean { public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException { //We can safely assume an element has only one type associated with it - return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, - new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, - org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null); + return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null); } @@ -333,7 +333,7 @@ public class MetadataDirective implements org.apache.axis2.databinding.ADBBean { public static MetadataDirective fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { MetadataDirective enumeration = (MetadataDirective) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/MetadataEntry.java b/awsapi/src/com/amazon/s3/MetadataEntry.java index 85f200a8592..d4b3cb3779f 100644 --- a/awsapi/src/com/amazon/s3/MetadataEntry.java +++ b/awsapi/src/com/amazon/s3/MetadataEntry.java @@ -125,7 +125,8 @@ public class MetadataEntry implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class MetadataEntry implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java index 206b0e7a73d..63e982762e4 100644 --- a/awsapi/src/com/amazon/s3/MfaDeleteStatus.java +++ b/awsapi/src/com/amazon/s3/MfaDeleteStatus.java @@ -120,7 +120,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -320,8 +320,8 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean { //We can safely assume an element has only one type associated with it return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMfaDeleteStatus)}, - null); + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMfaDeleteStatus)}, null); } @@ -333,7 +333,7 @@ public class MfaDeleteStatus implements org.apache.axis2.databinding.ADBBean { public static MfaDeleteStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { MfaDeleteStatus enumeration = (MfaDeleteStatus) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/NotificationConfiguration.java b/awsapi/src/com/amazon/s3/NotificationConfiguration.java index 5071b5f523c..2d61414df45 100644 --- a/awsapi/src/com/amazon/s3/NotificationConfiguration.java +++ b/awsapi/src/com/amazon/s3/NotificationConfiguration.java @@ -142,7 +142,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -187,7 +188,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A if (localTopicConfiguration != null) { for (int i = 0; i < localTopicConfiguration.length; i++) { if (localTopicConfiguration[i] != null) { - localTopicConfiguration[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "TopicConfiguration"), factory, xmlWriter); + localTopicConfiguration[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "TopicConfiguration"), factory, + xmlWriter); } else { // we don't have to do any thing since minOccures is zero @@ -208,9 +210,8 @@ public class NotificationConfiguration implements org.apache.axis2.databinding.A /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/Payer.java b/awsapi/src/com/amazon/s3/Payer.java index 0c17d7c93e4..ea33c567b43 100644 --- a/awsapi/src/com/amazon/s3/Payer.java +++ b/awsapi/src/com/amazon/s3/Payer.java @@ -120,7 +120,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -320,7 +320,8 @@ public class Payer implements org.apache.axis2.databinding.ADBBean { //We can safely assume an element has only one type associated with it return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPayer)}, null); + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPayer)}, + null); } @@ -332,7 +333,7 @@ public class Payer implements org.apache.axis2.databinding.ADBBean { public static Payer fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { Payer enumeration = (Payer) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/Permission.java b/awsapi/src/com/amazon/s3/Permission.java index a29da13e7a6..1fad5a7ceea 100644 --- a/awsapi/src/com/amazon/s3/Permission.java +++ b/awsapi/src/com/amazon/s3/Permission.java @@ -132,7 +132,8 @@ public class Permission implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -190,9 +191,8 @@ public class Permission implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -331,8 +331,9 @@ public class Permission implements org.apache.axis2.databinding.ADBBean { public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException { //We can safely assume an element has only one type associated with it - return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, null); + return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, + new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, null); } @@ -344,7 +345,7 @@ public class Permission implements org.apache.axis2.databinding.ADBBean { public static Permission fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { Permission enumeration = (Permission) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/PostResponse.java b/awsapi/src/com/amazon/s3/PostResponse.java index b98b05981a6..dc5c6e12590 100644 --- a/awsapi/src/com/amazon/s3/PostResponse.java +++ b/awsapi/src/com/amazon/s3/PostResponse.java @@ -170,7 +170,8 @@ public class PostResponse implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -347,9 +348,8 @@ public class PostResponse implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/PrefixEntry.java b/awsapi/src/com/amazon/s3/PrefixEntry.java index b2555812647..65e9ea4d463 100644 --- a/awsapi/src/com/amazon/s3/PrefixEntry.java +++ b/awsapi/src/com/amazon/s3/PrefixEntry.java @@ -101,7 +101,8 @@ public class PrefixEntry implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -182,9 +183,8 @@ public class PrefixEntry implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/PutObject.java b/awsapi/src/com/amazon/s3/PutObject.java index 0494b89f6e7..1c7efa202e3 100644 --- a/awsapi/src/com/amazon/s3/PutObject.java +++ b/awsapi/src/com/amazon/s3/PutObject.java @@ -443,7 +443,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -745,9 +746,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1106,7 +1106,8 @@ public class PutObject implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list3)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list3)); } // End of if for expected property start element diff --git a/awsapi/src/com/amazon/s3/PutObjectInline.java b/awsapi/src/com/amazon/s3/PutObjectInline.java index ff18b87fea3..14cf966aca2 100644 --- a/awsapi/src/com/amazon/s3/PutObjectInline.java +++ b/awsapi/src/com/amazon/s3/PutObjectInline.java @@ -467,7 +467,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -794,9 +795,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -1159,7 +1159,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean { } // call the converter utility to convert and set the array - object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, list3)); + object.setMetadata((com.amazon.s3.MetadataEntry[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.s3.MetadataEntry.class, + list3)); } // End of if for expected property start element @@ -1178,7 +1179,8 @@ public class PutObjectInline implements org.apache.axis2.databinding.ADBBean { } else { if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT && reader.getName().equals( - new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { + new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, + org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8"); object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id)); reader.next(); diff --git a/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java b/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java index 83df649030b..5fefbcb62e5 100644 --- a/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java +++ b/awsapi/src/com/amazon/s3/PutObjectInlineResponse.java @@ -98,7 +98,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -360,7 +360,8 @@ public class PutObjectInlineResponse implements org.apache.axis2.databinding.ADB while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) { object.setPutObjectInlineResponse(com.amazon.s3.PutObjectResult.Factory.parse(reader)); diff --git a/awsapi/src/com/amazon/s3/PutObjectResponse.java b/awsapi/src/com/amazon/s3/PutObjectResponse.java index d7ff71763df..5ca8d8fcb95 100644 --- a/awsapi/src/com/amazon/s3/PutObjectResponse.java +++ b/awsapi/src/com/amazon/s3/PutObjectResponse.java @@ -98,7 +98,8 @@ public class PutObjectResponse implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -152,9 +153,8 @@ public class PutObjectResponse implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/PutObjectResult.java b/awsapi/src/com/amazon/s3/PutObjectResult.java index 997626ef01f..27daa567566 100644 --- a/awsapi/src/com/amazon/s3/PutObjectResult.java +++ b/awsapi/src/com/amazon/s3/PutObjectResult.java @@ -125,7 +125,8 @@ public class PutObjectResult implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -238,9 +239,8 @@ public class PutObjectResult implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java b/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java index 5f689afcec0..170c5efff3d 100644 --- a/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java +++ b/awsapi/src/com/amazon/s3/RequestPaymentConfiguration.java @@ -101,7 +101,8 @@ public class RequestPaymentConfiguration implements org.apache.axis2.databinding } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class RequestPaymentConfiguration implements org.apache.axis2.databinding /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/Result.java b/awsapi/src/com/amazon/s3/Result.java index b2f76fad2ba..6bcae8b0d6e 100644 --- a/awsapi/src/com/amazon/s3/Result.java +++ b/awsapi/src/com/amazon/s3/Result.java @@ -101,7 +101,8 @@ public class Result implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -155,9 +156,8 @@ public class Result implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java index 6e07a054152..067bac2a24b 100644 --- a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java +++ b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicy.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class SetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -288,7 +289,8 @@ public class SetBucketAccessControlPolicy implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -506,9 +508,8 @@ public class SetBucketAccessControlPolicy implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java index 16b67bb9eb5..ebefec2ca75 100644 --- a/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java +++ b/awsapi/src/com/amazon/s3/SetBucketAccessControlPolicyResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicyResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "SetBucketAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -74,7 +75,8 @@ public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123,9 +125,8 @@ public class SetBucketAccessControlPolicyResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java b/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java index 5cc11ade77d..3ccf91555f5 100644 --- a/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java +++ b/awsapi/src/com/amazon/s3/SetBucketLoggingStatus.java @@ -274,7 +274,8 @@ public class SetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -491,9 +492,8 @@ public class SetBucketLoggingStatus implements org.apache.axis2.databinding.ADBB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java b/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java index 693109bc67b..3ad6d22b549 100644 --- a/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java +++ b/awsapi/src/com/amazon/s3/SetBucketLoggingStatusResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class SetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatusResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -74,7 +75,8 @@ public class SetBucketLoggingStatusResponse implements org.apache.axis2.databind } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123,9 +125,8 @@ public class SetBucketLoggingStatusResponse implements org.apache.axis2.databind /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java index 87ce0d3e069..c3384025f3e 100644 --- a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java +++ b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicy.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class SetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -298,7 +299,8 @@ public class SetObjectAccessControlPolicy implements org.apache.axis2.databindin } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -547,9 +549,8 @@ public class SetObjectAccessControlPolicy implements org.apache.axis2.databindin /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java index c90ab64ea55..6c157e05772 100644 --- a/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java +++ b/awsapi/src/com/amazon/s3/SetObjectAccessControlPolicyResponse.java @@ -30,7 +30,8 @@ package com.amazon.s3; public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicyResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "SetObjectAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -74,7 +75,8 @@ public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.da } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -123,9 +125,8 @@ public class SetObjectAccessControlPolicyResponse implements org.apache.axis2.da /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/Status.java b/awsapi/src/com/amazon/s3/Status.java index 71eca241e33..74b4ae47c40 100644 --- a/awsapi/src/com/amazon/s3/Status.java +++ b/awsapi/src/com/amazon/s3/Status.java @@ -125,7 +125,8 @@ public class Status implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -235,9 +236,8 @@ public class Status implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/StorageClass.java b/awsapi/src/com/amazon/s3/StorageClass.java index fc4e8f1fe27..56f7edacec7 100644 --- a/awsapi/src/com/amazon/s3/StorageClass.java +++ b/awsapi/src/com/amazon/s3/StorageClass.java @@ -120,7 +120,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -320,8 +320,8 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean { //We can safely assume an element has only one type associated with it return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)}, - null); + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)}, null); } @@ -333,7 +333,7 @@ public class StorageClass implements org.apache.axis2.databinding.ADBBean { public static StorageClass fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { StorageClass enumeration = (StorageClass) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/TopicConfiguration.java b/awsapi/src/com/amazon/s3/TopicConfiguration.java index ba7b134d84c..4b951497ccc 100644 --- a/awsapi/src/com/amazon/s3/TopicConfiguration.java +++ b/awsapi/src/com/amazon/s3/TopicConfiguration.java @@ -153,7 +153,8 @@ public class TopicConfiguration implements org.apache.axis2.databinding.ADBBean } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -275,9 +276,8 @@ public class TopicConfiguration implements org.apache.axis2.databinding.ADBBean /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/User.java b/awsapi/src/com/amazon/s3/User.java index 6ab47446712..e13fcd1ec8d 100644 --- a/awsapi/src/com/amazon/s3/User.java +++ b/awsapi/src/com/amazon/s3/User.java @@ -77,7 +77,8 @@ public abstract class User extends com.amazon.s3.Grantee implements org.apache.a } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -122,9 +123,8 @@ public abstract class User extends com.amazon.s3.Grantee implements org.apache.a /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/VersionEntry.java b/awsapi/src/com/amazon/s3/VersionEntry.java index a46c777e6fc..900c125f34a 100644 --- a/awsapi/src/com/amazon/s3/VersionEntry.java +++ b/awsapi/src/com/amazon/s3/VersionEntry.java @@ -283,7 +283,8 @@ public class VersionEntry implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -528,9 +529,8 @@ public class VersionEntry implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/VersioningConfiguration.java b/awsapi/src/com/amazon/s3/VersioningConfiguration.java index d8564114aa8..0c402324852 100644 --- a/awsapi/src/com/amazon/s3/VersioningConfiguration.java +++ b/awsapi/src/com/amazon/s3/VersioningConfiguration.java @@ -153,7 +153,8 @@ public class VersioningConfiguration implements org.apache.axis2.databinding.ADB } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -213,9 +214,8 @@ public class VersioningConfiguration implements org.apache.axis2.databinding.ADB /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); diff --git a/awsapi/src/com/amazon/s3/VersioningStatus.java b/awsapi/src/com/amazon/s3/VersioningStatus.java index 22fb4aacdf3..74b3de09564 100644 --- a/awsapi/src/com/amazon/s3/VersioningStatus.java +++ b/awsapi/src/com/amazon/s3/VersioningStatus.java @@ -120,7 +120,8 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -178,9 +179,8 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean { /** * Util method to write an attribute with the ns prefix */ - private void - writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void writeAttribute(java.lang.String prefix, java.lang.String namespace, java.lang.String attName, java.lang.String attValue, + javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException { if (xmlWriter.getPrefix(namespace) == null) { xmlWriter.writeNamespace(prefix, namespace); xmlWriter.setPrefix(prefix, namespace); @@ -319,9 +319,9 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean { public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException { //We can safely assume an element has only one type associated with it - return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, - new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, - org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVersioningStatus)}, null); + return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVersioningStatus)}, null); } @@ -333,7 +333,7 @@ public class VersioningStatus implements org.apache.axis2.databinding.ADBBean { public static VersioningStatus fromValue(java.lang.String value) throws java.lang.IllegalArgumentException { VersioningStatus enumeration = (VersioningStatus) - _table_.get(value); + _table_.get(value); if (enumeration == null) throw new java.lang.IllegalArgumentException(); diff --git a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java index 43b3c5a7c5b..278d11b829d 100644 --- a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java +++ b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java @@ -235,9 +235,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse getBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0) + com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -254,8 +254,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -268,11 +269,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse)object; @@ -333,11 +335,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0, + com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatus getBucketLoggingStatus0, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[0].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketLoggingStatusRequest"); @@ -351,8 +353,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketLoggingStatus0, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketLoggingStatus"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -367,8 +370,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetBucketLoggingStatus((com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -463,9 +467,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse copyObject( - com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2) + com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -482,8 +486,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -496,10 +501,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse)object; @@ -560,11 +567,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startcopyObject( - com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2, + com.amazon.s3.client.AmazonS3Stub.CopyObject copyObject2, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[1].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CopyObjectRequest"); @@ -578,8 +585,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), copyObject2, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "copyObject"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -594,8 +602,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcopyObject((com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -690,9 +698,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4) + com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -709,8 +717,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -723,11 +732,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse)object; @@ -788,11 +799,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4, + com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy getBucketAccessControlPolicy4, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[2].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetBucketAccessControlPolicyRequest"); @@ -806,8 +817,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getBucketAccessControlPolicy4, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getBucketAccessControlPolicy"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -822,8 +834,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetBucketAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -918,9 +931,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.ListBucketResponse listBucket( - com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6) + com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -937,8 +950,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -951,10 +965,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.ListBucketResponse)object; @@ -1015,11 +1031,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startlistBucket( - com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6, + com.amazon.s3.client.AmazonS3Stub.ListBucket listBucket6, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[3].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListBucketRequest"); @@ -1033,8 +1049,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listBucket6, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "listBucket"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1049,8 +1066,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListBucketResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultlistBucket((com.amazon.s3.client.AmazonS3Stub.ListBucketResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1145,9 +1162,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.PutObjectResponse putObject( - com.amazon.s3.client.AmazonS3Stub.PutObject putObject8) + com.amazon.s3.client.AmazonS3Stub.PutObject putObject8) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1164,8 +1181,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "putObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "putObject"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1178,10 +1196,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.PutObjectResponse)object; @@ -1242,11 +1262,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startputObject( - com.amazon.s3.client.AmazonS3Stub.PutObject putObject8, + com.amazon.s3.client.AmazonS3Stub.PutObject putObject8, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[4].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectRequest"); @@ -1260,8 +1280,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "putObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObject8, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "putObject"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1276,8 +1297,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultputObject((com.amazon.s3.client.AmazonS3Stub.PutObjectResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1372,9 +1393,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse createBucket( - com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10) + com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1391,8 +1412,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1405,11 +1427,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse)object; @@ -1470,11 +1493,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startcreateBucket( - com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10, + com.amazon.s3.client.AmazonS3Stub.CreateBucket createBucket10, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[5].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/CreateBucketRequest"); @@ -1488,8 +1511,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), createBucket10, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "createBucket"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1504,8 +1528,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultcreateBucket((com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1600,9 +1624,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse listAllMyBuckets( - com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12) + com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1619,8 +1643,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1633,11 +1658,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse)object; @@ -1698,11 +1724,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startlistAllMyBuckets( - com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12, + com.amazon.s3.client.AmazonS3Stub.ListAllMyBuckets listAllMyBuckets12, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[6].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/ListAllMyBucketsRequest"); @@ -1716,8 +1742,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), listAllMyBuckets12, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "listAllMyBuckets"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1732,8 +1759,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultlistAllMyBuckets((com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -1828,9 +1855,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectResponse getObject( - com.amazon.s3.client.AmazonS3Stub.GetObject getObject14) + com.amazon.s3.client.AmazonS3Stub.GetObject getObject14) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -1847,8 +1874,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObject"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1861,10 +1889,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.GetObjectResponse)object; @@ -1925,11 +1955,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObject( - com.amazon.s3.client.AmazonS3Stub.GetObject getObject14, + com.amazon.s3.client.AmazonS3Stub.GetObject getObject14, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[7].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectRequest"); @@ -1943,8 +1973,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObject14, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObject"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -1959,8 +1990,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetObject((com.amazon.s3.client.AmazonS3Stub.GetObjectResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2055,9 +2086,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse deleteBucket( - com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16) + com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2074,8 +2105,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2088,11 +2120,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse)object; @@ -2153,11 +2186,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startdeleteBucket( - com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16, + com.amazon.s3.client.AmazonS3Stub.DeleteBucket deleteBucket16, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[8].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteBucketRequest"); @@ -2171,8 +2204,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteBucket16, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "deleteBucket"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2187,8 +2221,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteBucket((com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2283,9 +2317,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse setBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18) + com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2302,8 +2336,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2316,11 +2351,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse)object; @@ -2381,11 +2417,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetBucketLoggingStatus( - com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18, + com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatus setBucketLoggingStatus18, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[9].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketLoggingStatusRequest"); @@ -2399,8 +2435,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketLoggingStatus18, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketLoggingStatus"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2415,8 +2452,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultsetBucketLoggingStatus((com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2511,9 +2549,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20) + com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2530,8 +2568,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2544,11 +2583,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse)object; @@ -2609,11 +2650,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20, + com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy getObjectAccessControlPolicy20, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[10].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectAccessControlPolicyRequest"); @@ -2627,8 +2668,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectAccessControlPolicy20, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectAccessControlPolicy"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2643,8 +2685,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetObjectAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2739,9 +2782,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse deleteObject( - com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22) + com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2758,8 +2801,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2772,11 +2816,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse)object; @@ -2837,11 +2882,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startdeleteObject( - com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22, + com.amazon.s3.client.AmazonS3Stub.DeleteObject deleteObject22, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[11].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/DeleteObjectRequest"); @@ -2855,8 +2900,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), deleteObject22, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "deleteObject"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -2871,8 +2917,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultdeleteObject((com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -2967,9 +3013,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24) + com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -2986,8 +3032,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3000,11 +3047,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse)object; @@ -3065,11 +3114,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetBucketAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24, + com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy setBucketAccessControlPolicy24, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[12].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetBucketAccessControlPolicyRequest"); @@ -3083,8 +3132,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setBucketAccessControlPolicy24, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setBucketAccessControlPolicy"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3099,8 +3149,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultsetBucketAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3195,9 +3246,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26) + com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3214,8 +3265,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3228,11 +3280,13 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class, + getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse)object; @@ -3293,11 +3347,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startsetObjectAccessControlPolicy( - com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26, + com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy setObjectAccessControlPolicy26, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[13].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/SetObjectAccessControlPolicyRequest"); @@ -3311,8 +3365,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), setObjectAccessControlPolicy26, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "setObjectAccessControlPolicy"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3327,8 +3382,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.class, + getEnvelopeNamespaces(resultEnv)); callback.receiveResultsetObjectAccessControlPolicy((com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3423,9 +3479,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse putObjectInline( - com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28) + com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3442,8 +3498,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3456,11 +3513,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse)object; @@ -3521,11 +3579,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startputObjectInline( - com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28, + com.amazon.s3.client.AmazonS3Stub.PutObjectInline putObjectInline28, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[14].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/PutObjectInlineRequest"); @@ -3539,8 +3597,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), putObjectInline28, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "putObjectInline"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3555,8 +3614,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultputObjectInline((com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -3651,9 +3710,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse getObjectExtended( - com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30) + com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30) - throws java.rmi.RemoteException + throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = null; @@ -3670,8 +3729,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { // create SOAP envelope with that payload org.apache.axiom.soap.SOAPEnvelope env = null; - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended"))); //adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3684,11 +3744,12 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //execute the operation client _operationClient.execute(true); - org.apache.axis2.context.MessageContext _returnMessageContext = _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); + org.apache.axis2.context.MessageContext _returnMessageContext = + _operationClient.getMessageContext(org.apache.axis2.wsdl.WSDLConstants.MESSAGE_LABEL_IN_VALUE); org.apache.axiom.soap.SOAPEnvelope _returnEnv = _returnMessageContext.getEnvelope(); - java.lang.Object object = fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, - getEnvelopeNamespaces(_returnEnv)); + java.lang.Object object = + fromOM(_returnEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, getEnvelopeNamespaces(_returnEnv)); return (com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse)object; @@ -3749,11 +3810,11 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { */ public void startgetObjectExtended( - com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30, + com.amazon.s3.client.AmazonS3Stub.GetObjectExtended getObjectExtended30, - final com.amazon.s3.client.AmazonS3CallbackHandler callback) + final com.amazon.s3.client.AmazonS3CallbackHandler callback) - throws java.rmi.RemoteException { + throws java.rmi.RemoteException { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[15].getName()); _operationClient.getOptions().setAction("http://s3.amazonaws.com/doc/2006-03-01/AmazonS3/GetObjectExtendedRequest"); @@ -3767,8 +3828,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //Style is Doc. - env = toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName( - "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended"))); + env = + toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()), getObjectExtended30, optimizeContent(new javax.xml.namespace.QName( + "http://s3.amazonaws.com/doc/2006-03-01/", "getObjectExtended"))); // adding SOAP soap_headers _serviceClient.addHeadersToEnvelope(env); @@ -3783,8 +3845,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { try { org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, - getEnvelopeNamespaces(resultEnv)); + java.lang.Object object = + fromOM(resultEnv.getBody().getFirstElement(), com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.class, getEnvelopeNamespaces(resultEnv)); callback.receiveResultgetObjectExtended((com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse)object); } catch (org.apache.axis2.AxisFault e) { @@ -4058,7 +4120,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -4233,8 +4296,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -4596,7 +4660,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -4737,8 +4802,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -5416,7 +5482,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -5714,7 +5781,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localCommonPrefixes != null) { for (int i = 0; i < localCommonPrefixes.length; i++) { if (localCommonPrefixes[i] != null) { - localCommonPrefixes[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CommonPrefixes"), factory, xmlWriter); + localCommonPrefixes[i].serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CommonPrefixes"), factory, + xmlWriter); } else { // we don't have to do any thing since minOccures is zero @@ -5763,8 +5831,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -6560,7 +6629,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -6832,8 +6902,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -7289,7 +7360,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -7383,8 +7455,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -8074,7 +8147,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -8429,8 +8503,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -8784,7 +8859,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } else { if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT && reader.getName().equals( - new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { + new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, + org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8"); object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id)); reader.next(); @@ -9017,7 +9093,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -9126,8 +9203,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -9436,7 +9514,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -9574,8 +9653,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -9879,7 +9959,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -9961,8 +10042,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -10140,7 +10222,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CreateBucketReturn").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CreateBucketReturn").equals(reader.getName())) { object.setCreateBucketReturn(CreateBucketResult.Factory.parse(reader)); @@ -10820,7 +10903,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -11421,8 +11505,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -12085,7 +12170,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class ListAllMyBucketsResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -12153,7 +12239,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -12198,7 +12285,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localListAllMyBucketsResponse == null) { throw new org.apache.axis2.databinding.ADBException("ListAllMyBucketsResponse cannot be null!!"); } - localListAllMyBucketsResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse"), factory, xmlWriter); + localListAllMyBucketsResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -12235,8 +12323,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -12414,7 +12503,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListAllMyBucketsResponse").equals(reader.getName())) { object.setListAllMyBucketsResponse(ListAllMyBucketsResult.Factory.parse(reader)); @@ -12447,7 +12537,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -12705,7 +12796,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -12951,8 +13043,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -13293,8 +13386,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetObjectAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -13362,7 +13455,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -13407,8 +13501,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localGetObjectAccessControlPolicyResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetObjectAccessControlPolicyResponse cannot be null!!"); } - localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicyResponse"), - factory, xmlWriter); + localGetObjectAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetObjectAccessControlPolicyResponse"), factory, xmlWriter); xmlWriter.writeEndElement(); @@ -13445,8 +13539,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -13726,7 +13821,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -13808,8 +13904,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -13987,7 +14084,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "DeleteObjectResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "DeleteObjectResponse").equals(reader.getName())) { object.setDeleteObjectResponse(Status.Factory.parse(reader)); @@ -14020,7 +14118,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetBucketLoggingStatus implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatus", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatus", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -14240,7 +14339,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -14480,8 +14580,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -14932,7 +15033,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -15078,8 +15180,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -15342,7 +15445,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class ExtensionMapper { - public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception { + public static java.lang.Object getTypeObject(java.lang.String namespaceURI, java.lang.String typeName, javax.xml.stream.XMLStreamReader reader) + throws java.lang.Exception { if ("http://s3.amazonaws.com/doc/2006-03-01/".equals(namespaceURI) && "ListAllMyBucketsResult".equals(typeName)) { @@ -15715,7 +15819,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -15955,8 +16060,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -16342,7 +16448,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -16424,8 +16531,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -16603,7 +16711,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "DeleteBucketResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "DeleteBucketResponse").equals(reader.getName())) { object.setDeleteBucketResponse(Status.Factory.parse(reader)); @@ -16731,7 +16840,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -16872,8 +16982,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -17318,7 +17429,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -17530,8 +17642,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -17966,7 +18079,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -18052,8 +18166,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -18165,8 +18280,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //We can safely assume an element has only one type associated with it return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, - null); + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPermission)}, null); } @@ -18178,7 +18293,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(); @@ -18312,7 +18427,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -18389,8 +18505,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -18668,7 +18785,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -18755,8 +18873,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -19679,7 +19798,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -20203,8 +20323,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -20697,7 +20818,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfModifiedSince").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -20714,7 +20836,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfUnmodifiedSince").equals(reader.getName())) { java.lang.String content = reader.getElementText(); @@ -20773,7 +20896,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfNoneMatch").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "CopySourceIfNoneMatch").equals(reader.getName())) { // Process the array and step past its final element's end. list11.add(reader.getElementText()); @@ -21000,7 +21124,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -21082,8 +21207,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -21708,7 +21834,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -22038,8 +22165,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -22604,7 +22732,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -22690,8 +22819,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -22803,8 +22933,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { //We can safely assume an element has only one type associated with it return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { - org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, - org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null); + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMetadataDirective)}, null); } @@ -22816,7 +22946,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(); @@ -23087,7 +23217,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -23271,8 +23402,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -23560,7 +23692,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } else { if (reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT && reader.getName().equals( - new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { + new javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI, + org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE))) { java.lang.String id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8"); object.setData(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)((org.apache.axiom.om.impl.llom.OMStAXWrapper)reader).getBuilder()).getDataHandler(id)); reader.next(); @@ -23737,7 +23870,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -23824,8 +23958,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -24059,8 +24194,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetBucketAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -24128,7 +24263,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -24173,8 +24309,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localGetBucketAccessControlPolicyResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetBucketAccessControlPolicyResponse cannot be null!!"); } - localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicyResponse"), - factory, xmlWriter); + localGetBucketAccessControlPolicyResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetBucketAccessControlPolicyResponse"), factory, xmlWriter); xmlWriter.writeEndElement(); @@ -24211,8 +24347,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -24424,8 +24561,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetObjectAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicyResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "SetObjectAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -24469,7 +24606,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -24546,8 +24684,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -24735,7 +24874,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetObjectAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -25003,7 +25143,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -25280,8 +25421,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -26021,7 +26163,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -26390,8 +26533,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -26906,7 +27050,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -27047,8 +27192,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -27288,7 +27434,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetBucketAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -27508,7 +27655,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -27748,8 +27896,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -28067,7 +28216,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetObjectExtendedResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectExtendedResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectExtendedResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -28135,7 +28285,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -28217,8 +28368,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -28519,7 +28671,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -28605,8 +28758,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -28717,9 +28871,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName) throws org.apache.axis2.databinding.ADBException { //We can safely assume an element has only one type associated with it - return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, - new java.lang.Object[] {org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, - org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)}, null); + return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(MY_QNAME, new java.lang.Object[] { + org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT, + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStorageClass)}, null); } @@ -28731,7 +28885,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(); @@ -28913,7 +29067,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -29054,8 +29209,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -29411,7 +29567,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -29505,8 +29662,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -29827,7 +29985,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -29909,8 +30068,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -30088,7 +30248,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListBucketResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "ListBucketResponse").equals(reader.getName())) { object.setListBucketResponse(ListBucketResult.Factory.parse(reader)); @@ -30216,7 +30377,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -30303,8 +30465,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -30609,7 +30772,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -30718,8 +30882,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -30933,7 +31098,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetObjectAccessControlPolicy implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetObjectAccessControlPolicy", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -31177,7 +31343,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -31449,8 +31616,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -32110,7 +32278,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -32469,8 +32638,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -32989,7 +33159,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -33126,8 +33297,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -33370,7 +33542,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class GetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "GetBucketLoggingStatusResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -33438,7 +33611,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -33483,8 +33657,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localGetBucketLoggingStatusResponse == null) { throw new org.apache.axis2.databinding.ADBException("GetBucketLoggingStatusResponse cannot be null!!"); } - localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"), factory, - xmlWriter); + localGetBucketLoggingStatusResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "GetBucketLoggingStatusResponse"), + factory, xmlWriter); xmlWriter.writeEndElement(); @@ -33521,8 +33695,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -33805,7 +33980,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -33887,8 +34063,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -34167,7 +34344,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -34249,8 +34427,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -34529,7 +34708,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -34611,8 +34791,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -34823,7 +35004,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class PutObjectInlineResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse", + "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -34891,7 +35073,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -34936,7 +35119,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { if (localPutObjectInlineResponse == null) { throw new org.apache.axis2.databinding.ADBException("PutObjectInlineResponse cannot be null!!"); } - localPutObjectInlineResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse"), factory, xmlWriter); + localPutObjectInlineResponse.serialize(new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse"), factory, + xmlWriter); xmlWriter.writeEndElement(); @@ -34973,8 +35157,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -35152,7 +35337,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "PutObjectInlineResponse").equals(reader.getName())) { object.setPutObjectInlineResponse(PutObjectResult.Factory.parse(reader)); @@ -35405,7 +35591,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -35618,8 +35805,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -36002,7 +36190,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -36084,8 +36273,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -36436,7 +36626,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -36641,8 +36832,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -36934,8 +37126,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetBucketAccessControlPolicyResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketAccessControlPolicyResponse", - "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "SetBucketAccessControlPolicyResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -36979,7 +37171,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -37056,8 +37249,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -37245,7 +37439,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetBucketLoggingStatusResponse implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatusResponse", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", + "SetBucketLoggingStatusResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -37289,7 +37484,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -37366,8 +37562,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -37602,7 +37799,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -37675,8 +37873,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -37862,7 +38061,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { public static class SetBucketLoggingStatus implements org.apache.axis2.databinding.ADBBean { - public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatus", "ns1"); + public static final javax.xml.namespace.QName MY_QNAME = + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "SetBucketLoggingStatus", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { if (namespace.equals("http://s3.amazonaws.com/doc/2006-03-01/")) { @@ -38106,7 +38306,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } public void serialize(final javax.xml.namespace.QName parentQName, final org.apache.axiom.om.OMFactory factory, - org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException { + org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException, + org.apache.axis2.databinding.ADBException { serialize(parentQName, factory, xmlWriter, false); } @@ -38351,8 +38552,9 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Util method to write an attribute without the ns prefix */ - private void writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) - throws javax.xml.stream.XMLStreamException { + private void + writeQNameAttribute(java.lang.String namespace, java.lang.String attName, javax.xml.namespace.QName qname, javax.xml.stream.XMLStreamWriter xmlWriter) + throws javax.xml.stream.XMLStreamException { java.lang.String attributeNamespace = qname.getNamespaceURI(); java.lang.String attributePrefix = xmlWriter.getPrefix(attributeNamespace); @@ -38659,7 +38861,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "BucketLoggingStatus").equals(reader.getName())) { + if (reader.isStartElement() && + new javax.xml.namespace.QName("http://s3.amazonaws.com/doc/2006-03-01/", "BucketLoggingStatus").equals(reader.getName())) { object.setBucketLoggingStatus(BucketLoggingStatus.Factory.parse(reader)); @@ -38700,7 +38903,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38730,7 +38934,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38744,7 +38949,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -38821,7 +39027,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38881,7 +39088,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38891,7 +39099,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38905,7 +39114,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -38932,7 +39142,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38946,14 +39157,16 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -38967,7 +39180,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { throws org.apache.axis2.AxisFault { try { - return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse.MY_QNAME, + org.apache.axiom.om.OMAbstractFactory.getOMFactory()); } catch (org.apache.axis2.databinding.ADBException e) { throw org.apache.axis2.AxisFault.makeFault(e); } @@ -38984,7 +39198,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -39004,7 +39219,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { } - private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse param, boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.om.OMElement toOM(com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse param, boolean optimizeContent) + throws org.apache.axis2.AxisFault { try { return param.getOMElement(com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -39030,8 +39246,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.CopyObject param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.CopyObject param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39046,8 +39262,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39062,8 +39278,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.ListBucket param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.ListBucket param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39078,8 +39294,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.PutObject param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.PutObject param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39094,8 +39310,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.CreateBucket param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.CreateBucket param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39126,8 +39342,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.GetObject param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.GetObject param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39142,8 +39358,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.DeleteBucket param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.DeleteBucket param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39174,8 +39390,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39190,8 +39406,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.DeleteObject param, boolean optimizeContent) - throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.DeleteObject param, + boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39206,8 +39422,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { @@ -39222,8 +39438,8 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /* methods to provide back word compatibility */ - private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy param, - boolean optimizeContent) throws org.apache.axis2.AxisFault { + private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, + com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicy param, boolean optimizeContent) throws org.apache.axis2.AxisFault { try { diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java index 20b65a3cffe..555daa0ec4c 100644 --- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java +++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java @@ -21,7 +21,6 @@ import java.io.InputStream; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; -import javax.inject.Inject; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java index b77b415a317..2dcd391c433 100644 --- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java +++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationModule.java @@ -16,13 +16,12 @@ // under the License. package com.cloud.bridge.auth.ec2; -import org.apache.axis2.modules.Module; - -import org.apache.log4j.Logger; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.AxisDescription; import org.apache.axis2.description.AxisModule; +import org.apache.axis2.modules.Module; +import org.apache.log4j.Logger; import org.apache.neethi.Assertion; import org.apache.neethi.Policy; diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java index 740a4a61563..6f43fd17757 100644 --- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java +++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationModule.java @@ -16,13 +16,12 @@ // under the License. package com.cloud.bridge.auth.s3; -import org.apache.axis2.modules.Module; - -import org.apache.log4j.Logger; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.AxisDescription; import org.apache.axis2.description.AxisModule; +import org.apache.axis2.modules.Module; +import org.apache.log4j.Logger; import org.apache.neethi.Assertion; import org.apache.neethi.Policy; diff --git a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java index 89066f5b7fa..0f40c934de2 100644 --- a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java +++ b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java @@ -18,9 +18,10 @@ package com.cloud.bridge.io; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FilterInputStream; + import org.apache.log4j.Logger; /** @@ -362,7 +363,8 @@ public class DimeDelimitedInputStream extends FilterInputStream { int typeLength = ((((int)header[6]) << 8) & 0xff00) | ((int)header[7]); //DATA_LENGTH - recordLength = ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL); + recordLength = + ((((long)header[8]) << 24) & 0xff000000L) | ((((long)header[9]) << 16) & 0xff0000L) | ((((long)header[10]) << 8) & 0xff00L) | ((long)header[11] & 0xffL); //OPTIONS + PADDING if (0 != optionsLength) { @@ -419,8 +421,8 @@ public class DimeDelimitedInputStream extends FilterInputStream { throw streamInError; } } - logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength + ", TYPE_T:" + - tnf); + logger.debug("MB:" + MB + ", ME:" + ME + ", CF:" + moreChunks + "Option length:" + optionsLength + ", ID length:" + idLength + ", typeLength:" + typeLength + + ", TYPE_T:" + tnf); logger.debug("id:\"" + id + "\""); logger.debug("type:\"" + type + "\""); logger.debug("recordlength:\"" + recordLength + "\""); diff --git a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java index 77249aa84aa..51da53601ec 100644 --- a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java +++ b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java @@ -24,15 +24,15 @@ import java.io.OutputStream; import javax.xml.XMLConstants; import javax.xml.namespace.QName; +import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import javax.xml.stream.XMLOutputFactory; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMFactory; -import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer; import org.apache.axis2.databinding.ADBBean; import org.apache.axis2.databinding.ADBException; +import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer; /** * Provide an MTOM aware serializable output stream writer to be consumed by implementors of the diff --git a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java index d4e00d7e122..17006492034 100644 --- a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java +++ b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.bridge.io; -import org.apache.log4j.Logger; - -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; + +import org.apache.log4j.Logger; /** * A DIME stream is actually composed of multiple encoded streams. diff --git a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java index 74b2c8c3168..b0dc5666f4f 100644 --- a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java +++ b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.bridge.io; -import java.util.Arrays; -import java.util.HashSet; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; @@ -30,12 +28,29 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.HashSet; import javax.activation.DataHandler; import javax.activation.DataSource; +import org.apache.commons.httpclient.Header; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; +import org.apache.commons.httpclient.methods.GetMethod; import org.apache.log4j.Logger; +import com.caringo.client.ResettableFileInputStream; +import com.caringo.client.ScspClient; +import com.caringo.client.ScspExecutionException; +import com.caringo.client.ScspHeaders; +import com.caringo.client.ScspQueryArgs; +import com.caringo.client.ScspResponse; +import com.caringo.client.locate.Locator; +import com.caringo.client.locate.StaticLocator; +import com.caringo.client.locate.ZeroconfLocator; + import com.cloud.bridge.service.core.s3.S3BucketAdapter; import com.cloud.bridge.service.core.s3.S3MultipartPart; import com.cloud.bridge.service.exception.ConfigurationException; @@ -43,23 +58,8 @@ import com.cloud.bridge.service.exception.FileNotExistException; import com.cloud.bridge.service.exception.InternalErrorException; import com.cloud.bridge.service.exception.OutOfStorageException; import com.cloud.bridge.service.exception.UnsupportedException; -import com.cloud.bridge.util.StringHelper; import com.cloud.bridge.util.OrderedPair; - -import com.caringo.client.locate.Locator; -import com.caringo.client.locate.StaticLocator; -import com.caringo.client.locate.ZeroconfLocator; -import com.caringo.client.ResettableFileInputStream; -import com.caringo.client.ScspClient; -import com.caringo.client.ScspExecutionException; -import com.caringo.client.ScspHeaders; -import com.caringo.client.ScspQueryArgs; -import com.caringo.client.ScspResponse; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.Header; -import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; +import com.cloud.bridge.util.StringHelper; /** * Creates an SCSP client to a CAStor cluster, configured in "storage.root", @@ -152,7 +152,7 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter { } try { s_logger.info("CAStor client starting: " + (_domain == null ? "default domain" : "domain " + _domain) + " " + - (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort); + (clusterName == null ? Arrays.toString(castorNodes) : clusterName) + " :" + castorPort); _scspClient = new ScspClient(_locator, castorPort, DEFAULT_MAX_POOL_SIZE, DEFAULT_MAX_RETRIES, CONNECTION_TIMEOUT, CM_IDLE_TIMEOUT); _scspClient.start(); } catch (Exception e) { @@ -198,7 +198,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter { ScspResponse bwResponse = myClient(mountedRoot).write(bucket, new ByteArrayInputStream("".getBytes()), 0, domainQueryArg(), new ScspHeaders()); if (bwResponse.getHttpStatusCode() != HTTP_CREATED) { if (bwResponse.getHttpStatusCode() == HTTP_PRECONDITION_FAILED) - s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) + " does not exist"); + s_logger.error("CAStor unable to create bucket " + bucket + " because domain " + (this._domain == null ? "(default)" : this._domain) + + " does not exist"); else s_logger.error("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode()); throw new OutOfStorageException("CAStor unable to create bucket " + bucket + ": " + bwResponse.getHttpStatusCode()); @@ -279,8 +280,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter { } try { - ScspResponse bwResponse = myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(), - new ScspHeaders()); + ScspResponse bwResponse = + myClient(mountedRoot).write(bucket + "/" + fileName, new ResettableFileInputStream(spoolFile), streamLen, domainQueryArg(), new ScspHeaders()); if (bwResponse.getHttpStatusCode() >= HTTP_UNSUCCESSFUL) { s_logger.error("CAStor write responded with error " + bwResponse.getHttpStatusCode()); throw new OutOfStorageException("Unable to write object to CAStor " + bucket + "/" + fileName + ": " + bwResponse.getHttpStatusCode()); @@ -319,7 +320,8 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter { * @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object */ @Override - public OrderedPair concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) { + public OrderedPair concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, + OutputStream client) { // TODO throw new UnsupportedException("Multipart upload support not yet implemented in CAStor plugin"); diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java index 77d847c4944..85d1e0ed759 100644 --- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java +++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java @@ -35,8 +35,8 @@ import com.cloud.bridge.service.core.s3.S3MultipartPart; import com.cloud.bridge.service.exception.FileNotExistException; import com.cloud.bridge.service.exception.InternalErrorException; import com.cloud.bridge.service.exception.OutOfStorageException; -import com.cloud.bridge.util.StringHelper; import com.cloud.bridge.util.OrderedPair; +import com.cloud.bridge.util.StringHelper; public class S3FileSystemBucketAdapter implements S3BucketAdapter { protected final static Logger logger = Logger.getLogger(S3FileSystemBucketAdapter.class); @@ -134,7 +134,8 @@ public class S3FileSystemBucketAdapter implements S3BucketAdapter { * @return OrderedPair with the first value the MD5 of the final object, and the second value the length of the final object */ @Override - public OrderedPair concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, OutputStream client) { + public OrderedPair concatentateObjects(String mountedRoot, String destBucket, String fileName, String sourceBucket, S3MultipartPart[] parts, + OutputStream client) { MessageDigest md5; long totalLength = 0; diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java index eb2831c2484..aeb6de51b98 100644 --- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java +++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java @@ -22,7 +22,6 @@ import org.apache.axis2.engine.ServiceLifeCycle; import org.apache.log4j.Logger; import com.cloud.bridge.service.controller.s3.ServiceProvider; -import com.cloud.utils.db.Transaction; /** * ServiceEngineLifecycle is used to participate Axis service life cycle management diff --git a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java index 08029126435..a60df06c492 100644 --- a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java +++ b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java @@ -18,8 +18,6 @@ package com.cloud.bridge.model; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java index 79f993284b3..907fb39dfb8 100644 --- a/awsapi/src/com/cloud/bridge/model/SAcl.java +++ b/awsapi/src/com/cloud/bridge/model/SAcl.java @@ -16,13 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; -import java.util.Date; - -import com.cloud.bridge.service.exception.UnsupportedException; -import com.cloud.bridge.util.OrderedPair; -import com.cloud.bridge.util.Triple; - /** * A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee * Hold the AWS S3 grantee and permission constants. diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java index 53b1a5eaa49..033d59c6e05 100644 --- a/awsapi/src/com/cloud/bridge/model/SBucket.java +++ b/awsapi/src/com/cloud/bridge/model/SBucket.java @@ -16,11 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - /** * Holds the relation * Id, diff --git a/awsapi/src/com/cloud/bridge/model/SBucketVO.java b/awsapi/src/com/cloud/bridge/model/SBucketVO.java index f71688aa247..cc97e464b75 100644 --- a/awsapi/src/com/cloud/bridge/model/SBucketVO.java +++ b/awsapi/src/com/cloud/bridge/model/SBucketVO.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; import java.util.Date; import java.util.HashSet; import java.util.Set; diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java index d085425090b..6c578578abf 100644 --- a/awsapi/src/com/cloud/bridge/model/SHost.java +++ b/awsapi/src/com/cloud/bridge/model/SHost.java @@ -16,10 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - public interface SHost { public static final int STORAGE_HOST_TYPE_LOCAL = 0; diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java index 1fcac588288..5eada3c136d 100644 --- a/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java +++ b/awsapi/src/com/cloud/bridge/model/SObjectItemVO.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; import java.util.Date; import javax.persistence.Column; diff --git a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java index e5d84a4a277..9a10c2e4ce4 100644 --- a/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java +++ b/awsapi/src/com/cloud/bridge/model/UserCredentialsVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.bridge.model; -import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java index 95c3a90b9af..a18bb4c446a 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java @@ -24,7 +24,6 @@ import com.cloud.bridge.model.CloudStackAccountVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java index 7f96cac4b21..f36d1e7adaf 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java @@ -26,7 +26,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java index 01de27e85cb..effc381147a 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java @@ -22,13 +22,9 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackServiceOfferingVO; -import com.cloud.bridge.model.SHostVO; -import com.cloud.stack.models.CloudStackConfiguration; -import com.cloud.stack.models.CloudStackServiceOffering; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java index a28965c175f..279ee43b694 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java @@ -22,12 +22,11 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackUserVO; +import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; -import com.cloud.utils.crypt.DBEncryptionUtil; @Component @Local(value = {CloudStackUserDao.class}) diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java index 041cb6df74c..a592badeec5 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java @@ -25,7 +25,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java index bb868a8820f..929af7a86e6 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java @@ -24,7 +24,6 @@ import com.cloud.bridge.model.MHostMountVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java index 902e5e89bb3..36a8cdfb307 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java @@ -27,7 +27,6 @@ import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java index a24c7f752f4..8ef78397504 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java @@ -23,16 +23,12 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.bridge.model.MultiPartPartsVO; import com.cloud.bridge.model.MultiPartUploadsVO; -import com.cloud.bridge.model.SBucketVO; import com.cloud.bridge.util.OrderedPair; -import com.cloud.utils.db.Attribute; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java index 13456d89c40..ffa1f5d0656 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java @@ -33,7 +33,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry; import com.cloud.bridge.service.core.s3.S3MultipartPart; import com.cloud.bridge.service.core.s3.S3MultipartUpload; import com.cloud.bridge.util.OrderedPair; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class MultipartLoadDao { @@ -258,7 +257,8 @@ public class MultipartLoadDao { * @return an array of S3MultipartPart objects * @throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException */ - public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException { + public S3MultipartPart[] getParts(int uploadId, int maxParts, int startAt) throws InstantiationException, IllegalAccessException, ClassNotFoundException, + SQLException { S3MultipartPart[] parts = new S3MultipartPart[maxParts]; int i = 0; List partsVO; diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java index 97ae09c8b5b..e647c0dfc2e 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java @@ -26,7 +26,6 @@ import com.cloud.bridge.model.MultipartMetaVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java index b302dda6a52..85085902a72 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java @@ -17,8 +17,6 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; -import javax.persistence.Entity; -import javax.persistence.Table; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -27,7 +25,6 @@ import com.cloud.bridge.model.OfferingBundleVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java index 26a65eebcbc..0fb697b9e52 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java @@ -31,7 +31,6 @@ import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java index 02d8fa32689..a01cce4430a 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java @@ -22,13 +22,11 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.bridge.model.SBucket; import com.cloud.bridge.model.SBucketVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java index d46aa6755a6..a5ebbc1ffac 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java @@ -24,7 +24,6 @@ import com.cloud.bridge.model.SHostVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java index a40ca5a453e..65a8f6b4fe8 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java @@ -27,7 +27,6 @@ import com.cloud.bridge.service.core.s3.S3MetaDataEntry; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java index 2e94c7cabdf..f2a00b0edbc 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java @@ -32,7 +32,6 @@ import com.cloud.bridge.model.SObjectVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java index 33ea03b5baf..30387b89138 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java @@ -26,7 +26,6 @@ import com.cloud.bridge.model.SObjectItemVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java index c9dd5493c71..45c42696d15 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.bridge.persist.dao; -import java.sql.*; - import javax.ejb.Local; import org.apache.log4j.Logger; @@ -28,7 +26,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java index a7e00a1461f..9fc353f0867 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java @@ -17,7 +17,6 @@ package com.cloud.bridge.service; import java.io.IOException; - import java.io.OutputStreamWriter; import java.util.UUID; diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index b9e4bd6eb09..5c56e9d0506 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -103,6 +103,7 @@ import com.amazon.ec2.RunInstancesResponse; import com.amazon.ec2.StartInstancesResponse; import com.amazon.ec2.StopInstancesResponse; import com.amazon.ec2.TerminateInstancesResponse; + import com.cloud.bridge.model.UserCredentialsVO; import com.cloud.bridge.persist.dao.CloudStackUserDaoImpl; import com.cloud.bridge.persist.dao.OfferingDaoImpl; @@ -131,8 +132,8 @@ import com.cloud.bridge.service.core.ec2.EC2Engine; import com.cloud.bridge.service.core.ec2.EC2Filter; import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet; import com.cloud.bridge.service.core.ec2.EC2Image; -import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet; import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute; +import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet; import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission; import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair; import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet; @@ -160,7 +161,6 @@ import com.cloud.bridge.util.AuthenticationUtils; import com.cloud.bridge.util.ConfigurationHelper; import com.cloud.bridge.util.EC2RestAuth; import com.cloud.stack.models.CloudStackAccount; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component("EC2RestServlet") @@ -829,9 +829,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - RevokeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance() - .getEC2Engine() - .revokeSecurityGroup(EC2request)); + RevokeSecurityGroupIngressResponse EC2response = + EC2SoapServiceImpl.toRevokeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().revokeSecurityGroup(EC2request)); serializeResponse(response, EC2response); } @@ -915,9 +914,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - AuthorizeSecurityGroupIngressResponse EC2response = EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance() - .getEC2Engine() - .authorizeSecurityGroup(EC2request)); + AuthorizeSecurityGroupIngressResponse EC2response = + EC2SoapServiceImpl.toAuthorizeSecurityGroupIngressResponse(ServiceProvider.getInstance().getEC2Engine().authorizeSecurityGroup(EC2request)); serializeResponse(response, EC2response); } @@ -1013,9 +1011,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - CreateSecurityGroupResponse EC2response = EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance() - .getEC2Engine() - .createSecurityGroup(groupName, groupDescription)); + CreateSecurityGroupResponse EC2response = + EC2SoapServiceImpl.toCreateSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().createSecurityGroup(groupName, groupDescription)); serializeResponse(response, EC2response); } @@ -1030,7 +1027,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - DeleteSecurityGroupResponse EC2response = EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName)); + DeleteSecurityGroupResponse EC2response = + EC2SoapServiceImpl.toDeleteSecurityGroupResponse(ServiceProvider.getInstance().getEC2Engine().deleteSecurityGroup(groupName)); serializeResponse(response, EC2response); } @@ -1167,7 +1165,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - ModifyImageAttributeResponse EC2response = EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); + ModifyImageAttributeResponse EC2response = + EC2SoapServiceImpl.toModifyImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1231,7 +1230,8 @@ public class EC2RestServlet extends HttpServlet { ec2request.addLaunchPermission(launchPermission); // -> execute the request - ResetImageAttributeResponse EC2response = EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); + ResetImageAttributeResponse EC2response = + EC2SoapServiceImpl.toResetImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1442,9 +1442,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - DescribeAvailabilityZonesResponse EC2response = EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance() - .getEC2Engine() - .describeAvailabilityZones(EC2request)); + DescribeAvailabilityZonesResponse EC2response = + EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse(ServiceProvider.getInstance().getEC2Engine().describeAvailabilityZones(EC2request)); serializeResponse(response, EC2response); } @@ -1499,9 +1498,8 @@ public class EC2RestServlet extends HttpServlet { throw new EC2ServiceException(ClientError.MissingParamter, "Missing required parameter - Attribute"); } - DescribeImageAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance() - .getEC2Engine() - .describeImageAttribute(ec2request)); + DescribeImageAttributeResponse EC2response = + EC2SoapServiceImpl.toDescribeImageAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeImageAttribute(ec2request)); serializeResponse(response, EC2response); } @@ -1678,9 +1676,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - DescribeInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance() - .getEC2Engine() - .describeInstances(EC2request)); + DescribeInstanceAttributeResponse EC2response = + EC2SoapServiceImpl.toDescribeInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().describeInstances(EC2request)); serializeResponse(response, EC2response); } @@ -1709,9 +1706,8 @@ public class EC2RestServlet extends HttpServlet { } // -> execute the request - ModifyInstanceAttributeResponse EC2response = EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance() - .getEC2Engine() - .modifyInstanceAttribute(ec2Request)); + ModifyInstanceAttributeResponse EC2response = + EC2SoapServiceImpl.toModifyInstanceAttributeResponse(ServiceProvider.getInstance().getEC2Engine().modifyInstanceAttribute(ec2Request)); serializeResponse(response, EC2response); } @@ -1769,7 +1765,8 @@ public class EC2RestServlet extends HttpServlet { // -> execute the request EC2Engine engine = ServiceProvider.getInstance().getEC2Engine(); - DescribeVolumesResponse EC2response = EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine); + DescribeVolumesResponse EC2response = + EC2SoapServiceImpl.toDescribeVolumesResponse(ServiceProvider.getInstance().getEC2Engine().describeVolumes(EC2request), engine); serializeResponse(response, EC2response); } diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java index 5f3c13e051c..cfad70c5851 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapService.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapService.java @@ -18,7 +18,296 @@ package com.cloud.bridge.service; import org.apache.log4j.Logger; -import com.amazon.ec2.*; +import com.amazon.ec2.ActivateLicense; +import com.amazon.ec2.ActivateLicenseResponse; +import com.amazon.ec2.AllocateAddress; +import com.amazon.ec2.AllocateAddressResponse; +import com.amazon.ec2.AmazonEC2SkeletonInterface; +import com.amazon.ec2.AssignPrivateIpAddresses; +import com.amazon.ec2.AssignPrivateIpAddressesResponse; +import com.amazon.ec2.AssociateAddress; +import com.amazon.ec2.AssociateAddressResponse; +import com.amazon.ec2.AssociateDhcpOptions; +import com.amazon.ec2.AssociateDhcpOptionsResponse; +import com.amazon.ec2.AssociateRouteTable; +import com.amazon.ec2.AssociateRouteTableResponse; +import com.amazon.ec2.AttachInternetGateway; +import com.amazon.ec2.AttachInternetGatewayResponse; +import com.amazon.ec2.AttachNetworkInterface; +import com.amazon.ec2.AttachNetworkInterfaceResponse; +import com.amazon.ec2.AttachVolume; +import com.amazon.ec2.AttachVolumeResponse; +import com.amazon.ec2.AttachVpnGateway; +import com.amazon.ec2.AttachVpnGatewayResponse; +import com.amazon.ec2.AuthorizeSecurityGroupEgress; +import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse; +import com.amazon.ec2.AuthorizeSecurityGroupIngress; +import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse; +import com.amazon.ec2.BundleInstance; +import com.amazon.ec2.BundleInstanceResponse; +import com.amazon.ec2.CancelBundleTask; +import com.amazon.ec2.CancelBundleTaskResponse; +import com.amazon.ec2.CancelConversionTask; +import com.amazon.ec2.CancelConversionTaskResponse; +import com.amazon.ec2.CancelExportTask; +import com.amazon.ec2.CancelExportTaskResponse; +import com.amazon.ec2.CancelReservedInstancesListing; +import com.amazon.ec2.CancelReservedInstancesListingResponse; +import com.amazon.ec2.CancelSpotInstanceRequests; +import com.amazon.ec2.CancelSpotInstanceRequestsResponse; +import com.amazon.ec2.ConfirmProductInstance; +import com.amazon.ec2.ConfirmProductInstanceResponse; +import com.amazon.ec2.CreateCustomerGateway; +import com.amazon.ec2.CreateCustomerGatewayResponse; +import com.amazon.ec2.CreateDhcpOptions; +import com.amazon.ec2.CreateDhcpOptionsResponse; +import com.amazon.ec2.CreateImage; +import com.amazon.ec2.CreateImageResponse; +import com.amazon.ec2.CreateInstanceExportTask; +import com.amazon.ec2.CreateInstanceExportTaskResponse; +import com.amazon.ec2.CreateInternetGateway; +import com.amazon.ec2.CreateInternetGatewayResponse; +import com.amazon.ec2.CreateKeyPair; +import com.amazon.ec2.CreateKeyPairResponse; +import com.amazon.ec2.CreateNetworkAcl; +import com.amazon.ec2.CreateNetworkAclEntry; +import com.amazon.ec2.CreateNetworkAclEntryResponse; +import com.amazon.ec2.CreateNetworkAclResponse; +import com.amazon.ec2.CreateNetworkInterface; +import com.amazon.ec2.CreateNetworkInterfaceResponse; +import com.amazon.ec2.CreatePlacementGroup; +import com.amazon.ec2.CreatePlacementGroupResponse; +import com.amazon.ec2.CreateReservedInstancesListing; +import com.amazon.ec2.CreateReservedInstancesListingResponse; +import com.amazon.ec2.CreateRoute; +import com.amazon.ec2.CreateRouteResponse; +import com.amazon.ec2.CreateRouteTable; +import com.amazon.ec2.CreateRouteTableResponse; +import com.amazon.ec2.CreateSecurityGroup; +import com.amazon.ec2.CreateSecurityGroupResponse; +import com.amazon.ec2.CreateSnapshot; +import com.amazon.ec2.CreateSnapshotResponse; +import com.amazon.ec2.CreateSpotDatafeedSubscription; +import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.CreateSubnet; +import com.amazon.ec2.CreateSubnetResponse; +import com.amazon.ec2.CreateTags; +import com.amazon.ec2.CreateTagsResponse; +import com.amazon.ec2.CreateVolume; +import com.amazon.ec2.CreateVolumeResponse; +import com.amazon.ec2.CreateVpc; +import com.amazon.ec2.CreateVpcResponse; +import com.amazon.ec2.CreateVpnConnection; +import com.amazon.ec2.CreateVpnConnectionResponse; +import com.amazon.ec2.CreateVpnConnectionRoute; +import com.amazon.ec2.CreateVpnConnectionRouteResponse; +import com.amazon.ec2.CreateVpnGateway; +import com.amazon.ec2.CreateVpnGatewayResponse; +import com.amazon.ec2.DeactivateLicense; +import com.amazon.ec2.DeactivateLicenseResponse; +import com.amazon.ec2.DeleteCustomerGateway; +import com.amazon.ec2.DeleteCustomerGatewayResponse; +import com.amazon.ec2.DeleteDhcpOptions; +import com.amazon.ec2.DeleteDhcpOptionsResponse; +import com.amazon.ec2.DeleteInternetGateway; +import com.amazon.ec2.DeleteInternetGatewayResponse; +import com.amazon.ec2.DeleteKeyPair; +import com.amazon.ec2.DeleteKeyPairResponse; +import com.amazon.ec2.DeleteNetworkAcl; +import com.amazon.ec2.DeleteNetworkAclEntry; +import com.amazon.ec2.DeleteNetworkAclEntryResponse; +import com.amazon.ec2.DeleteNetworkAclResponse; +import com.amazon.ec2.DeleteNetworkInterface; +import com.amazon.ec2.DeleteNetworkInterfaceResponse; +import com.amazon.ec2.DeletePlacementGroup; +import com.amazon.ec2.DeletePlacementGroupResponse; +import com.amazon.ec2.DeleteRoute; +import com.amazon.ec2.DeleteRouteResponse; +import com.amazon.ec2.DeleteRouteTable; +import com.amazon.ec2.DeleteRouteTableResponse; +import com.amazon.ec2.DeleteSecurityGroup; +import com.amazon.ec2.DeleteSecurityGroupResponse; +import com.amazon.ec2.DeleteSnapshot; +import com.amazon.ec2.DeleteSnapshotResponse; +import com.amazon.ec2.DeleteSpotDatafeedSubscription; +import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.DeleteSubnet; +import com.amazon.ec2.DeleteSubnetResponse; +import com.amazon.ec2.DeleteTags; +import com.amazon.ec2.DeleteTagsResponse; +import com.amazon.ec2.DeleteVolume; +import com.amazon.ec2.DeleteVolumeResponse; +import com.amazon.ec2.DeleteVpc; +import com.amazon.ec2.DeleteVpcResponse; +import com.amazon.ec2.DeleteVpnConnection; +import com.amazon.ec2.DeleteVpnConnectionResponse; +import com.amazon.ec2.DeleteVpnConnectionRoute; +import com.amazon.ec2.DeleteVpnConnectionRouteResponse; +import com.amazon.ec2.DeleteVpnGateway; +import com.amazon.ec2.DeleteVpnGatewayResponse; +import com.amazon.ec2.DeregisterImage; +import com.amazon.ec2.DeregisterImageResponse; +import com.amazon.ec2.DescribeAddresses; +import com.amazon.ec2.DescribeAddressesResponse; +import com.amazon.ec2.DescribeAvailabilityZones; +import com.amazon.ec2.DescribeAvailabilityZonesResponse; +import com.amazon.ec2.DescribeBundleTasks; +import com.amazon.ec2.DescribeBundleTasksResponse; +import com.amazon.ec2.DescribeConversionTasks; +import com.amazon.ec2.DescribeConversionTasksResponse; +import com.amazon.ec2.DescribeCustomerGateways; +import com.amazon.ec2.DescribeCustomerGatewaysResponse; +import com.amazon.ec2.DescribeDhcpOptions; +import com.amazon.ec2.DescribeDhcpOptionsResponse; +import com.amazon.ec2.DescribeExportTasks; +import com.amazon.ec2.DescribeExportTasksResponse; +import com.amazon.ec2.DescribeImageAttribute; +import com.amazon.ec2.DescribeImageAttributeResponse; +import com.amazon.ec2.DescribeImages; +import com.amazon.ec2.DescribeImagesResponse; +import com.amazon.ec2.DescribeInstanceAttribute; +import com.amazon.ec2.DescribeInstanceAttributeResponse; +import com.amazon.ec2.DescribeInstanceStatus; +import com.amazon.ec2.DescribeInstanceStatusResponse; +import com.amazon.ec2.DescribeInstances; +import com.amazon.ec2.DescribeInstancesResponse; +import com.amazon.ec2.DescribeInternetGateways; +import com.amazon.ec2.DescribeInternetGatewaysResponse; +import com.amazon.ec2.DescribeKeyPairs; +import com.amazon.ec2.DescribeKeyPairsResponse; +import com.amazon.ec2.DescribeLicenses; +import com.amazon.ec2.DescribeLicensesResponse; +import com.amazon.ec2.DescribeNetworkAcls; +import com.amazon.ec2.DescribeNetworkAclsResponse; +import com.amazon.ec2.DescribeNetworkInterfaceAttribute; +import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse; +import com.amazon.ec2.DescribeNetworkInterfaces; +import com.amazon.ec2.DescribeNetworkInterfacesResponse; +import com.amazon.ec2.DescribePlacementGroups; +import com.amazon.ec2.DescribePlacementGroupsResponse; +import com.amazon.ec2.DescribeRegions; +import com.amazon.ec2.DescribeRegionsResponse; +import com.amazon.ec2.DescribeReservedInstances; +import com.amazon.ec2.DescribeReservedInstancesListings; +import com.amazon.ec2.DescribeReservedInstancesListingsResponse; +import com.amazon.ec2.DescribeReservedInstancesOfferings; +import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse; +import com.amazon.ec2.DescribeReservedInstancesResponse; +import com.amazon.ec2.DescribeRouteTables; +import com.amazon.ec2.DescribeRouteTablesResponse; +import com.amazon.ec2.DescribeSecurityGroups; +import com.amazon.ec2.DescribeSecurityGroupsResponse; +import com.amazon.ec2.DescribeSnapshotAttribute; +import com.amazon.ec2.DescribeSnapshotAttributeResponse; +import com.amazon.ec2.DescribeSnapshots; +import com.amazon.ec2.DescribeSnapshotsResponse; +import com.amazon.ec2.DescribeSpotDatafeedSubscription; +import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.DescribeSpotInstanceRequests; +import com.amazon.ec2.DescribeSpotInstanceRequestsResponse; +import com.amazon.ec2.DescribeSpotPriceHistory; +import com.amazon.ec2.DescribeSpotPriceHistoryResponse; +import com.amazon.ec2.DescribeSubnets; +import com.amazon.ec2.DescribeSubnetsResponse; +import com.amazon.ec2.DescribeTags; +import com.amazon.ec2.DescribeTagsResponse; +import com.amazon.ec2.DescribeVolumeAttribute; +import com.amazon.ec2.DescribeVolumeAttributeResponse; +import com.amazon.ec2.DescribeVolumeStatus; +import com.amazon.ec2.DescribeVolumeStatusResponse; +import com.amazon.ec2.DescribeVolumes; +import com.amazon.ec2.DescribeVolumesResponse; +import com.amazon.ec2.DescribeVpcs; +import com.amazon.ec2.DescribeVpcsResponse; +import com.amazon.ec2.DescribeVpnConnections; +import com.amazon.ec2.DescribeVpnConnectionsResponse; +import com.amazon.ec2.DescribeVpnGateways; +import com.amazon.ec2.DescribeVpnGatewaysResponse; +import com.amazon.ec2.DetachInternetGateway; +import com.amazon.ec2.DetachInternetGatewayResponse; +import com.amazon.ec2.DetachNetworkInterface; +import com.amazon.ec2.DetachNetworkInterfaceResponse; +import com.amazon.ec2.DetachVolume; +import com.amazon.ec2.DetachVolumeResponse; +import com.amazon.ec2.DetachVpnGateway; +import com.amazon.ec2.DetachVpnGatewayResponse; +import com.amazon.ec2.DisableVgwRoutePropagation; +import com.amazon.ec2.DisableVgwRoutePropagationResponse; +import com.amazon.ec2.DisassociateAddress; +import com.amazon.ec2.DisassociateAddressResponse; +import com.amazon.ec2.DisassociateRouteTable; +import com.amazon.ec2.DisassociateRouteTableResponse; +import com.amazon.ec2.EnableVgwRoutePropagation; +import com.amazon.ec2.EnableVgwRoutePropagationResponse; +import com.amazon.ec2.EnableVolumeIO; +import com.amazon.ec2.EnableVolumeIOResponse; +import com.amazon.ec2.GetConsoleOutput; +import com.amazon.ec2.GetConsoleOutputResponse; +import com.amazon.ec2.GetPasswordData; +import com.amazon.ec2.GetPasswordDataResponse; +import com.amazon.ec2.ImportInstance; +import com.amazon.ec2.ImportInstanceResponse; +import com.amazon.ec2.ImportKeyPair; +import com.amazon.ec2.ImportKeyPairResponse; +import com.amazon.ec2.ImportVolume; +import com.amazon.ec2.ImportVolumeResponse; +import com.amazon.ec2.ModifyImageAttribute; +import com.amazon.ec2.ModifyImageAttributeResponse; +import com.amazon.ec2.ModifyInstanceAttribute; +import com.amazon.ec2.ModifyInstanceAttributeResponse; +import com.amazon.ec2.ModifyNetworkInterfaceAttribute; +import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse; +import com.amazon.ec2.ModifySnapshotAttribute; +import com.amazon.ec2.ModifySnapshotAttributeResponse; +import com.amazon.ec2.ModifyVolumeAttribute; +import com.amazon.ec2.ModifyVolumeAttributeResponse; +import com.amazon.ec2.MonitorInstances; +import com.amazon.ec2.MonitorInstancesResponse; +import com.amazon.ec2.PurchaseReservedInstancesOffering; +import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse; +import com.amazon.ec2.RebootInstances; +import com.amazon.ec2.RebootInstancesResponse; +import com.amazon.ec2.RegisterImage; +import com.amazon.ec2.RegisterImageResponse; +import com.amazon.ec2.ReleaseAddress; +import com.amazon.ec2.ReleaseAddressResponse; +import com.amazon.ec2.ReplaceNetworkAclAssociation; +import com.amazon.ec2.ReplaceNetworkAclAssociationResponse; +import com.amazon.ec2.ReplaceNetworkAclEntry; +import com.amazon.ec2.ReplaceNetworkAclEntryResponse; +import com.amazon.ec2.ReplaceRoute; +import com.amazon.ec2.ReplaceRouteResponse; +import com.amazon.ec2.ReplaceRouteTableAssociation; +import com.amazon.ec2.ReplaceRouteTableAssociationResponse; +import com.amazon.ec2.ReportInstanceStatus; +import com.amazon.ec2.ReportInstanceStatusResponse; +import com.amazon.ec2.RequestSpotInstances; +import com.amazon.ec2.RequestSpotInstancesResponse; +import com.amazon.ec2.ResetImageAttribute; +import com.amazon.ec2.ResetImageAttributeResponse; +import com.amazon.ec2.ResetInstanceAttribute; +import com.amazon.ec2.ResetInstanceAttributeResponse; +import com.amazon.ec2.ResetNetworkInterfaceAttribute; +import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse; +import com.amazon.ec2.ResetSnapshotAttribute; +import com.amazon.ec2.ResetSnapshotAttributeResponse; +import com.amazon.ec2.RevokeSecurityGroupEgress; +import com.amazon.ec2.RevokeSecurityGroupEgressResponse; +import com.amazon.ec2.RevokeSecurityGroupIngress; +import com.amazon.ec2.RevokeSecurityGroupIngressResponse; +import com.amazon.ec2.RunInstances; +import com.amazon.ec2.RunInstancesResponse; +import com.amazon.ec2.StartInstances; +import com.amazon.ec2.StartInstancesResponse; +import com.amazon.ec2.StopInstances; +import com.amazon.ec2.StopInstancesResponse; +import com.amazon.ec2.TerminateInstances; +import com.amazon.ec2.TerminateInstancesResponse; +import com.amazon.ec2.UnassignPrivateIpAddresses; +import com.amazon.ec2.UnassignPrivateIpAddressesResponse; +import com.amazon.ec2.UnmonitorInstances; +import com.amazon.ec2.UnmonitorInstancesResponse; + import com.cloud.bridge.service.controller.s3.ServiceProvider; public class EC2SoapService implements AmazonEC2SkeletonInterface { diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java index f2fd4a647a6..dac18e42d20 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java @@ -26,35 +26,491 @@ import java.util.UUID; import org.apache.commons.codec.binary.Base64; -import com.amazon.ec2.*; +import com.amazon.ec2.ActivateLicense; +import com.amazon.ec2.ActivateLicenseResponse; +import com.amazon.ec2.AllocateAddress; +import com.amazon.ec2.AllocateAddressResponse; +import com.amazon.ec2.AllocateAddressResponseType; +import com.amazon.ec2.AmazonEC2SkeletonInterface; +import com.amazon.ec2.AssignPrivateIpAddresses; +import com.amazon.ec2.AssignPrivateIpAddressesResponse; +import com.amazon.ec2.AssociateAddress; +import com.amazon.ec2.AssociateAddressResponse; +import com.amazon.ec2.AssociateAddressResponseType; +import com.amazon.ec2.AssociateDhcpOptions; +import com.amazon.ec2.AssociateDhcpOptionsResponse; +import com.amazon.ec2.AssociateRouteTable; +import com.amazon.ec2.AssociateRouteTableResponse; +import com.amazon.ec2.AttachInternetGateway; +import com.amazon.ec2.AttachInternetGatewayResponse; +import com.amazon.ec2.AttachNetworkInterface; +import com.amazon.ec2.AttachNetworkInterfaceResponse; +import com.amazon.ec2.AttachVolume; +import com.amazon.ec2.AttachVolumeResponse; +import com.amazon.ec2.AttachVolumeResponseType; +import com.amazon.ec2.AttachVolumeType; +import com.amazon.ec2.AttachVpnGateway; +import com.amazon.ec2.AttachVpnGatewayResponse; +import com.amazon.ec2.AttachmentSetItemResponseType; +import com.amazon.ec2.AttachmentSetResponseType; +import com.amazon.ec2.AttributeValueType; +import com.amazon.ec2.AuthorizeSecurityGroupEgress; +import com.amazon.ec2.AuthorizeSecurityGroupEgressResponse; +import com.amazon.ec2.AuthorizeSecurityGroupIngress; +import com.amazon.ec2.AuthorizeSecurityGroupIngressResponse; +import com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType; +import com.amazon.ec2.AuthorizeSecurityGroupIngressType; +import com.amazon.ec2.AvailabilityZoneItemType; +import com.amazon.ec2.AvailabilityZoneMessageSetType; +import com.amazon.ec2.AvailabilityZoneMessageType; +import com.amazon.ec2.AvailabilityZoneSetType; +import com.amazon.ec2.BlockDeviceMappingItemType; +import com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0; +import com.amazon.ec2.BlockDeviceMappingType; +import com.amazon.ec2.BundleInstance; +import com.amazon.ec2.BundleInstanceResponse; +import com.amazon.ec2.CancelBundleTask; +import com.amazon.ec2.CancelBundleTaskResponse; +import com.amazon.ec2.CancelConversionTask; +import com.amazon.ec2.CancelConversionTaskResponse; +import com.amazon.ec2.CancelExportTask; +import com.amazon.ec2.CancelExportTaskResponse; +import com.amazon.ec2.CancelReservedInstancesListing; +import com.amazon.ec2.CancelReservedInstancesListingResponse; +import com.amazon.ec2.CancelSpotInstanceRequests; +import com.amazon.ec2.CancelSpotInstanceRequestsResponse; +import com.amazon.ec2.ConfirmProductInstance; +import com.amazon.ec2.ConfirmProductInstanceResponse; +import com.amazon.ec2.CreateCustomerGateway; +import com.amazon.ec2.CreateCustomerGatewayResponse; +import com.amazon.ec2.CreateDhcpOptions; +import com.amazon.ec2.CreateDhcpOptionsResponse; +import com.amazon.ec2.CreateImage; +import com.amazon.ec2.CreateImageResponse; +import com.amazon.ec2.CreateImageResponseType; +import com.amazon.ec2.CreateImageType; +import com.amazon.ec2.CreateInstanceExportTask; +import com.amazon.ec2.CreateInstanceExportTaskResponse; +import com.amazon.ec2.CreateInternetGateway; +import com.amazon.ec2.CreateInternetGatewayResponse; +import com.amazon.ec2.CreateKeyPair; +import com.amazon.ec2.CreateKeyPairResponse; +import com.amazon.ec2.CreateKeyPairResponseType; +import com.amazon.ec2.CreateNetworkAcl; +import com.amazon.ec2.CreateNetworkAclEntry; +import com.amazon.ec2.CreateNetworkAclEntryResponse; +import com.amazon.ec2.CreateNetworkAclResponse; +import com.amazon.ec2.CreateNetworkInterface; +import com.amazon.ec2.CreateNetworkInterfaceResponse; +import com.amazon.ec2.CreatePlacementGroup; +import com.amazon.ec2.CreatePlacementGroupResponse; +import com.amazon.ec2.CreateReservedInstancesListing; +import com.amazon.ec2.CreateReservedInstancesListingResponse; +import com.amazon.ec2.CreateRoute; +import com.amazon.ec2.CreateRouteResponse; +import com.amazon.ec2.CreateRouteTable; +import com.amazon.ec2.CreateRouteTableResponse; +import com.amazon.ec2.CreateSecurityGroup; +import com.amazon.ec2.CreateSecurityGroupResponse; +import com.amazon.ec2.CreateSecurityGroupResponseType; +import com.amazon.ec2.CreateSecurityGroupType; +import com.amazon.ec2.CreateSnapshot; +import com.amazon.ec2.CreateSnapshotResponse; +import com.amazon.ec2.CreateSnapshotResponseType; +import com.amazon.ec2.CreateSnapshotType; +import com.amazon.ec2.CreateSpotDatafeedSubscription; +import com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.CreateSubnet; +import com.amazon.ec2.CreateSubnetResponse; +import com.amazon.ec2.CreateTags; +import com.amazon.ec2.CreateTagsResponse; +import com.amazon.ec2.CreateTagsResponseType; +import com.amazon.ec2.CreateTagsType; +import com.amazon.ec2.CreateVolume; +import com.amazon.ec2.CreateVolumeResponse; +import com.amazon.ec2.CreateVolumeResponseType; +import com.amazon.ec2.CreateVolumeType; +import com.amazon.ec2.CreateVpc; +import com.amazon.ec2.CreateVpcResponse; +import com.amazon.ec2.CreateVpnConnection; +import com.amazon.ec2.CreateVpnConnectionResponse; +import com.amazon.ec2.CreateVpnConnectionRoute; +import com.amazon.ec2.CreateVpnConnectionRouteResponse; +import com.amazon.ec2.CreateVpnGateway; +import com.amazon.ec2.CreateVpnGatewayResponse; +import com.amazon.ec2.DeactivateLicense; +import com.amazon.ec2.DeactivateLicenseResponse; +import com.amazon.ec2.DeleteCustomerGateway; +import com.amazon.ec2.DeleteCustomerGatewayResponse; +import com.amazon.ec2.DeleteDhcpOptions; +import com.amazon.ec2.DeleteDhcpOptionsResponse; +import com.amazon.ec2.DeleteInternetGateway; +import com.amazon.ec2.DeleteInternetGatewayResponse; +import com.amazon.ec2.DeleteKeyPair; +import com.amazon.ec2.DeleteKeyPairResponse; +import com.amazon.ec2.DeleteKeyPairResponseType; +import com.amazon.ec2.DeleteNetworkAcl; +import com.amazon.ec2.DeleteNetworkAclEntry; +import com.amazon.ec2.DeleteNetworkAclEntryResponse; +import com.amazon.ec2.DeleteNetworkAclResponse; +import com.amazon.ec2.DeleteNetworkInterface; +import com.amazon.ec2.DeleteNetworkInterfaceResponse; +import com.amazon.ec2.DeletePlacementGroup; +import com.amazon.ec2.DeletePlacementGroupResponse; +import com.amazon.ec2.DeleteRoute; +import com.amazon.ec2.DeleteRouteResponse; +import com.amazon.ec2.DeleteRouteTable; +import com.amazon.ec2.DeleteRouteTableResponse; +import com.amazon.ec2.DeleteSecurityGroup; +import com.amazon.ec2.DeleteSecurityGroupResponse; +import com.amazon.ec2.DeleteSecurityGroupResponseType; +import com.amazon.ec2.DeleteSecurityGroupType; +import com.amazon.ec2.DeleteSnapshot; +import com.amazon.ec2.DeleteSnapshotResponse; +import com.amazon.ec2.DeleteSnapshotResponseType; +import com.amazon.ec2.DeleteSnapshotType; +import com.amazon.ec2.DeleteSpotDatafeedSubscription; +import com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.DeleteSubnet; +import com.amazon.ec2.DeleteSubnetResponse; +import com.amazon.ec2.DeleteTags; +import com.amazon.ec2.DeleteTagsResponse; +import com.amazon.ec2.DeleteTagsResponseType; +import com.amazon.ec2.DeleteTagsSetItemType; +import com.amazon.ec2.DeleteTagsSetType; +import com.amazon.ec2.DeleteTagsType; +import com.amazon.ec2.DeleteVolume; +import com.amazon.ec2.DeleteVolumeResponse; +import com.amazon.ec2.DeleteVolumeResponseType; +import com.amazon.ec2.DeleteVolumeType; +import com.amazon.ec2.DeleteVpc; +import com.amazon.ec2.DeleteVpcResponse; +import com.amazon.ec2.DeleteVpnConnection; +import com.amazon.ec2.DeleteVpnConnectionResponse; +import com.amazon.ec2.DeleteVpnConnectionRoute; +import com.amazon.ec2.DeleteVpnConnectionRouteResponse; +import com.amazon.ec2.DeleteVpnGateway; +import com.amazon.ec2.DeleteVpnGatewayResponse; +import com.amazon.ec2.DeregisterImage; +import com.amazon.ec2.DeregisterImageResponse; +import com.amazon.ec2.DeregisterImageResponseType; +import com.amazon.ec2.DeregisterImageType; +import com.amazon.ec2.DescribeAddresses; +import com.amazon.ec2.DescribeAddressesInfoType; +import com.amazon.ec2.DescribeAddressesItemType; +import com.amazon.ec2.DescribeAddressesResponse; +import com.amazon.ec2.DescribeAddressesResponseInfoType; +import com.amazon.ec2.DescribeAddressesResponseItemType; +import com.amazon.ec2.DescribeAddressesResponseType; +import com.amazon.ec2.DescribeAddressesType; +import com.amazon.ec2.DescribeAvailabilityZones; +import com.amazon.ec2.DescribeAvailabilityZonesResponse; +import com.amazon.ec2.DescribeAvailabilityZonesResponseType; +import com.amazon.ec2.DescribeAvailabilityZonesSetItemType; +import com.amazon.ec2.DescribeAvailabilityZonesSetType; +import com.amazon.ec2.DescribeAvailabilityZonesType; +import com.amazon.ec2.DescribeBundleTasks; +import com.amazon.ec2.DescribeBundleTasksResponse; +import com.amazon.ec2.DescribeConversionTasks; +import com.amazon.ec2.DescribeConversionTasksResponse; +import com.amazon.ec2.DescribeCustomerGateways; +import com.amazon.ec2.DescribeCustomerGatewaysResponse; +import com.amazon.ec2.DescribeDhcpOptions; +import com.amazon.ec2.DescribeDhcpOptionsResponse; +import com.amazon.ec2.DescribeExportTasks; +import com.amazon.ec2.DescribeExportTasksResponse; +import com.amazon.ec2.DescribeImageAttribute; +import com.amazon.ec2.DescribeImageAttributeResponse; +import com.amazon.ec2.DescribeImageAttributeResponseType; +import com.amazon.ec2.DescribeImageAttributeResponseTypeChoice_type0; +import com.amazon.ec2.DescribeImageAttributeType; +import com.amazon.ec2.DescribeImageAttributesGroup; +import com.amazon.ec2.DescribeImages; +import com.amazon.ec2.DescribeImagesExecutableBySetType; +import com.amazon.ec2.DescribeImagesExecutableByType; +import com.amazon.ec2.DescribeImagesInfoType; +import com.amazon.ec2.DescribeImagesItemType; +import com.amazon.ec2.DescribeImagesOwnerType; +import com.amazon.ec2.DescribeImagesOwnersType; +import com.amazon.ec2.DescribeImagesResponse; +import com.amazon.ec2.DescribeImagesResponseInfoType; +import com.amazon.ec2.DescribeImagesResponseItemType; +import com.amazon.ec2.DescribeImagesResponseType; +import com.amazon.ec2.DescribeImagesType; +import com.amazon.ec2.DescribeInstanceAttribute; +import com.amazon.ec2.DescribeInstanceAttributeResponse; +import com.amazon.ec2.DescribeInstanceAttributeResponseType; +import com.amazon.ec2.DescribeInstanceAttributeResponseTypeChoice_type0; +import com.amazon.ec2.DescribeInstanceAttributeType; +import com.amazon.ec2.DescribeInstanceAttributesGroup; +import com.amazon.ec2.DescribeInstanceStatus; +import com.amazon.ec2.DescribeInstanceStatusResponse; +import com.amazon.ec2.DescribeInstances; +import com.amazon.ec2.DescribeInstancesInfoType; +import com.amazon.ec2.DescribeInstancesItemType; +import com.amazon.ec2.DescribeInstancesResponse; +import com.amazon.ec2.DescribeInstancesResponseType; +import com.amazon.ec2.DescribeInstancesType; +import com.amazon.ec2.DescribeInternetGateways; +import com.amazon.ec2.DescribeInternetGatewaysResponse; +import com.amazon.ec2.DescribeKeyPairs; +import com.amazon.ec2.DescribeKeyPairsInfoType; +import com.amazon.ec2.DescribeKeyPairsItemType; +import com.amazon.ec2.DescribeKeyPairsResponse; +import com.amazon.ec2.DescribeKeyPairsResponseInfoType; +import com.amazon.ec2.DescribeKeyPairsResponseItemType; +import com.amazon.ec2.DescribeKeyPairsResponseType; +import com.amazon.ec2.DescribeLicenses; +import com.amazon.ec2.DescribeLicensesResponse; +import com.amazon.ec2.DescribeNetworkAcls; +import com.amazon.ec2.DescribeNetworkAclsResponse; +import com.amazon.ec2.DescribeNetworkInterfaceAttribute; +import com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse; +import com.amazon.ec2.DescribeNetworkInterfaces; +import com.amazon.ec2.DescribeNetworkInterfacesResponse; +import com.amazon.ec2.DescribePlacementGroups; +import com.amazon.ec2.DescribePlacementGroupsResponse; +import com.amazon.ec2.DescribeRegions; +import com.amazon.ec2.DescribeRegionsResponse; +import com.amazon.ec2.DescribeReservedInstances; +import com.amazon.ec2.DescribeReservedInstancesListings; +import com.amazon.ec2.DescribeReservedInstancesListingsResponse; +import com.amazon.ec2.DescribeReservedInstancesOfferings; +import com.amazon.ec2.DescribeReservedInstancesOfferingsResponse; +import com.amazon.ec2.DescribeReservedInstancesResponse; +import com.amazon.ec2.DescribeRouteTables; +import com.amazon.ec2.DescribeRouteTablesResponse; +import com.amazon.ec2.DescribeSecurityGroups; +import com.amazon.ec2.DescribeSecurityGroupsResponse; +import com.amazon.ec2.DescribeSecurityGroupsResponseType; +import com.amazon.ec2.DescribeSecurityGroupsSetItemType; +import com.amazon.ec2.DescribeSecurityGroupsSetType; +import com.amazon.ec2.DescribeSecurityGroupsType; +import com.amazon.ec2.DescribeSnapshotAttribute; +import com.amazon.ec2.DescribeSnapshotAttributeResponse; +import com.amazon.ec2.DescribeSnapshots; +import com.amazon.ec2.DescribeSnapshotsResponse; +import com.amazon.ec2.DescribeSnapshotsResponseType; +import com.amazon.ec2.DescribeSnapshotsSetItemResponseType; +import com.amazon.ec2.DescribeSnapshotsSetItemType; +import com.amazon.ec2.DescribeSnapshotsSetResponseType; +import com.amazon.ec2.DescribeSnapshotsSetType; +import com.amazon.ec2.DescribeSnapshotsType; +import com.amazon.ec2.DescribeSpotDatafeedSubscription; +import com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse; +import com.amazon.ec2.DescribeSpotInstanceRequests; +import com.amazon.ec2.DescribeSpotInstanceRequestsResponse; +import com.amazon.ec2.DescribeSpotPriceHistory; +import com.amazon.ec2.DescribeSpotPriceHistoryResponse; +import com.amazon.ec2.DescribeSubnets; +import com.amazon.ec2.DescribeSubnetsResponse; +import com.amazon.ec2.DescribeTags; +import com.amazon.ec2.DescribeTagsResponse; +import com.amazon.ec2.DescribeTagsResponseType; +import com.amazon.ec2.DescribeTagsType; +import com.amazon.ec2.DescribeVolumeAttribute; +import com.amazon.ec2.DescribeVolumeAttributeResponse; +import com.amazon.ec2.DescribeVolumeStatus; +import com.amazon.ec2.DescribeVolumeStatusResponse; +import com.amazon.ec2.DescribeVolumes; +import com.amazon.ec2.DescribeVolumesResponse; +import com.amazon.ec2.DescribeVolumesResponseType; +import com.amazon.ec2.DescribeVolumesSetItemResponseType; +import com.amazon.ec2.DescribeVolumesSetItemType; +import com.amazon.ec2.DescribeVolumesSetResponseType; +import com.amazon.ec2.DescribeVolumesSetType; +import com.amazon.ec2.DescribeVolumesType; +import com.amazon.ec2.DescribeVpcs; +import com.amazon.ec2.DescribeVpcsResponse; +import com.amazon.ec2.DescribeVpnConnections; +import com.amazon.ec2.DescribeVpnConnectionsResponse; +import com.amazon.ec2.DescribeVpnGateways; +import com.amazon.ec2.DescribeVpnGatewaysResponse; +import com.amazon.ec2.DetachInternetGateway; +import com.amazon.ec2.DetachInternetGatewayResponse; +import com.amazon.ec2.DetachNetworkInterface; +import com.amazon.ec2.DetachNetworkInterfaceResponse; +import com.amazon.ec2.DetachVolume; +import com.amazon.ec2.DetachVolumeResponse; +import com.amazon.ec2.DetachVolumeResponseType; +import com.amazon.ec2.DetachVolumeType; +import com.amazon.ec2.DetachVpnGateway; +import com.amazon.ec2.DetachVpnGatewayResponse; +import com.amazon.ec2.DisableVgwRoutePropagation; +import com.amazon.ec2.DisableVgwRoutePropagationResponse; +import com.amazon.ec2.DisassociateAddress; +import com.amazon.ec2.DisassociateAddressResponse; +import com.amazon.ec2.DisassociateAddressResponseType; +import com.amazon.ec2.DisassociateRouteTable; +import com.amazon.ec2.DisassociateRouteTableResponse; +import com.amazon.ec2.EbsBlockDeviceType; +import com.amazon.ec2.EmptyElementType; +import com.amazon.ec2.EnableVgwRoutePropagation; +import com.amazon.ec2.EnableVgwRoutePropagationResponse; +import com.amazon.ec2.EnableVolumeIO; +import com.amazon.ec2.EnableVolumeIOResponse; +import com.amazon.ec2.FilterSetType; +import com.amazon.ec2.FilterType; +import com.amazon.ec2.GetConsoleOutput; +import com.amazon.ec2.GetConsoleOutputResponse; +import com.amazon.ec2.GetPasswordData; +import com.amazon.ec2.GetPasswordDataResponse; +import com.amazon.ec2.GetPasswordDataResponseType; +import com.amazon.ec2.GroupItemType; +import com.amazon.ec2.GroupSetType; +import com.amazon.ec2.ImportInstance; +import com.amazon.ec2.ImportInstanceResponse; +import com.amazon.ec2.ImportKeyPair; +import com.amazon.ec2.ImportKeyPairResponse; +import com.amazon.ec2.ImportKeyPairResponseType; +import com.amazon.ec2.ImportVolume; +import com.amazon.ec2.ImportVolumeResponse; +import com.amazon.ec2.InstanceIdSetType; +import com.amazon.ec2.InstanceIdType; +import com.amazon.ec2.InstanceMonitoringStateType; +import com.amazon.ec2.InstanceStateChangeSetType; +import com.amazon.ec2.InstanceStateChangeType; +import com.amazon.ec2.InstanceStateType; +import com.amazon.ec2.IpPermissionSetType; +import com.amazon.ec2.IpPermissionType; +import com.amazon.ec2.IpRangeItemType; +import com.amazon.ec2.IpRangeSetType; +import com.amazon.ec2.LaunchPermissionItemType; +import com.amazon.ec2.LaunchPermissionListType; +import com.amazon.ec2.LaunchPermissionOperationType; +import com.amazon.ec2.ModifyImageAttribute; +import com.amazon.ec2.ModifyImageAttributeResponse; +import com.amazon.ec2.ModifyImageAttributeResponseType; +import com.amazon.ec2.ModifyImageAttributeType; +import com.amazon.ec2.ModifyImageAttributeTypeChoice_type0; +import com.amazon.ec2.ModifyInstanceAttribute; +import com.amazon.ec2.ModifyInstanceAttributeResponse; +import com.amazon.ec2.ModifyInstanceAttributeResponseType; +import com.amazon.ec2.ModifyInstanceAttributeType; +import com.amazon.ec2.ModifyInstanceAttributeTypeChoice_type0; +import com.amazon.ec2.ModifyNetworkInterfaceAttribute; +import com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse; +import com.amazon.ec2.ModifySnapshotAttribute; +import com.amazon.ec2.ModifySnapshotAttributeResponse; +import com.amazon.ec2.ModifyVolumeAttribute; +import com.amazon.ec2.ModifyVolumeAttributeResponse; +import com.amazon.ec2.MonitorInstances; +import com.amazon.ec2.MonitorInstancesResponse; +import com.amazon.ec2.MonitorInstancesResponseSetItemType; +import com.amazon.ec2.MonitorInstancesResponseSetType; +import com.amazon.ec2.MonitorInstancesResponseType; +import com.amazon.ec2.MonitorInstancesSetItemType; +import com.amazon.ec2.MonitorInstancesSetType; +import com.amazon.ec2.MonitorInstancesType; +import com.amazon.ec2.NullableAttributeValueType; +import com.amazon.ec2.PlacementRequestType; +import com.amazon.ec2.PlacementResponseType; +import com.amazon.ec2.ProductCodesSetItemType; +import com.amazon.ec2.ProductCodesSetType; +import com.amazon.ec2.PurchaseReservedInstancesOffering; +import com.amazon.ec2.PurchaseReservedInstancesOfferingResponse; +import com.amazon.ec2.RebootInstances; +import com.amazon.ec2.RebootInstancesInfoType; +import com.amazon.ec2.RebootInstancesItemType; +import com.amazon.ec2.RebootInstancesResponse; +import com.amazon.ec2.RebootInstancesResponseType; +import com.amazon.ec2.RebootInstancesType; +import com.amazon.ec2.RegisterImage; +import com.amazon.ec2.RegisterImageResponse; +import com.amazon.ec2.RegisterImageResponseType; +import com.amazon.ec2.RegisterImageType; +import com.amazon.ec2.ReleaseAddress; +import com.amazon.ec2.ReleaseAddressResponse; +import com.amazon.ec2.ReleaseAddressResponseType; +import com.amazon.ec2.ReplaceNetworkAclAssociation; +import com.amazon.ec2.ReplaceNetworkAclAssociationResponse; +import com.amazon.ec2.ReplaceNetworkAclEntry; +import com.amazon.ec2.ReplaceNetworkAclEntryResponse; +import com.amazon.ec2.ReplaceRoute; +import com.amazon.ec2.ReplaceRouteResponse; +import com.amazon.ec2.ReplaceRouteTableAssociation; +import com.amazon.ec2.ReplaceRouteTableAssociationResponse; +import com.amazon.ec2.ReportInstanceStatus; +import com.amazon.ec2.ReportInstanceStatusResponse; +import com.amazon.ec2.RequestSpotInstances; +import com.amazon.ec2.RequestSpotInstancesResponse; +import com.amazon.ec2.ReservationInfoType; +import com.amazon.ec2.ReservationSetType; +import com.amazon.ec2.ResetImageAttribute; +import com.amazon.ec2.ResetImageAttributeResponse; +import com.amazon.ec2.ResetImageAttributeResponseType; +import com.amazon.ec2.ResetImageAttributeType; +import com.amazon.ec2.ResetInstanceAttribute; +import com.amazon.ec2.ResetInstanceAttributeResponse; +import com.amazon.ec2.ResetNetworkInterfaceAttribute; +import com.amazon.ec2.ResetNetworkInterfaceAttributeResponse; +import com.amazon.ec2.ResetSnapshotAttribute; +import com.amazon.ec2.ResetSnapshotAttributeResponse; +import com.amazon.ec2.ResourceIdSetItemType; +import com.amazon.ec2.ResourceIdSetType; +import com.amazon.ec2.ResourceTagSetItemType; +import com.amazon.ec2.ResourceTagSetType; +import com.amazon.ec2.RevokeSecurityGroupEgress; +import com.amazon.ec2.RevokeSecurityGroupEgressResponse; +import com.amazon.ec2.RevokeSecurityGroupIngress; +import com.amazon.ec2.RevokeSecurityGroupIngressResponse; +import com.amazon.ec2.RevokeSecurityGroupIngressResponseType; +import com.amazon.ec2.RevokeSecurityGroupIngressType; +import com.amazon.ec2.RunInstances; +import com.amazon.ec2.RunInstancesResponse; +import com.amazon.ec2.RunInstancesResponseType; +import com.amazon.ec2.RunInstancesType; +import com.amazon.ec2.RunningInstancesItemType; +import com.amazon.ec2.RunningInstancesSetType; +import com.amazon.ec2.SecurityGroupItemType; +import com.amazon.ec2.SecurityGroupSetType; +import com.amazon.ec2.StartInstances; +import com.amazon.ec2.StartInstancesResponse; +import com.amazon.ec2.StartInstancesResponseType; +import com.amazon.ec2.StartInstancesType; +import com.amazon.ec2.StateReasonType; +import com.amazon.ec2.StopInstances; +import com.amazon.ec2.StopInstancesResponse; +import com.amazon.ec2.StopInstancesResponseType; +import com.amazon.ec2.StopInstancesType; +import com.amazon.ec2.TagSetItemType; +import com.amazon.ec2.TagSetType; +import com.amazon.ec2.TerminateInstances; +import com.amazon.ec2.TerminateInstancesResponse; +import com.amazon.ec2.TerminateInstancesResponseType; +import com.amazon.ec2.TerminateInstancesType; +import com.amazon.ec2.UnassignPrivateIpAddresses; +import com.amazon.ec2.UnassignPrivateIpAddressesResponse; +import com.amazon.ec2.UnmonitorInstances; +import com.amazon.ec2.UnmonitorInstancesResponse; +import com.amazon.ec2.UserDataType; +import com.amazon.ec2.UserIdGroupPairSetType; +import com.amazon.ec2.UserIdGroupPairType; +import com.amazon.ec2.ValueSetType; +import com.amazon.ec2.ValueType; + import com.cloud.bridge.service.core.ec2.EC2Address; import com.cloud.bridge.service.core.ec2.EC2AddressFilterSet; import com.cloud.bridge.service.core.ec2.EC2AssociateAddress; import com.cloud.bridge.service.core.ec2.EC2AuthorizeRevokeSecurityGroup; +import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone; import com.cloud.bridge.service.core.ec2.EC2AvailabilityZonesFilterSet; import com.cloud.bridge.service.core.ec2.EC2CreateImage; import com.cloud.bridge.service.core.ec2.EC2CreateImageResponse; import com.cloud.bridge.service.core.ec2.EC2CreateKeyPair; import com.cloud.bridge.service.core.ec2.EC2CreateVolume; -import com.cloud.bridge.service.core.ec2.EC2Tags; import com.cloud.bridge.service.core.ec2.EC2DeleteKeyPair; import com.cloud.bridge.service.core.ec2.EC2DescribeAddresses; import com.cloud.bridge.service.core.ec2.EC2DescribeAddressesResponse; import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZones; import com.cloud.bridge.service.core.ec2.EC2DescribeAvailabilityZonesResponse; import com.cloud.bridge.service.core.ec2.EC2DescribeImageAttribute; - -import com.cloud.bridge.service.core.ec2.EC2AvailabilityZone; import com.cloud.bridge.service.core.ec2.EC2DescribeImages; import com.cloud.bridge.service.core.ec2.EC2DescribeImagesResponse; import com.cloud.bridge.service.core.ec2.EC2DescribeInstances; import com.cloud.bridge.service.core.ec2.EC2DescribeInstancesResponse; import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairs; import com.cloud.bridge.service.core.ec2.EC2DescribeKeyPairsResponse; -import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet; -import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission; -import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute; -import com.cloud.bridge.service.core.ec2.EC2ResourceTag; import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroups; import com.cloud.bridge.service.core.ec2.EC2DescribeSecurityGroupsResponse; import com.cloud.bridge.service.core.ec2.EC2DescribeSnapshots; @@ -70,18 +526,20 @@ import com.cloud.bridge.service.core.ec2.EC2GroupFilterSet; import com.cloud.bridge.service.core.ec2.EC2Image; import com.cloud.bridge.service.core.ec2.EC2ImageAttributes; import com.cloud.bridge.service.core.ec2.EC2ImageAttributes.ImageAttribute; +import com.cloud.bridge.service.core.ec2.EC2ImageFilterSet; +import com.cloud.bridge.service.core.ec2.EC2ImageLaunchPermission; import com.cloud.bridge.service.core.ec2.EC2ImportKeyPair; import com.cloud.bridge.service.core.ec2.EC2Instance; import com.cloud.bridge.service.core.ec2.EC2InstanceFilterSet; import com.cloud.bridge.service.core.ec2.EC2IpPermission; import com.cloud.bridge.service.core.ec2.EC2KeyPairFilterSet; import com.cloud.bridge.service.core.ec2.EC2ModifyImageAttribute; +import com.cloud.bridge.service.core.ec2.EC2ModifyInstanceAttribute; import com.cloud.bridge.service.core.ec2.EC2PasswordData; import com.cloud.bridge.service.core.ec2.EC2RebootInstances; import com.cloud.bridge.service.core.ec2.EC2RegisterImage; import com.cloud.bridge.service.core.ec2.EC2ReleaseAddress; -import com.cloud.bridge.service.core.ec2.EC2TagKeyValue; -import com.cloud.bridge.service.core.ec2.EC2TagTypeId; +import com.cloud.bridge.service.core.ec2.EC2ResourceTag; import com.cloud.bridge.service.core.ec2.EC2RunInstances; import com.cloud.bridge.service.core.ec2.EC2RunInstancesResponse; import com.cloud.bridge.service.core.ec2.EC2SSHKeyPair; @@ -92,6 +550,9 @@ import com.cloud.bridge.service.core.ec2.EC2StartInstances; import com.cloud.bridge.service.core.ec2.EC2StartInstancesResponse; import com.cloud.bridge.service.core.ec2.EC2StopInstances; import com.cloud.bridge.service.core.ec2.EC2StopInstancesResponse; +import com.cloud.bridge.service.core.ec2.EC2TagKeyValue; +import com.cloud.bridge.service.core.ec2.EC2TagTypeId; +import com.cloud.bridge.service.core.ec2.EC2Tags; import com.cloud.bridge.service.core.ec2.EC2TagsFilterSet; import com.cloud.bridge.service.core.ec2.EC2Volume; import com.cloud.bridge.service.core.ec2.EC2VolumeFilterSet; diff --git a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java index e001b255265..70d6d0be211 100644 --- a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java @@ -66,7 +66,6 @@ import com.cloud.bridge.util.HeaderParam; import com.cloud.bridge.util.RestAuth; import com.cloud.bridge.util.S3SoapAuth; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class S3RestServlet extends HttpServlet { @@ -306,8 +305,8 @@ public class S3RestServlet extends HttpServlet { return params; } - public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException, ClassNotFoundException, - SQLException { + public static void authenticateRequest(HttpServletRequest request, S3AuthParams params) throws InstantiationException, IllegalAccessException, + ClassNotFoundException, SQLException { RestAuth auth = new RestAuth(ServiceProvider.getInstance().getUseSubDomain()); String AWSAccessKey = null; String signature = null; diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java index 16c99bbfde8..788f35ae456 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java @@ -45,6 +45,7 @@ import org.w3c.dom.NodeList; import com.amazon.s3.GetBucketAccessControlPolicyResponse; import com.amazon.s3.ListAllMyBucketsResponse; import com.amazon.s3.ListBucketResponse; + import com.cloud.bridge.io.MTOMAwareResultStreamWriter; import com.cloud.bridge.model.BucketPolicyVO; import com.cloud.bridge.model.SAcl; @@ -93,7 +94,6 @@ import com.cloud.bridge.util.StringHelper; import com.cloud.bridge.util.XSerializer; import com.cloud.bridge.util.XSerializerXmlAdapter; import com.cloud.bridge.util.XmlHelper; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class S3BucketAction implements ServletAction { @@ -772,7 +772,8 @@ public class S3BucketAction implements ServletAction { response.flushBuffer(); } catch (ObjectAlreadyExistsException oaee) { response.setStatus(409); - String xml = " OperationAbortedA conflicting conditional operation is currently in progress against this resource. Please try again.."; + String xml = + " OperationAbortedA conflicting conditional operation is currently in progress against this resource. Please try again.."; response.setContentType("text/xml; charset=UTF-8"); S3RestServlet.endResponse(response, xml.toString()); } diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java index 22310a58196..c854323e52f 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java @@ -44,6 +44,7 @@ import org.w3c.dom.NodeList; import com.amazon.s3.CopyObjectResponse; import com.amazon.s3.GetObjectAccessControlPolicyResponse; + import com.cloud.bridge.io.MTOMAwareResultStreamWriter; import com.cloud.bridge.model.SAcl; import com.cloud.bridge.model.SAclVO; @@ -342,7 +343,8 @@ public class S3ObjectAction implements ServletAction { DataHandler dataHandler = engineResponse.getData(); if (dataHandler != null) { response.addHeader("ETag", "\"" + engineResponse.getETag() + "\""); - response.addHeader("Last-Modified", DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z")); + response.addHeader("Last-Modified", + DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z")); response.setContentLength((int)engineResponse.getContentLength()); S3RestServlet.writeResponse(response, dataHandler.getInputStream()); @@ -493,7 +495,8 @@ public class S3ObjectAction implements ServletAction { DataHandler dataHandler = engineResponse.getData(); if (dataHandler != null) { response.addHeader("ETag", "\"" + engineResponse.getETag() + "\""); - response.addHeader("Last-Modified", DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z")); + response.addHeader("Last-Modified", + DateHelper.getDateDisplayString(DateHelper.GMT_TIMEZONE, engineResponse.getLastModified().getTime(), "E, d MMM yyyy HH:mm:ss z")); response.setContentLength((int)engineResponse.getContentLength()); } @@ -1035,10 +1038,10 @@ public class S3ObjectAction implements ServletAction { } // -> cannot have HTTP separators in an HTTP header - if (-1 != name.indexOf('(') || -1 != name.indexOf(')') || -1 != name.indexOf('@') || -1 != name.indexOf('<') || -1 != name.indexOf('>') || -1 != name.indexOf('\"') || - -1 != name.indexOf('[') || -1 != name.indexOf(']') || -1 != name.indexOf('=') || -1 != name.indexOf(',') || -1 != name.indexOf(';') || -1 != name.indexOf(':') || - -1 != name.indexOf('\\') || -1 != name.indexOf('/') || -1 != name.indexOf(' ') || -1 != name.indexOf('{') || -1 != name.indexOf('}') || -1 != name.indexOf('?') || - -1 != name.indexOf('\t')) + if (-1 != name.indexOf('(') || -1 != name.indexOf(')') || -1 != name.indexOf('@') || -1 != name.indexOf('<') || -1 != name.indexOf('>') || + -1 != name.indexOf('\"') || -1 != name.indexOf('[') || -1 != name.indexOf(']') || -1 != name.indexOf('=') || -1 != name.indexOf(',') || + -1 != name.indexOf(';') || -1 != name.indexOf(':') || -1 != name.indexOf('\\') || -1 != name.indexOf('/') || -1 != name.indexOf(' ') || + -1 != name.indexOf('{') || -1 != name.indexOf('}') || -1 != name.indexOf('?') || -1 != name.indexOf('\t')) ignoreMeta = true; if (ignoreMeta) diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java index 66f6c6d160d..842ca4a85ef 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java @@ -26,9 +26,8 @@ import com.amazon.s3.AccessControlPolicy; import com.amazon.s3.AmazonS3SkeletonInterface; import com.amazon.s3.CanonicalUser; import com.amazon.s3.CopyObject; -import com.amazon.s3.CopyObjectResult; -import com.amazon.s3.Group; import com.amazon.s3.CopyObjectResponse; +import com.amazon.s3.CopyObjectResult; import com.amazon.s3.CreateBucket; import com.amazon.s3.CreateBucketResponse; import com.amazon.s3.CreateBucketResult; @@ -49,6 +48,7 @@ import com.amazon.s3.GetObjectResponse; import com.amazon.s3.GetObjectResult; import com.amazon.s3.Grant; import com.amazon.s3.Grantee; +import com.amazon.s3.Group; import com.amazon.s3.ListAllMyBuckets; import com.amazon.s3.ListAllMyBucketsEntry; import com.amazon.s3.ListAllMyBucketsList; @@ -75,6 +75,7 @@ import com.amazon.s3.SetObjectAccessControlPolicy; import com.amazon.s3.SetObjectAccessControlPolicyResponse; import com.amazon.s3.Status; import com.amazon.s3.StorageClass; + import com.cloud.bridge.model.SAcl; import com.cloud.bridge.service.core.s3.S3AccessControlList; import com.cloud.bridge.service.core.s3.S3AccessControlPolicy; 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 c315db06c57..deb886f411f 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java @@ -34,13 +34,15 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; import org.apache.axis2.AxisFault; -import org.apache.cloudstack.managed.context.ManagedContextTimerTask; import org.apache.log4j.Logger; import org.apache.log4j.xml.DOMConfigurator; import org.springframework.stereotype.Component; import com.amazon.ec2.AmazonEC2SkeletonInterface; import com.amazon.s3.AmazonS3SkeletonInterface; + +import org.apache.cloudstack.managed.context.ManagedContextTimerTask; + import com.cloud.bridge.model.MHostVO; import com.cloud.bridge.model.SHost; import com.cloud.bridge.model.SHostVO; @@ -60,7 +62,6 @@ import com.cloud.bridge.util.NetHelper; import com.cloud.bridge.util.OrderedPair; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component 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 cb3beec559a..59abca0e2aa 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java @@ -363,11 +363,13 @@ public class EC2Engine extends ManagerBase { } CloudStackSecurityGroup resp = null; if (ipPerm.getProtocol().equalsIgnoreCase("icmp")) { - resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(), - ipPerm.getProtocol(), null, request.getName(), null, secGroupList); + resp = + getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, null, ipPerm.getIcmpCode(), ipPerm.getIcmpType(), + ipPerm.getProtocol(), null, request.getName(), null, secGroupList); } else { - resp = getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null, - ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList); + resp = + getApi().authorizeSecurityGroupIngress(null, constructList(ipPerm.getIpRangeSet()), null, ipPerm.getToPort().longValue(), null, null, + ipPerm.getProtocol(), null, request.getName(), ipPerm.getFromPort().longValue(), secGroupList); } if (resp != null) { List ingressRules = resp.getIngressRules(); @@ -805,8 +807,8 @@ public class EC2Engine extends ManagerBase { throw new Exception("Specified ipAddress doesn't exist"); CloudStackIpAddress cloudIp = cloudIps.get(0); - List vmList = getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null, - null, null, null); + List vmList = + getApi().listVirtualMachines(null, null, true, null, null, null, null, request.getInstanceId(), null, null, null, null, null, null, null, null, null); if (vmList == null || vmList.size() == 0) { throw new Exception("Instance not found"); } @@ -962,8 +964,9 @@ public class EC2Engine extends ManagerBase { EC2Image[] imageSet = images.getImageSet(); String osTypeId = imageSet[0].getOsTypeId(); - CloudStackTemplate resp = getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null, - null, null, null, volumeId); + CloudStackTemplate resp = + getApi().createTemplate((request.getDescription() == null ? "" : request.getDescription()), request.getName(), osTypeId, null, null, null, null, null, + null, volumeId); if (resp == null || resp.getId() == null) { throw new Exception("Image couldn't be created"); } @@ -992,9 +995,10 @@ public class EC2Engine extends ManagerBase { public EC2CreateImageResponse registerImage(EC2RegisterImage request) { EC2CreateImageResponse image = new EC2CreateImageResponse(); try { - List templates = getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(), - request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null, null, null, - null, null, null, null, null, null); + List templates = + getApi().registerTemplate((request.getDescription() == null ? request.getName() : request.getDescription()), request.getFormat(), + request.getHypervisor(), request.getName(), toOSTypeId(request.getOsTypeName()), request.getLocation(), toZoneId(request.getZoneName(), null), null, + null, null, null, null, null, null, null, null); if (templates != null) { // technically we will only ever register a single template... for (CloudStackTemplate template : templates) { @@ -1214,7 +1218,8 @@ public class EC2Engine extends ManagerBase { } // // -> no volume name is given in the Amazon request but is required in the cloud API - CloudStackVolume vol = getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null)); + CloudStackVolume vol = + getApi().createVolume(UUID.randomUUID().toString(), null, diskOfferingId, null, size, snapshotId, toZoneId(request.getZoneName(), null)); if (vol != null) { resp.setAttached(vol.getAttached()); resp.setCreated(vol.getCreated()); @@ -1436,8 +1441,9 @@ public class EC2Engine extends ManagerBase { // now actually deploy the vms for (int i = 0; i < createInstances; i++) { try { - CloudStackUserVm resp = getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null, - request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData()); + CloudStackUserVm resp = + getApi().deployVirtualMachine(svcOffering.getId(), request.getTemplateId(), zoneId, null, null, null, null, null, null, null, + request.getKeyName(), null, null, groupIds, groupNames, request.getSize().longValue(), request.getUserData()); EC2Instance vm = new EC2Instance(); vm.setId(resp.getId().toString()); vm.setName(resp.getName()); @@ -1659,7 +1665,8 @@ public class EC2Engine extends ManagerBase { * @param virtualMachineIds - an array of instances we are interested in getting information on * @param ifs - filter out unwanted instances */ - private EC2DescribeInstancesResponse listVirtualMachines(String[] virtualMachineIds, EC2InstanceFilterSet ifs, List resourceTags) throws Exception { + private EC2DescribeInstancesResponse listVirtualMachines(String[] virtualMachineIds, EC2InstanceFilterSet ifs, List resourceTags) + throws Exception { EC2DescribeInstancesResponse instances = new EC2DescribeInstancesResponse(); if (null == virtualMachineIds || 0 == virtualMachineIds.length) { @@ -1873,10 +1880,12 @@ public class EC2Engine extends ManagerBase { * @return the same object passed in as the "instances" parameter modified with one or more * EC2Instance objects loaded. */ - private EC2DescribeInstancesResponse lookupInstances(String instanceId, EC2DescribeInstancesResponse instances, List resourceTagSet) throws Exception { + private EC2DescribeInstancesResponse lookupInstances(String instanceId, EC2DescribeInstancesResponse instances, List resourceTagSet) + 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); + List vms = + getApi().listVirtualMachines(null, null, true, null, null, null, null, instId, null, null, null, null, null, null, null, null, resourceTagSet); if (vms != null && vms.size() > 0) { for (CloudStackUserVm cloudVm : vms) { @@ -2291,8 +2300,8 @@ public class EC2Engine extends ManagerBase { * @throws Exception */ private CloudStackNetwork createDefaultGuestNetwork(String zoneId, CloudStackNetworkOffering offering, CloudStackAccount owner) throws Exception { - return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network", offering.getId(), zoneId, owner.getName(), owner.getDomainId(), true, null, null, - null, null, null, null, null, null); + return getApi().createNetwork(owner.getName() + "-network", owner.getName() + "-network", offering.getId(), zoneId, owner.getName(), owner.getDomainId(), true, + null, null, null, null, null, null, null, null); } /** @@ -2679,8 +2688,8 @@ public class EC2Engine extends ManagerBase { if (errorMessage.contains("Object vm_instance(uuid:") && errorMessage.contains(") does not exist")) { throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "Specified Instance ID does not exist"); } else if (errorMessage.contains("Unable to find security group by name") || errorMessage.contains("Unable to find security group") || - (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) || - errorMessage.contains("Unable to find group by name ")) { + (errorMessage.contains("Object security_group(uuid:") && errorMessage.contains(") does not exist")) || + errorMessage.contains("Unable to find group by name ")) { throw new EC2ServiceException(ClientError.InvalidGroup_NotFound, "Specified Security Group does not exist"); } else if (errorMessage.contains("Invalid port numbers")) { throw new EC2ServiceException(ClientError.InvalidPermission_Malformed, "Specified Port value is invalid"); @@ -2699,7 +2708,7 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Object snapshots(uuid:") && errorMessage.contains(") does not exist")) { throw new EC2ServiceException(ClientError.InvalidSnapshot_NotFound, "Specified Snapshot ID doesn't exist"); } else if ((errorMessage.contains("A key pair with name '") && errorMessage.contains("' does not exist")) || - (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) { + (errorMessage.contains("A key pair with name '") && errorMessage.contains("' was not found"))) { throw new EC2ServiceException(ClientError.InvalidKeyPair_NotFound, "Specified Key pair name is invalid"); } else if (errorMessage.contains("A key pair with name '") && errorMessage.contains("' already exists")) { throw new EC2ServiceException(ClientError.InvalidKeyPair_Duplicate, "Specified Key pair already exists"); @@ -2726,7 +2735,7 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Unable to find tags by parameters specified")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified resourceTag for the specified resourceId doesn't exist"); } else if (errorMessage.contains("Failed to enable static nat for the ip address with specified ipId " - + "as vm with specified vmId is already associated with specified currentIp")) { + + "as vm with specified vmId is already associated with specified currentIp")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is already associated to the specified VM"); } else if (errorMessage.contains("Specified IP address id is not associated with any vm Id")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp is not associated to any VM"); @@ -2773,7 +2782,8 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Template") && errorMessage.contains("has not been completely downloaded")) { throw new EC2ServiceException(ClientError.InvalidAMIID_NotFound, "Specified ImageId is unavailable"); } else if (errorMessage.contains("cannot stop VM") && errorMessage.contains("when it is in state Starting")) { - throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'"); + throw new EC2ServiceException(ClientError.IncorrectInstanceState, + "Unable to stop. One or more of the specified instances is in an incorrect state 'pending'"); } else if (errorMessage.contains("Failed to authorize security group ingress rule(s)")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified Ip-permission is invalid" + " or the Ip-permission already exists"); } else if (errorMessage.contains("Failed to reboot vm instance")) { @@ -2787,7 +2797,8 @@ public class EC2Engine extends ManagerBase { if (errorMessage.contains("Maximum number of resources of type 'volume' for account") && errorMessage.contains("has been exceeded")) { throw new EC2ServiceException(ClientError.VolumeLimitExceeded, "You have reached the limit on the number of volumes that can be created"); } else if (errorMessage.contains("Maximum number of resources of type 'public_ip' for account") && errorMessage.contains("has been exceeded")) { - throw new EC2ServiceException(ClientError.AddressLimitExceeded, "You have reached the limit on the number of elastic ip addresses your account can have"); + throw new EC2ServiceException(ClientError.AddressLimitExceeded, + "You have reached the limit on the number of elastic ip addresses your account can have"); } else if (errorMessage.contains("Unable to apply save userdata entry on router")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "The value supplied for parameter UserData is invalid"); } else { @@ -2834,7 +2845,8 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Failed to start the stopped instance")) { throw new EC2ServiceException(ServerError.InternalError, "Unable to start the instance that was stopped during image creation"); } else if (errorMessage.contains("One or more of instanceIds specified is in stopped state")) { - throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'"); + throw new EC2ServiceException(ClientError.IncorrectInstanceState, + "Unable to reboot. One or more of the specified instances is in an incorrect state 'stopped'"); } else if (errorMessage.contains("Specified ipAddress doesn't exist")) { throw new EC2ServiceException(ClientError.InvalidParameterValue, "Specified publicIp doesn't exist"); } else if (errorMessage.contains("Min Count is greater than the number of instances left to allocate")) { @@ -2852,7 +2864,8 @@ public class EC2Engine extends ManagerBase { } else if (errorMessage.contains("Instance not found")) { throw new EC2ServiceException(ClientError.InvalidInstanceID_NotFound, "One or more of the specified instanceId not found"); } else if (errorMessage.contains("Cannot modify, instance should be in stopped state")) { - throw new EC2ServiceException(ClientError.IncorrectInstanceState, "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'"); + throw new EC2ServiceException(ClientError.IncorrectInstanceState, + "Unable to modify instance attribute. Specified instance is not in the correct state 'stopped'"); } else { throw new EC2ServiceException(ServerError.InternalError, "An unexpected error occured"); } diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java index 74154eaa624..3c35da6eba9 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java @@ -71,7 +71,8 @@ public class EC2RegisterImage { public void setArchitecture(String param) { if (null != param) { if (!param.contains(":") || param.split(":").length < 4) { - throw new EC2ServiceException(ClientError.InvalidParameterValue, "Supported format for " + "parameter 'architecture' is format:zonename:ostypename:hypervisor"); + throw new EC2ServiceException(ClientError.InvalidParameterValue, "Supported format for " + + "parameter 'architecture' is format:zonename:ostypename:hypervisor"); } String parts[] = param.split(":"); format = parts[0]; diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java index e3e767a85b0..3f65af4f342 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RunInstancesResponse.java @@ -19,8 +19,6 @@ package com.cloud.bridge.service.core.ec2; import java.util.ArrayList; import java.util.List; -import com.cloud.bridge.service.core.ec2.EC2Instance; - public class EC2RunInstancesResponse { private List instanceSet = new ArrayList(); diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java index 03383f166ff..d44eea72855 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java @@ -28,7 +28,6 @@ import java.util.TimeZone; import com.cloud.bridge.service.UserContext; import com.cloud.bridge.service.exception.EC2ServiceException; import com.cloud.bridge.service.exception.EC2ServiceException.ClientError; -import com.cloud.bridge.util.DateHelper; import com.cloud.bridge.util.EC2RestAuth; public class EC2SnapshotFilterSet { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java index 91aff0ad020..40f8e111551 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java @@ -19,11 +19,11 @@ package com.cloud.bridge.service.core.ec2; import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TimeZone; -import java.util.Date; import com.cloud.bridge.service.exception.EC2ServiceException; import com.cloud.bridge.service.exception.EC2ServiceException.ClientError; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java index 1af86ae9805..2dc7eaaa581 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java @@ -85,7 +85,6 @@ import com.cloud.bridge.util.PolicyParser; import com.cloud.bridge.util.StringHelper; import com.cloud.bridge.util.Triple; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; /** @@ -222,8 +221,8 @@ public class S3Engine { throw new ObjectAlreadyExistsException("Bucket already exists"); shost_storagelocation_pair = allocBucketStorageHost(request.getBucketName(), null); - SBucketVO sbucket = new SBucketVO(request.getBucketName(), DateHelper.currentGMTTime(), UserContext.current().getCanonicalUserId(), - shost_storagelocation_pair.getFirst()); + SBucketVO sbucket = + new SBucketVO(request.getBucketName(), DateHelper.currentGMTTime(), UserContext.current().getCanonicalUserId(), shost_storagelocation_pair.getFirst()); shost_storagelocation_pair.getFirst().getBuckets().add(sbucket); // bucketDao.save(sbucket); @@ -642,8 +641,8 @@ public class S3Engine { * We are required to keep the connection alive by returning whitespace characters back periodically. */ - public S3PutObjectInlineResponse - concatentateMultipartUploads(HttpServletResponse httpResp, S3PutObjectInlineRequest request, S3MultipartPart[] parts, OutputStream outputStream) throws IOException { + public S3PutObjectInlineResponse concatentateMultipartUploads(HttpServletResponse httpResp, S3PutObjectInlineRequest request, S3MultipartPart[] parts, + OutputStream outputStream) throws IOException { // [A] Set up and initial error checking S3PutObjectInlineResponse response = new S3PutObjectInlineResponse(); String bucketName = request.getBucketName(); @@ -680,8 +679,9 @@ public class S3Engine { // explicit transaction control to avoid holding transaction during // long file concatenation process txn.start(); - OrderedPair result = bucketAdapter.concatentateObjects(host_storagelocation_pair.getSecond(), bucket.getName(), itemFileName, - ServiceProvider.getInstance().getMultipartDir(), parts, outputStream); + OrderedPair result = + bucketAdapter.concatentateObjects(host_storagelocation_pair.getSecond(), bucket.getName(), itemFileName, ServiceProvider.getInstance().getMultipartDir(), + parts, outputStream); response.setETag(result.getFirst()); response.setLastModified(DateHelper.toCalendar(object_objectitem_pair.getSecond().getLastModifiedTime())); @@ -1237,8 +1237,8 @@ public class S3Engine { * * TODO - how does the versionIdMarker work when there is a deletion marker in the object? */ - private S3ListBucketObjectEntry[] - composeListBucketContentEntries(List l, String prefix, String delimiter, int maxKeys, boolean enableVersion, String versionIdMarker) { + private S3ListBucketObjectEntry[] composeListBucketContentEntries(List l, String prefix, String delimiter, int maxKeys, boolean enableVersion, + String versionIdMarker) { List entries = new ArrayList(); SObjectItemVO latest = null; boolean hitIdMarker = false; @@ -1425,7 +1425,8 @@ public class S3Engine { * @throws IOException */ @SuppressWarnings("deprecation") - public OrderedPair allocObjectItem(SBucketVO bucket, String nameKey, S3MetaDataEntry[] meta, S3AccessControlList acl, String cannedAccessPolicy) { + public OrderedPair allocObjectItem(SBucketVO bucket, String nameKey, S3MetaDataEntry[] meta, S3AccessControlList acl, + String cannedAccessPolicy) { SObjectItemVO item = null; int versionSeq = 1; int versioningStatus = bucket.getVersioningStatus(); @@ -1684,7 +1685,8 @@ public class S3Engine { * @return S3BucketPolicy * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException, ParseException */ - public static S3BucketPolicy loadPolicy(S3PolicyContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException, ParseException { + public static S3BucketPolicy loadPolicy(S3PolicyContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException, + ParseException { OrderedPair result = ServiceProvider.getInstance().getBucketPolicy(context.getBucketName()); S3BucketPolicy policy = result.getFirst(); if (null == policy) { diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java index 16adbdef00d..d0db198bbca 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java @@ -18,10 +18,7 @@ package com.cloud.bridge.service.core.s3; import java.util.List; -import com.cloud.bridge.model.SAcl; import com.cloud.bridge.model.SAclVO; -import com.cloud.bridge.model.SBucket; -import com.cloud.bridge.service.exception.UnsupportedException; /** * Each relation holds diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java index 85c412eb6c3..ea4d7a12f6f 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java @@ -17,7 +17,6 @@ package com.cloud.bridge.service.core.s3; import java.util.Calendar; -import java.util.TimeZone; public class S3ListAllMyBucketsEntry { private String name; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java index 01d14be8f03..d56ac01b371 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java @@ -110,7 +110,7 @@ public class S3PolicyArnCondition extends S3PolicyCondition { return false; } logger.info("S3PolicyArnCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " + - valueList[i] + ", result: " + keyResult); + valueList[i] + ", result: " + keyResult); } // -> if all key values are false, false then that key is false and then the entire condition is then false diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java index 7e432e920cc..55bfee11ab7 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyCondition.java @@ -28,7 +28,22 @@ import com.cloud.bridge.service.exception.PermissionDeniedException; public abstract class S3PolicyCondition { public enum ConditionKeys { - UnknownKey, CurrentTime, SecureTransport, SourceIp, SourceArn, UserAgent, EpochTime, Referer, Acl, Location, Prefix, Delimiter, MaxKeys, CopySource, MetaData, VersionId + UnknownKey, + CurrentTime, + SecureTransport, + SourceIp, + SourceArn, + UserAgent, + EpochTime, + Referer, + Acl, + Location, + Prefix, + Delimiter, + MaxKeys, + CopySource, + MetaData, + VersionId } protected PolicyConditions condition = null; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java index 70ed1178fb0..d3b182d0434 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java @@ -134,8 +134,8 @@ public class S3PolicyDateCondition extends S3PolicyCondition { default: return false; } - logger.info("S3PolicyDateCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + DatatypeConverter.printDateTime(tod) + - ", valueInRule: " + DatatypeConverter.printDateTime(valueList[i]) + ", result: " + keyResult); + logger.info("S3PolicyDateCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + + DatatypeConverter.printDateTime(tod) + ", valueInRule: " + DatatypeConverter.printDateTime(valueList[i]) + ", result: " + keyResult); } // -> if all key values are, false then that key is false and then the entire condition is then false diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java index a0d667f4fd9..409708abbda 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java @@ -104,7 +104,7 @@ public class S3PolicyIPAddressCondition extends S3PolicyCondition { return false; } logger.info("S3PolicyIPAddressCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith.toString() + - ", valueInRule: " + valueList[i].toString() + ", result: " + keyResult); + ", valueInRule: " + valueList[i].toString() + ", result: " + keyResult); } // -> if all key values are false, false then that key is false and then the entire condition is then false diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java index a1f741ccf93..8790d7c4e6a 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java @@ -123,8 +123,8 @@ public class S3PolicyNumericCondition extends S3PolicyCondition { default: return false; } - logger.info("S3PolicyNumericCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " + - valueList[i] + ", result: " + keyResult); + logger.info("S3PolicyNumericCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + + ", valueInRule: " + valueList[i] + ", result: " + keyResult); } // -> if all key values are, false then that key is false and then the entire condition is then false diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java index 78eb082ad7d..4f56d3e02f4 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java @@ -120,8 +120,8 @@ public class S3PolicyStringCondition extends S3PolicyCondition { default: return false; } - logger.info("S3PolicyStringCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + ", valueInRule: " + - valueList[i] + ", result: " + keyResult); + logger.info("S3PolicyStringCondition eval - SID: " + SID + ", " + condition + ", key: " + keyName + ", valuePassedIn: " + toCompareWith + + ", valueInRule: " + valueList[i] + ", result: " + keyResult); } // -> if all key values are false, false then that key is false and then the entire condition is then false diff --git a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java index 4c88e73badf..190b7a7f823 100644 --- a/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java +++ b/awsapi/src/com/cloud/bridge/tool/CloudS3CmdTool.java @@ -222,7 +222,7 @@ public class CloudS3CmdTool { ListBucketResult result = response.getListBucketResponse(); System.out.println("\tContent of Bucket " + result.getName()); System.out.println("\tListing with prefix: " + result.getPrefix() + ", delimiter: " + result.getDelimiter() + ", marker: " + result.getMarker() + ", max: " + - result.getMaxKeys()); + result.getMaxKeys()); ListEntry[] entries = result.getContents(); if (entries != null) { diff --git a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java index 44867694b31..bc5dcbf51d0 100644 --- a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java +++ b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java @@ -16,12 +16,13 @@ // under the License. package com.cloud.bridge.util; -import org.apache.log4j.Logger; - +import java.math.BigInteger; import java.security.cert.Certificate; import java.security.cert.X509Certificate; + import javax.security.auth.x500.X500Principal; -import java.math.BigInteger; + +import org.apache.log4j.Logger; public class AuthenticationUtils { protected final static Logger logger = Logger.getLogger(AuthenticationUtils.class); diff --git a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java index 932870a801d..e5f38208e42 100644 --- a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java +++ b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java @@ -17,13 +17,12 @@ package com.cloud.bridge.util; -import java.text.SimpleDateFormat; - import java.text.DateFormat; import java.text.FieldPosition; import java.text.ParsePosition; -import java.util.Date; +import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.TimeZone; /** diff --git a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java index 9757eb0fa59..785c0321221 100644 --- a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java +++ b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.bridge.util; -import java.io.IOException; - /** * Represents a network IP address or a range of addresses. * A range is useful when representing IP addresses defined in diff --git a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java index 7fbb2fe35bd..2a94deaf31e 100644 --- a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java +++ b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java @@ -22,12 +22,13 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.cloud.bridge.service.exception.InternalErrorException; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; +import com.cloud.bridge.service.exception.InternalErrorException; + /** * JsonAccessor provides the functionality to allow navigating JSON object graph using simple expressions, * for example, following property access expressions are all valid ones diff --git a/awsapi/src/com/cloud/bridge/util/PolicyParser.java b/awsapi/src/com/cloud/bridge/util/PolicyParser.java index 9bcbdbcf9ac..a19bc964540 100644 --- a/awsapi/src/com/cloud/bridge/util/PolicyParser.java +++ b/awsapi/src/com/cloud/bridge/util/PolicyParser.java @@ -25,15 +25,15 @@ import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import com.cloud.bridge.service.core.s3.S3BucketPolicy; +import com.cloud.bridge.service.core.s3.S3BucketPolicy.PolicyAccess; import com.cloud.bridge.service.core.s3.S3ConditionFactory; import com.cloud.bridge.service.core.s3.S3PolicyAction; +import com.cloud.bridge.service.core.s3.S3PolicyAction.PolicyActions; import com.cloud.bridge.service.core.s3.S3PolicyCondition; +import com.cloud.bridge.service.core.s3.S3PolicyCondition.ConditionKeys; import com.cloud.bridge.service.core.s3.S3PolicyConditionBlock; import com.cloud.bridge.service.core.s3.S3PolicyPrincipal; import com.cloud.bridge.service.core.s3.S3PolicyStatement; -import com.cloud.bridge.service.core.s3.S3BucketPolicy.PolicyAccess; -import com.cloud.bridge.service.core.s3.S3PolicyAction.PolicyActions; -import com.cloud.bridge.service.core.s3.S3PolicyCondition.ConditionKeys; import com.cloud.bridge.service.exception.PermissionDeniedException; /** @@ -345,8 +345,8 @@ public class PolicyParser { testBucketName = testBucketName.substring(0, offset); if (!testBucketName.equals(bucketName)) - throw new PermissionDeniedException("The S3 Bucket Policy must only refer to the single bucket: \"" + bucketName + "\", but it referres to the following resource: \"" + - resourcePath + "\""); + throw new PermissionDeniedException("The S3 Bucket Policy must only refer to the single bucket: \"" + bucketName + + "\", but it referres to the following resource: \"" + resourcePath + "\""); } public static void badPolicy(String place, String badValue) throws ParseException { diff --git a/awsapi/src/com/cloud/bridge/util/RestAuth.java b/awsapi/src/com/cloud/bridge/util/RestAuth.java index 613ee41cfad..c370c4a3123 100644 --- a/awsapi/src/com/cloud/bridge/util/RestAuth.java +++ b/awsapi/src/com/cloud/bridge/util/RestAuth.java @@ -16,11 +16,16 @@ // under the License. package com.cloud.bridge.util; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.util.*; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.security.InvalidKeyException; +import java.security.SignatureException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java index cc59a340222..27d8d533306 100644 --- a/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java +++ b/awsapi/src/com/cloud/bridge/util/XSerializerJsonAdapter.java @@ -57,7 +57,8 @@ public class XSerializerJsonAdapter implements XSerializerAdapter { if (value != null) { indent(true, indentLevel, writer); writer.print(elementName + ":\""); - writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + ".000Z"); + writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + + ".000Z"); writer.print("\""); } else { if (!serializer.omitNullField(f)) { diff --git a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java index 248b0596628..c21d3b3c9ab 100644 --- a/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java +++ b/awsapi/src/com/cloud/bridge/util/XSerializerXmlAdapter.java @@ -61,7 +61,8 @@ public class XSerializerXmlAdapter implements XSerializerAdapter { if (value != null) { indent(true, indentLevel, writer); writer.print("<" + elementName + ">"); - writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + ".000Z"); + writer.print(DateHelper.getGMTDateFormat("yyyy-MM-dd").format((Date)value) + "T" + DateHelper.getGMTDateFormat("HH:mm:ss").format((Date)value) + + ".000Z"); writer.print(""); } else { if (!serializer.omitNullField(f)) { diff --git a/awsapi/src/com/cloud/bridge/util/XmlHelper.java b/awsapi/src/com/cloud/bridge/util/XmlHelper.java index 92cd01323da..0bcd245a222 100644 --- a/awsapi/src/com/cloud/bridge/util/XmlHelper.java +++ b/awsapi/src/com/cloud/bridge/util/XmlHelper.java @@ -23,14 +23,6 @@ import java.io.InputStream; import java.io.StringWriter; import java.util.Properties; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -42,6 +34,14 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + public class XmlHelper { protected static Logger logger = Logger.getLogger(XmlHelper.class); diff --git a/awsapi/src/com/cloud/stack/CloudStackApi.java b/awsapi/src/com/cloud/stack/CloudStackApi.java index ab6cb9165e1..b7a121024b1 100644 --- a/awsapi/src/com/cloud/stack/CloudStackApi.java +++ b/awsapi/src/com/cloud/stack/CloudStackApi.java @@ -21,6 +21,8 @@ import java.util.List; import org.apache.log4j.Logger; +import com.google.gson.reflect.TypeToken; + import com.cloud.stack.models.ApiConstants; import com.cloud.stack.models.CloudStackAccount; import com.cloud.stack.models.CloudStackCapabilities; @@ -44,7 +46,6 @@ import com.cloud.stack.models.CloudStackPortForwardingRule; import com.cloud.stack.models.CloudStackResourceLimit; import com.cloud.stack.models.CloudStackResourceTag; import com.cloud.stack.models.CloudStackSecurityGroup; -import com.cloud.stack.models.CloudStackSecurityGroupIngress; import com.cloud.stack.models.CloudStackServiceOffering; import com.cloud.stack.models.CloudStackSnapshot; import com.cloud.stack.models.CloudStackSnapshotPolicy; @@ -53,7 +54,6 @@ import com.cloud.stack.models.CloudStackTemplatePermission; import com.cloud.stack.models.CloudStackUserVm; import com.cloud.stack.models.CloudStackVolume; import com.cloud.stack.models.CloudStackZone; -import com.google.gson.reflect.TypeToken; /** * The goal here is to wrap the actual CloudStack API calls... @@ -139,8 +139,8 @@ public class CloudStackApi { * @throws Exception */ public CloudStackUserVm deployVirtualMachine(String serviceOfferingId, String templateId, String zoneId, String account, String diskOfferingId, String displayName, - String domainId, String group, String hostId, String hypervisor, String keyPair, String name, String networkId, String securityGroupIds, String securityGroupNames, - Long size, String userData) throws Exception { + String domainId, String group, String hostId, String hypervisor, String keyPair, String name, String networkId, String securityGroupIds, + String securityGroupNames, Long size, String userData) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.DEPLOY_VIRTUAL_MACHINE); if (cmd != null) { // these are required @@ -368,8 +368,9 @@ public class CloudStackApi { if (resourceTags != null && resourceTags.size() > 0) cmd = setParams(cmd, null, null, resourceTags); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_VIRTUAL_MACHINES_RESPONSE, ApiConstants.VIRTUAL_MACHINE, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_VIRTUAL_MACHINES_RESPONSE, ApiConstants.VIRTUAL_MACHINE, + new TypeToken>() { + }.getType()); } /** @@ -405,8 +406,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackTemplate createTemplate(String displayText, String name, String osTypeId, String bits, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled, - Boolean requiresHVM, String snapshotId, String volumeId) throws Exception { + public CloudStackTemplate createTemplate(String displayText, String name, String osTypeId, String bits, Boolean isFeatured, Boolean isPublic, + Boolean passwordEnabled, Boolean requiresHVM, String snapshotId, String volumeId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_TEMPLATE); if (cmd != null) { cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText); @@ -452,8 +453,9 @@ public class CloudStackApi { * @return * @throws Exception */ - public List registerTemplate(String displayText, String format, String hypervisor, String name, String osTypeId, String url, String zoneId, String account, - String bits, String checksum, String domainId, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled, Boolean requiresHVM) throws Exception { + public List registerTemplate(String displayText, String format, String hypervisor, String name, String osTypeId, String url, String zoneId, + String account, String bits, String checksum, String domainId, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, Boolean passwordEnabled, + Boolean requiresHVM) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.REGISTER_TEMPLATE); if (cmd != null) { cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText); @@ -571,8 +573,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public List listTemplates(String templateFilter, String account, String domainId, String hypervisor, String id, String keyWord, String name, String zoneId) - throws Exception { + public List listTemplates(String templateFilter, String account, String domainId, String hypervisor, String id, String keyWord, String name, + String zoneId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_TEMPLATES); if (cmd != null) { cmd.setParam(ApiConstants.TEMPLATE_FILTER, templateFilter); @@ -609,7 +611,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackInfoResponse updateTemplatePermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) throws Exception { + public CloudStackInfoResponse updateTemplatePermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) + throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_TEMPLATE_PERMISSIONS); if (cmd != null) { cmd.setParam(ApiConstants.ID, id); @@ -645,7 +648,8 @@ public class CloudStackApi { if (domainId != null) cmd.setParam(ApiConstants.DOMAIN_ID, domainId); } - return _client.call(cmd, apiKey, secretKey, false, ApiConstants.LIST_TEMPLATE_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE_PERMISSION, CloudStackTemplatePermission.class); + return _client.call(cmd, apiKey, secretKey, false, ApiConstants.LIST_TEMPLATE_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE_PERMISSION, + CloudStackTemplatePermission.class); } /** @@ -720,8 +724,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public List listIsos(String account, Boolean bootable, String domainId, String hypervisor, String id, String isoFilter, Boolean isPublic, Boolean isReady, - String keyWord, String name, String zoneId) throws Exception { + public List listIsos(String account, Boolean bootable, String domainId, String hypervisor, String id, String isoFilter, Boolean isPublic, + Boolean isReady, String keyWord, String name, String zoneId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_ISOS); if (cmd != null) { if (account != null) @@ -768,8 +772,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackTemplate registerIso(String displayText, String name, String url, String zoneId, String account, Boolean bootable, String domainId, Boolean isExtractable, - Boolean isFeatured, Boolean isPublic, String osTypeId) throws Exception { + public CloudStackTemplate registerIso(String displayText, String name, String url, String zoneId, String account, Boolean bootable, String domainId, + Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String osTypeId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.REGISTER_ISO); if (cmd != null) { cmd.setParam(ApiConstants.DISPLAY_TEXT, displayText); @@ -807,7 +811,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackTemplate updateIso(String id, Boolean bootable, String displayText, String format, String name, String osTypeId, Boolean passwordEnabled) throws Exception { + public CloudStackTemplate updateIso(String id, Boolean bootable, String displayText, String format, String name, String osTypeId, Boolean passwordEnabled) + throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_ISO); if (cmd != null) { cmd.setParam(ApiConstants.ID, id); @@ -875,7 +880,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackInfoResponse updateIsoPermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) throws Exception { + public CloudStackInfoResponse updateIsoPermissions(String id, String accounts, Boolean isExtractable, Boolean isFeatured, Boolean isPublic, String op) + throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.UPDATE_ISO_PERMISSIONS); if (cmd != null) { cmd.setParam(ApiConstants.ID, id); @@ -910,8 +916,9 @@ public class CloudStackApi { if (domainId != null) cmd.setParam(ApiConstants.DOMAIN_ID, domainId); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_ISO_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_ISO_PERMISSIONS_RESPONSE, ApiConstants.TEMPLATE, + new TypeToken>() { + }.getType()); } /** @@ -992,7 +999,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackVolume createVolume(String name, String account, String diskOfferingId, String domainId, Long size, String snapshotId, String zoneId) throws Exception { + public CloudStackVolume createVolume(String name, String account, String diskOfferingId, String domainId, Long size, String snapshotId, String zoneId) + throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_VOLUME); if (cmd != null) { cmd.setParam(ApiConstants.NAME, name); @@ -1240,8 +1248,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackSecurityGroup authorizeSecurityGroupIngress(String account, String cidrList, String domainId, Long endPort, String icmpCode, String icmpType, String protocol, - String securityGroupId, String securityGroupName, Long startPort, List userSecurityGroupList) throws Exception { + public CloudStackSecurityGroup authorizeSecurityGroupIngress(String account, String cidrList, String domainId, Long endPort, String icmpCode, String icmpType, + String protocol, String securityGroupId, String securityGroupName, Long startPort, List userSecurityGroupList) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS); if (cmd != null) { if (account != null) @@ -1273,7 +1281,8 @@ public class CloudStackApi { } } } - return _client.call(cmd, apiKey, secretKey, true, ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS_RESPONSE, ApiConstants.SECURITY_GROUP, CloudStackSecurityGroup.class); + return _client.call(cmd, apiKey, secretKey, true, ApiConstants.AUTHORIZE_SECURITY_GROUP_INGRESS_RESPONSE, ApiConstants.SECURITY_GROUP, + CloudStackSecurityGroup.class); } /** @@ -1321,8 +1330,9 @@ public class CloudStackApi { if (virtualMachineId != null) cmd.setParam(ApiConstants.VIRTUAL_MACHINE_ID, virtualMachineId); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SECURITY_GROUPS_RESPONSE, ApiConstants.SECURITY_GROUP, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SECURITY_GROUPS_RESPONSE, ApiConstants.SECURITY_GROUP, + new TypeToken>() { + }.getType()); } // Accounts @@ -1340,8 +1350,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public List listAccounts(Long accountType, String domainId, String id, Boolean isCleanupRequired, Boolean isRecursive, String keyWord, String name, - String state) throws Exception { + public List listAccounts(Long accountType, String domainId, String id, Boolean isCleanupRequired, Boolean isRecursive, String keyWord, + String name, String state) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_ACCOUNTS); if (cmd != null) { if (accountType != null) @@ -1506,8 +1516,9 @@ public class CloudStackApi { if (keyWord != null) cmd.setParam(ApiConstants.KEYWORD, keyWord); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SNAPSHOT_POLICIES_RESPONSE, ApiConstants.SNAPSHOT, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_SNAPSHOT_POLICIES_RESPONSE, ApiConstants.SNAPSHOT, + new TypeToken>() { + }.getType()); } // Events @@ -1673,8 +1684,9 @@ public class CloudStackApi { if (name != null) cmd.setParam(ApiConstants.NAME, name); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_DISK_OFFERINGS_RESPONSE, ApiConstants.DISK_OFFERING, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_DISK_OFFERINGS_RESPONSE, ApiConstants.DISK_OFFERING, + new TypeToken>() { + }.getType()); } // SSH keys @@ -1811,8 +1823,8 @@ public class CloudStackApi { * @param id * @return */ - public List listPublicIpAddresses(String account, Boolean allocatedOnly, String domainId, Boolean forVirtualNetwork, String id, String ipAddress, - String keyWord, String vlanId, String zoneId) throws Exception { + public List listPublicIpAddresses(String account, Boolean allocatedOnly, String domainId, Boolean forVirtualNetwork, String id, + String ipAddress, String keyWord, String vlanId, String zoneId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_PUBLIC_IP_ADDRESSES); if (cmd != null) { if (account != null) @@ -1834,8 +1846,9 @@ public class CloudStackApi { if (zoneId != null) cmd.setParam(ApiConstants.ZONE_ID, zoneId); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_PUBLIC_IP_ADDRESSES_RESPONSE, ApiConstants.PUBLIC_IP_ADDRESS, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_PUBLIC_IP_ADDRESSES_RESPONSE, ApiConstants.PUBLIC_IP_ADDRESS, + new TypeToken>() { + }.getType()); } // Firewall @@ -1883,8 +1896,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public CloudStackPortForwardingRule createPortForwardingRule(String ipAddressId, Long privatePort, String protocol, Long publicPort, String virtualMachineId, String cidrList, - Long privateEndPort, Long publicEndPort) throws Exception { + public CloudStackPortForwardingRule createPortForwardingRule(String ipAddressId, Long privatePort, String protocol, Long publicPort, String virtualMachineId, + String cidrList, Long privateEndPort, Long publicEndPort) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.CREATE_PORT_FORWARDING_RULE); if (cmd != null) { cmd.setParam(ApiConstants.IP_ADDRESS_ID, ipAddressId); @@ -1899,7 +1912,8 @@ public class CloudStackApi { if (publicEndPort != null) cmd.setParam(ApiConstants.PUBLIC_END_PORT, publicEndPort.toString()); } - return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_PORT_FORWARDING_RULE_RESPONSE, ApiConstants.PORT_FORWARDING_RULE, CloudStackPortForwardingRule.class); + return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_PORT_FORWARDING_RULE_RESPONSE, ApiConstants.PORT_FORWARDING_RULE, + CloudStackPortForwardingRule.class); } /** @@ -1953,7 +1967,8 @@ public class CloudStackApi { if (endPort != null) cmd.setParam(ApiConstants.END_PORT, endPort.toString()); } - return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_IP_FORWARDING_RULE_RESPONSE, ApiConstants.IP_FORWARDING_RULE, CloudStackPortForwardingRule.class); + return _client.call(cmd, apiKey, secretKey, true, ApiConstants.CREATE_IP_FORWARDING_RULE_RESPONSE, ApiConstants.IP_FORWARDING_RULE, + CloudStackPortForwardingRule.class); } /** @@ -1983,8 +1998,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public List listIpForwardingRules(String account, String domainId, String id, String ipAddressId, String keyWord, String virtualMachineId) - throws Exception { + public List listIpForwardingRules(String account, String domainId, String id, String ipAddressId, String keyWord, + String virtualMachineId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_IP_FORWARDING_RULES); if (cmd != null) { if (account != null) @@ -2265,8 +2280,9 @@ public class CloudStackApi { if (name != null) cmd.setParam(ApiConstants.NAME, name); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_INSTANCE_GROUPS_RESPONSE, ApiConstants.INSTANCE_GROUP, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_INSTANCE_GROUPS_RESPONSE, ApiConstants.INSTANCE_GROUP, + new TypeToken>() { + }.getType()); } @@ -2492,8 +2508,8 @@ public class CloudStackApi { * @return * @throws Exception */ - public List listNetworkOfferings(String availability, String displayText, String guestIpType, String id, Boolean isDefault, Boolean isShared, - String keyWord, String name, String specifyVLan, String trafficType, String zoneId) throws Exception { + public List listNetworkOfferings(String availability, String displayText, String guestIpType, String id, Boolean isDefault, + Boolean isShared, String keyWord, String name, String specifyVLan, String trafficType, String zoneId) throws Exception { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.LIST_NETWORK_OFFERINGS); if (cmd != null) { if (availability != null) @@ -2562,8 +2578,9 @@ public class CloudStackApi { if (resourceType != null) cmd.setParam(ApiConstants.RESOURCE_TYPE, resourceType); } - return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_RESOURCE_LIMITS_RESPONSE, ApiConstants.RESOURCE_LIMIT, new TypeToken>() { - }.getType()); + return _client.listCall(cmd, apiKey, secretKey, ApiConstants.LIST_RESOURCE_LIMITS_RESPONSE, ApiConstants.RESOURCE_LIMIT, + new TypeToken>() { + }.getType()); } diff --git a/awsapi/src/com/cloud/stack/CloudStackClient.java b/awsapi/src/com/cloud/stack/CloudStackClient.java index c8d63cdf264..03eba96cdd3 100644 --- a/awsapi/src/com/cloud/stack/CloudStackClient.java +++ b/awsapi/src/com/cloud/stack/CloudStackClient.java @@ -27,11 +27,12 @@ import java.util.List; import org.apache.log4j.Logger; -import com.cloud.bridge.util.JsonAccessor; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonParser; +import com.cloud.bridge.util.JsonAccessor; + /** * CloudStackClient implements a simple CloudStack client object, it can be used to execute CloudStack commands * with JSON response @@ -85,8 +86,8 @@ public class CloudStackClient { return this; } - public T call(CloudStackCommand cmd, String apiKey, String secretKey, boolean followToAsyncResult, String responseName, String responseObjName, Class responseClz) - throws Exception { + public T call(CloudStackCommand cmd, String apiKey, String secretKey, boolean followToAsyncResult, String responseName, String responseObjName, + Class responseClz) throws Exception { assert (responseName != null); @@ -104,7 +105,7 @@ public class CloudStackClient { switch (jobStatus) { case 2: throw new Exception(queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errortext") + " Error Code - " + - queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errorcode")); + queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errorcode")); case 0: try { @@ -138,7 +139,8 @@ public class CloudStackClient { } // collectionType example : new TypeToken>() {}.getType(); - public List listCall(CloudStackCommand cmd, String apiKey, String secretKey, String responseName, String responseObjName, Type collectionType) throws Exception { + public List listCall(CloudStackCommand cmd, String apiKey, String secretKey, String responseName, String responseObjName, Type collectionType) + throws Exception { assert (responseName != null); diff --git a/awsapi/test/com/cloud/gate/service/ServiceTestCase.java b/awsapi/test/com/cloud/gate/service/ServiceTestCase.java index a939b13ff4b..e7683651aed 100644 --- a/awsapi/test/com/cloud/gate/service/ServiceTestCase.java +++ b/awsapi/test/com/cloud/gate/service/ServiceTestCase.java @@ -27,6 +27,7 @@ import com.amazon.s3.client.AmazonS3Stub.CreateBucket; import com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse; import com.amazon.s3.client.AmazonS3Stub.DeleteBucket; import com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse; + import com.cloud.gate.testcase.BaseTestCase; public class ServiceTestCase extends BaseTestCase { diff --git a/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java b/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java index 1ed49526708..826cb3a0103 100644 --- a/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java +++ b/awsapi/test/com/cloud/gate/util/CloudStackClientTestCase.java @@ -22,11 +22,12 @@ import junit.framework.Assert; import org.apache.log4j.Logger; +import com.google.gson.reflect.TypeToken; + import com.cloud.gate.testcase.BaseTestCase; import com.cloud.stack.CloudStackClient; import com.cloud.stack.CloudStackCommand; import com.cloud.stack.models.CloudStackUserVm; -import com.google.gson.reflect.TypeToken; public class CloudStackClientTestCase extends BaseTestCase { protected final static Logger logger = Logger.getLogger(CloudStackClientTestCase.class); @@ -57,8 +58,9 @@ public class CloudStackClientTestCase extends BaseTestCase { command.setParam("page", "1"); command.setParam("pagesize", "20"); try { - List vms = client.listCall(command, API_KEY, SECRET_KEY, "listvirtualmachinesresponse", "virtualmachine", new TypeToken>() { - }.getType()); + List vms = + client.listCall(command, API_KEY, SECRET_KEY, "listvirtualmachinesresponse", "virtualmachine", new TypeToken>() { + }.getType()); for (CloudStackUserVm vm : vms) { logger.info("id: " + vm.getId() + ", name: " + vm.getName()); diff --git a/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java b/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java index 8b59f5397a7..8603e593440 100644 --- a/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java +++ b/awsapi/test/com/cloud/gate/util/JsonAccessorTestCase.java @@ -20,13 +20,14 @@ import junit.framework.Assert; import org.apache.log4j.Logger; -import com.cloud.bridge.util.JsonAccessor; -import com.cloud.gate.testcase.BaseTestCase; -import com.cloud.stack.models.CloudStackSnapshot; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonParser; +import com.cloud.bridge.util.JsonAccessor; +import com.cloud.gate.testcase.BaseTestCase; +import com.cloud.stack.models.CloudStackSnapshot; + public class JsonAccessorTestCase extends BaseTestCase { protected final static Logger logger = Logger.getLogger(UtilTestCase.class); @@ -53,7 +54,8 @@ public class JsonAccessorTestCase extends BaseTestCase { } public void testGson() { - String response = "{ \"queryasyncjobresultresponse\" : {\"jobid\":5868,\"jobstatus\":1,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresulttype\":\"object\",\"jobresult\":{\"snapshot\":{\"id\":3161,\"account\":\"admin\",\"domainid\":1,\"domain\":\"ROOT\",\"snapshottype\":\"MANUAL\",\"volumeid\":186928,\"volumename\":\"KY-DATA-VOL\",\"volumetype\":\"DATADISK\",\"created\":\"2011-06-02T05:05:41-0700\",\"name\":\"i-2-246446-VM_KY-DATA-VOL_20110602120541\",\"intervaltype\":\"MANUAL\",\"state\":\"BackedUp\"}}}}"; + String response = + "{ \"queryasyncjobresultresponse\" : {\"jobid\":5868,\"jobstatus\":1,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresulttype\":\"object\",\"jobresult\":{\"snapshot\":{\"id\":3161,\"account\":\"admin\",\"domainid\":1,\"domain\":\"ROOT\",\"snapshottype\":\"MANUAL\",\"volumeid\":186928,\"volumename\":\"KY-DATA-VOL\",\"volumetype\":\"DATADISK\",\"created\":\"2011-06-02T05:05:41-0700\",\"name\":\"i-2-246446-VM_KY-DATA-VOL_20110602120541\",\"intervaltype\":\"MANUAL\",\"state\":\"BackedUp\"}}}}"; JsonParser parser = new JsonParser(); JsonElement json = parser.parse(response); diff --git a/awsapi/test/com/cloud/gate/util/UtilTestCase.java b/awsapi/test/com/cloud/gate/util/UtilTestCase.java index b9b43d29501..3e2562292fd 100644 --- a/awsapi/test/com/cloud/gate/util/UtilTestCase.java +++ b/awsapi/test/com/cloud/gate/util/UtilTestCase.java @@ -23,6 +23,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import junit.framework.Assert; + import org.apache.log4j.Logger; import com.cloud.bridge.util.DateHelper; @@ -33,8 +35,6 @@ import com.cloud.bridge.util.XSerializerJsonAdapter; import com.cloud.bridge.util.XSerializerXmlAdapter; import com.cloud.gate.testcase.BaseTestCase; -import junit.framework.Assert; - class SubFoo { @XElement(name = "Name") private String name; diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java index 772bc4538ea..5d3de86fe09 100644 --- a/core/src/com/cloud/agent/api/AgentControlCommand.java +++ b/core/src/com/cloud/agent/api/AgentControlCommand.java @@ -21,6 +21,7 @@ public class AgentControlCommand extends Command { public AgentControlCommand() { } + @Override public boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java index de78aeaa7e7..db0cd0a5ac6 100644 --- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java +++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java @@ -44,8 +44,8 @@ public class AttachVolumeCommand extends Command { protected AttachVolumeCommand() { } - public AttachVolumeCommand(boolean attach, boolean managed, String vmName, StoragePoolType pooltype, String volumePath, String volumeName, Long volumeSize, Long deviceId, - String chainInfo) { + public AttachVolumeCommand(boolean attach, boolean managed, String vmName, StoragePoolType pooltype, String volumePath, String volumeName, Long volumeSize, + Long deviceId, String chainInfo) { this.attach = attach; this._managed = managed; this.vmName = vmName; diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java index 3bc53be9f29..6e1e3be5ed4 100644 --- a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java @@ -52,8 +52,8 @@ public class BackupSnapshotCommand extends SnapshotCommand { * @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached. * @param secHostId This is the Id of the secondary storage. */ - public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, Long secHostId, String volumePath, StoragePool pool, - String snapshotUuid, String snapshotName, String prevSnapshotUuid, String prevBackupUuid, boolean isVolumeInactive, String vmName, int wait) { + public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, Long secHostId, String volumePath, + StoragePool pool, String snapshotUuid, String snapshotName, String prevSnapshotUuid, String prevBackupUuid, boolean isVolumeInactive, String vmName, int wait) { super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId); this.snapshotId = snapshotId; this.prevSnapshotUuid = prevSnapshotUuid; diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java index 54488d5ce14..fd9e0572c1c 100644 --- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java @@ -43,8 +43,8 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand { * @param origTemplateInstallPath The install path of the original template VHD on the secondary */ - public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, String backedUpSnapshotUuid, - String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) { + public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, + String backedUpSnapshotUuid, String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) { super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId); this.origTemplateInstallPath = origTemplateInstallPath; this.newTemplateId = newTemplateId; diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java index d81acd8a61f..84f50af4bef 100644 --- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java +++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java @@ -33,8 +33,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { public CreatePrivateTemplateFromVolumeCommand() { } - public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, String uniqueName, - String volumePath, String vmName, int wait) { + public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, + String uniqueName, String volumePath, String vmName, int wait) { _secondaryStorageUrl = secondaryStorageUrl; _templateId = templateId; _accountId = accountId; @@ -52,10 +52,12 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { return false; } + @Override public StorageFilerTO getPool() { return _primaryPool; } + @Override public String getSecondaryStorageUrl() { return _secondaryStorageUrl; } @@ -76,14 +78,17 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { return _vmName; } + @Override public void setVolumePath(String _volumePath) { this._volumePath = _volumePath; } + @Override public String getVolumePath() { return _volumePath; } + @Override public Long getAccountId() { return _accountId; } diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java index ef969117b15..ea0384ede5e 100644 --- a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java @@ -17,10 +17,10 @@ package com.cloud.agent.api; -import org.apache.cloudstack.storage.to.VolumeObjectTO; - import java.util.List; +import org.apache.cloudstack.storage.to.VolumeObjectTO; + public class CreateVMSnapshotAnswer extends Answer { private List volumeTOs; diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java index 57d66a2a443..7f491556c60 100644 --- a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java @@ -18,11 +18,10 @@ package com.cloud.agent.api; import java.util.List; -import com.cloud.agent.api.to.DataTO; -import com.cloud.agent.api.to.VolumeTO; -import com.cloud.vm.VirtualMachine; import org.apache.cloudstack.storage.to.VolumeObjectTO; +import com.cloud.vm.VirtualMachine; + public class CreateVMSnapshotCommand extends VMSnapshotBaseCommand { public CreateVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List volumeTOs, String guestOSType, VirtualMachine.State vmState) { diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java index ff433229eb0..f36ad3d9013 100644 --- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java @@ -52,7 +52,8 @@ public class CreateVolumeFromVMSnapshotCommand extends Command { this.storagePoolUuid = storagePoolUuid; } - public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile, Long volumeId) { + public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile, + Long volumeId) { this.path = path; this.name = name; this.fullClone = fullClone; diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java index 1d26d0f35ad..798cd54c65b 100644 --- a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.agent.api; -import org.apache.cloudstack.storage.to.VolumeObjectTO; - import java.util.List; +import org.apache.cloudstack.storage.to.VolumeObjectTO; + public class DeleteVMSnapshotAnswer extends Answer { private List volumeTOs; diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java index d9e4c6daa33..0d200506fcb 100644 --- a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java @@ -18,7 +18,6 @@ package com.cloud.agent.api; import java.util.List; -import com.cloud.agent.api.to.VolumeTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; public class DeleteVMSnapshotCommand extends VMSnapshotBaseCommand { diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java index 02734fd3a35..c9d25a0e3a0 100644 --- a/core/src/com/cloud/agent/api/HostStatsEntry.java +++ b/core/src/com/cloud/agent/api/HostStatsEntry.java @@ -31,8 +31,8 @@ public class HostStatsEntry implements HostStats { public HostStatsEntry() { } - public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs, double freeMemoryKBs, - double xapiMemoryUsageKBs, double averageLoad) { + public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs, + double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad) { this.hostId = hostId; this.entityType = entityType; this.cpuUtilization = cpuUtilization; diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java index a108a2a7bed..a94697a279d 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java @@ -17,9 +17,10 @@ package com.cloud.agent.api; import java.util.Map; + +import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.StorageFilerTO; public class MigrateWithStorageCommand extends Command { VirtualMachineTO vm; diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java index 76cedddfcb1..ebb0db5c347 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java @@ -17,8 +17,9 @@ package com.cloud.agent.api; import java.util.Map; -import com.cloud.agent.api.to.VolumeTO; + import com.cloud.agent.api.to.NicTO; +import com.cloud.agent.api.to.VolumeTO; public class MigrateWithStorageReceiveAnswer extends Answer { @@ -33,7 +34,8 @@ public class MigrateWithStorageReceiveAnswer extends Answer { token = null; } - public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map volumeToSr, Map nicToNetwork, Map token) { + public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map volumeToSr, Map nicToNetwork, + Map token) { super(cmd, true, null); this.volumeToSr = volumeToSr; this.nicToNetwork = nicToNetwork; diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java index df6740574a7..0d1e7f643a8 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java @@ -17,9 +17,10 @@ package com.cloud.agent.api; import java.util.Map; + +import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.StorageFilerTO; public class MigrateWithStorageReceiveCommand extends Command { VirtualMachineTO vm; diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java index 7cf641f7845..314c8766491 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java @@ -17,6 +17,7 @@ package com.cloud.agent.api; import java.util.Set; + import com.cloud.agent.api.to.VolumeTO; public class MigrateWithStorageSendAnswer extends Answer { diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java index 7ded6454540..6231b16bf97 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java @@ -17,9 +17,10 @@ package com.cloud.agent.api; import java.util.Map; + +import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; -import com.cloud.agent.api.to.NicTO; public class MigrateWithStorageSendCommand extends Command { VirtualMachineTO vm; diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java index 5d6d2365c6f..5163c48d774 100644 --- a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java +++ b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java @@ -30,7 +30,8 @@ public class ModifyStoragePoolAnswer extends Answer { public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map tInfo) { super(cmd); this.result = true; - this.poolInfo = new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes); + this.poolInfo = + new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes); this.templateInfo = tInfo; } diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java index e783d30151e..23cdcca2d34 100644 --- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java +++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java @@ -30,7 +30,8 @@ public class PingRoutingWithOvsCommand extends PingRoutingCommand { super(); } - public PingRoutingWithOvsCommand(Host.Type type, long id, Map states, Map hostVmStateReport, List> ovsStates) { + public PingRoutingWithOvsCommand(Host.Type type, long id, Map states, Map hostVmStateReport, + List> ovsStates) { super(type, id, states, hostVmStateReport); this.states = ovsStates; diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java index ec27c3d0bd3..f6e88042baa 100644 --- a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java +++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java @@ -23,6 +23,7 @@ public class RecurringNetworkUsageCommand extends Command implements CronCommand this.interval = interval; } + @Override public int getInterval() { return interval; } diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java index 4cdc47d4dd2..7168b89f5f0 100644 --- a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java @@ -17,10 +17,11 @@ package com.cloud.agent.api; -import com.cloud.vm.VirtualMachine; +import java.util.List; + import org.apache.cloudstack.storage.to.VolumeObjectTO; -import java.util.List; +import com.cloud.vm.VirtualMachine; public class RevertToVMSnapshotAnswer extends Answer { diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java index b231441abfe..853a06896c0 100644 --- a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java +++ b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java @@ -57,7 +57,8 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand { protected SetupGuestNetworkCommand() { } - public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add, NicTO nic) { + public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add, + NicTO nic) { this.dhcpRange = dhcpRange; this.networkDomain = networkDomain; this.defaultDns1 = defaultDns1; diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java index 6ff9288c46e..626c87f2a96 100755 --- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java +++ b/core/src/com/cloud/agent/api/StartupRoutingCommand.java @@ -78,14 +78,22 @@ public class StartupRoutingCommand extends StartupCommand { } - public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy, - Map vms, Map hostVmStateReport) { + public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, + RouterPrivateIpStrategy privIpStrategy, Map vms, Map hostVmStateReport) { this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, vms, hostVmStateReport); getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString()); } public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy) { - this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, new HashMap(), new HashMap(), new HashMap()); + this(cpus, + speed, + memory, + dom0MinMemory, + caps, + hypervisorType, + new HashMap(), + new HashMap(), + new HashMap()); getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString()); } diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java index 0dda6dd57a1..2911d2e84f2 100644 --- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java +++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.agent.api; -import com.cloud.agent.api.Command; import com.cloud.host.Host; /** diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java index 6b880d5a632..d2abd54e040 100644 --- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java +++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java @@ -19,8 +19,6 @@ package com.cloud.agent.api; import java.util.List; -import com.cloud.agent.api.to.DataTO; -import com.cloud.agent.api.to.VolumeTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; public class VMSnapshotBaseCommand extends Command { diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java index 765f4e449c1..e5d78419179 100644 --- a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java +++ b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java @@ -59,6 +59,7 @@ public class VmDiskStatsEntry implements VmDiskStats { this.bytesRead = bytesRead; } + @Override public long getBytesRead() { return bytesRead; } @@ -67,6 +68,7 @@ public class VmDiskStatsEntry implements VmDiskStats { this.bytesWrite = bytesWrite; } + @Override public long getBytesWrite() { return bytesWrite; } @@ -75,6 +77,7 @@ public class VmDiskStatsEntry implements VmDiskStats { this.ioRead = ioRead; } + @Override public long getIORead() { return ioRead; } @@ -83,6 +86,7 @@ public class VmDiskStatsEntry implements VmDiskStats { this.ioWrite = ioWrite; } + @Override public long getIOWrite() { return ioWrite; } diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java index a8238bc57db..a7a1968db8b 100755 --- a/core/src/com/cloud/agent/api/VmStatsEntry.java +++ b/core/src/com/cloud/agent/api/VmStatsEntry.java @@ -51,6 +51,7 @@ public class VmStatsEntry implements VmStats { this.entityType = entityType; } + @Override public double getCPUUtilization() { return cpuUtilization; } @@ -59,6 +60,7 @@ public class VmStatsEntry implements VmStats { this.cpuUtilization = cpuUtilization; } + @Override public double getNetworkReadKBs() { return networkReadKBs; } @@ -67,6 +69,7 @@ public class VmStatsEntry implements VmStats { this.networkReadKBs = networkReadKBs; } + @Override public double getNetworkWriteKBs() { return networkWriteKBs; } @@ -75,6 +78,7 @@ public class VmStatsEntry implements VmStats { this.networkWriteKBs = networkWriteKBs; } + @Override public double getDiskReadIOs() { return diskReadIOs; } @@ -83,6 +87,7 @@ public class VmStatsEntry implements VmStats { this.diskReadIOs = diskReadIOs; } + @Override public double getDiskWriteIOs() { return diskWriteIOs; } @@ -91,6 +96,7 @@ public class VmStatsEntry implements VmStats { this.diskWriteIOs = diskWriteIOs; } + @Override public double getDiskReadKBs() { return diskReadKBs; } @@ -99,6 +105,7 @@ public class VmStatsEntry implements VmStats { this.diskReadKBs = diskReadKBs; } + @Override public double getDiskWriteKBs() { return diskWriteKBs; } diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java index a1b61f0736e..267ed8ba3f6 100644 --- a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java +++ b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java @@ -53,6 +53,7 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo return proxyCmdPort; } + @Override public int getInterval() { return interval; } diff --git a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java index 4155013a0e8..49adc9eac14 100644 --- a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java +++ b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.agent.api.routing; -import com.cloud.agent.api.to.DhcpTO; - import java.util.List; +import com.cloud.agent.api.to.DhcpTO; + public class DnsMasqConfigCommand extends NetworkElementCommand { List dhcpTOs; diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java index 108bcce0192..9c5244a8e13 100644 --- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java +++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java @@ -17,10 +17,10 @@ package com.cloud.agent.api.routing; -import com.cloud.agent.api.Command; - import java.util.List; +import com.cloud.agent.api.Command; + /** * GlobalLoadBalancerConfigCommand used for sending the GSLB configuration to GSLB service provider */ diff --git a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java index 08ef20c073c..12f57dc2b30 100644 --- a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java +++ b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java @@ -16,9 +16,8 @@ // under the License. package com.cloud.agent.api.routing; -import java.util.HashSet; import java.util.List; -import java.util.Set; + import com.cloud.agent.api.to.MonitorServiceTO; /** diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java index e23e7921cf1..7f1916c48b6 100644 --- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java +++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java @@ -33,7 +33,8 @@ public class CopyVolumeCommand extends Command { public CopyVolumeCommand() { } - public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, boolean executeInSequence) { + public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, + boolean executeInSequence) { this.volumeId = volumeId; this.volumePath = volumePath; this.pool = new StorageFilerTO(pool); diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java index d42fee2c2c0..56d9c30912c 100644 --- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java @@ -31,7 +31,8 @@ public class CreatePrivateTemplateAnswer extends Answer { super(); } - public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName, ImageFormat format) { + public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName, + ImageFormat format) { super(cmd, success, result); _path = path; _virtualSize = virtualSize; diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java index 4bd9f96c2f5..315ad253a74 100755 --- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java +++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java @@ -35,8 +35,9 @@ public class DestroyCommand extends StorageCommand { } public DestroyCommand(StoragePool pool, VMTemplateStorageResourceAssoc templatePoolRef) { - volume = new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(), - templatePoolRef.getTemplateSize(), null); + volume = + new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(), + templatePoolRef.getTemplateSize(), null); } public VolumeTO getVolume() { diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index d23fcce952f..34450fe1601 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -446,8 +446,9 @@ public class VirtualRoutingResource implements Manager { cfgFilePath = tmpCfgFile.getAbsolutePath(); } - final String result = setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE], - rules[LoadBalancerConfigurator.STATS], routerIp); + final String result = + setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE], rules[LoadBalancerConfigurator.STATS], + routerIp); return new Answer(cmd, result == null, result); } catch (final IOException e) { @@ -486,8 +487,9 @@ public class VirtualRoutingResource implements Manager { String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME); String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); for (IpAddressTO ip : ips) { - result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), - ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false); + result = + assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), + ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false); if (result != null) { results[i++] = IpAssocAnswer.errorResult; } else { diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java index 30e8319acfd..1debdc860f9 100755 --- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java +++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Map; -import com.cloud.utils.exception.CloudRuntimeException; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; @@ -33,6 +32,8 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import com.cloud.utils.exception.CloudRuntimeException; + public class ArrayTypeAdaptor implements JsonDeserializer, JsonSerializer { protected Gson _gson = null; diff --git a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java index 7822ee870fa..8e25cc0f9a0 100644 --- a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java +++ b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java @@ -19,7 +19,6 @@ package com.cloud.agent.transport; import java.lang.reflect.Type; import java.util.Map; -import com.cloud.utils.exception.CloudRuntimeException; import com.google.gson.Gson; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -29,6 +28,8 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import com.cloud.utils.exception.CloudRuntimeException; + public class InterfaceTypeAdaptor implements JsonDeserializer, JsonSerializer { protected Gson _gson = null; diff --git a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java index 7c76fa01512..ce3f21a9caa 100644 --- a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java +++ b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java @@ -18,11 +18,12 @@ package com.cloud.agent.transport; import org.apache.log4j.Logger; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; + import com.cloud.agent.api.Command; import com.cloud.agent.api.LogLevel; import com.cloud.agent.api.LogLevel.Log4jLevel; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; public class LoggingExclusionStrategy implements ExclusionStrategy { Logger _logger = null; diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java index b6e18e67a44..e5fa7879db1 100644 --- a/core/src/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/com/cloud/network/HAProxyConfigurator.java @@ -26,25 +26,24 @@ import java.util.Set; import org.apache.log4j.Logger; -import com.cloud.utils.Pair; - import com.cloud.agent.api.routing.LoadBalancerConfigCommand; import com.cloud.agent.api.to.LoadBalancerTO; -import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.agent.api.to.LoadBalancerTO.DestinationTO; import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO; +import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType; +import com.cloud.utils.Pair; import com.cloud.utils.net.NetUtils; public class HAProxyConfigurator implements LoadBalancerConfigurator { private static final Logger s_logger = Logger.getLogger(HAProxyConfigurator.class); private static final String blankLine = "\t "; - private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy", "\tuser haproxy", - "\tgroup haproxy", "\tdaemon"}; + private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy", + "\tuser haproxy", "\tgroup haproxy", "\tdaemon"}; private static String[] defaultsSection = {"defaults", "\tlog global", "\tmode tcp", "\toption dontlognull", "\tretries 3", "\toption redispatch", - "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"}; + "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"}; private static String[] defaultListen = {"listen vmops 0.0.0.0:9", "\toption transparent"}; @@ -527,7 +526,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { s_logger.info("Haproxy mode http enabled"); rule.append("\n\tmode http\n\toption httpclose"); } - rule.append("\n\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri).append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ").append(lbCmd.lbStatsAuth); + rule.append("\n\tstats enable\n\tstats uri ") + .append(lbCmd.lbStatsUri) + .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ") + .append(lbCmd.lbStatsAuth); rule.append("\n"); String result = rule.toString(); if (s_logger.isDebugEnabled()) { @@ -587,9 +589,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { * stats will be available on the default http serving port, no * special stats port */ - StringBuilder subRule = new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri) - .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ") - .append(lbCmd.lbStatsAuth); + StringBuilder subRule = + new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri) + .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ") + .append(lbCmd.lbStatsAuth); result.add(subRule.toString()); } diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java index 437891b7798..ada5f5e1d6d 100644 --- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java +++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java @@ -204,8 +204,9 @@ public class TrafficSentinelResource implements ServerResource { try { //Query traffic Sentinel - trafficSentinel = new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") + - "&authenticate=basic&resultFormat=txt"); + trafficSentinel = + new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") + + "&authenticate=basic&resultFormat=txt"); BufferedReader in = new BufferedReader(new InputStreamReader(trafficSentinel.openStream())); diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java index e6e84827894..a911bc57911 100755 --- a/core/src/com/cloud/resource/ResourceListener.java +++ b/core/src/com/cloud/resource/ResourceListener.java @@ -31,8 +31,8 @@ public interface ResourceListener { static final Integer EVENT_CANCEL_MAINTENANCE_AFTER = 0x1 << 5; static final Integer EVENT_PREPARE_MAINTENANCE_BEFORE = 0x1 << 6; static final Integer EVENT_PREPARE_MAINTENANCE_AFTER = 0x1 << 7; - static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | EVENT_CANCEL_MAINTENANCE_BEFORE | - EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER); + static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | + EVENT_CANCEL_MAINTENANCE_BEFORE | EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER); /** * diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java index 358ca905a7a..4da99445f9b 100755 --- a/core/src/com/cloud/resource/ServerResourceBase.java +++ b/core/src/com/cloud/resource/ServerResourceBase.java @@ -99,7 +99,7 @@ public abstract class ServerResourceBase implements ServerResource { if (//!nic.isLoopback() && //nic.isUp() && !nic.isVirtual() && !nicName.startsWith("vnif") && !nicName.startsWith("vnbr") && !nicName.startsWith("peth") && !nicName.startsWith("vif") && - !nicName.startsWith("virbr") && !nicName.contains(":")) { + !nicName.startsWith("virbr") && !nicName.contains(":")) { final String[] info = NetUtils.getNicParams(nicName); if (info != null && info[0] != null) { _privateNic = nic; diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java index ca22d1d53ff..4349b4a8a0c 100644 --- a/core/src/com/cloud/serializer/GsonHelper.java +++ b/core/src/com/cloud/serializer/GsonHelper.java @@ -20,6 +20,10 @@ import java.util.List; import org.apache.log4j.Logger; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig; @@ -31,9 +35,6 @@ import com.cloud.agent.transport.LoggingExclusionStrategy; import com.cloud.agent.transport.Request.NwGroupsCommandTypeAdaptor; import com.cloud.agent.transport.Request.PortConfigListTypeAdaptor; import com.cloud.utils.Pair; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; public class GsonHelper { private static final Logger s_logger = Logger.getLogger(GsonHelper.class); diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/com/cloud/serializer/SerializerHelper.java index 42fbf07ab5c..1ba55fc9afb 100644 --- a/core/src/com/cloud/serializer/SerializerHelper.java +++ b/core/src/com/cloud/serializer/SerializerHelper.java @@ -26,9 +26,10 @@ import java.util.List; import org.apache.log4j.Logger; +import com.google.gson.Gson; + import com.cloud.utils.DateUtil; import com.cloud.utils.Pair; -import com.google.gson.Gson; /** * Note: toPairList and appendPairList only support simple POJO objects currently @@ -155,7 +156,7 @@ public class SerializerHelper { } catch (NoSuchMethodException e1) { if (s_logger.isTraceEnabled()) { s_logger.trace("POJO " + o.getClass().getName() + " does not have " + methodName + "() method for property: " + propName + - ", will check is-prefixed method to see if it is boolean property"); + ", will check is-prefixed method to see if it is boolean property"); } } diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/com/cloud/storage/resource/StorageProcessor.java index 1136b089e92..d49a64baecd 100644 --- a/core/src/com/cloud/storage/resource/StorageProcessor.java +++ b/core/src/com/cloud/storage/resource/StorageProcessor.java @@ -27,8 +27,6 @@ import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import com.cloud.agent.api.Answer; -import org.apache.cloudstack.storage.command.ForgetObjectCmd; -import org.apache.cloudstack.storage.command.IntroduceObjectCmd; public interface StorageProcessor { public Answer copyTemplateToPrimaryStorage(CopyCommand cmd); diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java index 88a7dd26be0..61af4d947f0 100644 --- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java +++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java @@ -75,11 +75,12 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma destData.getDataStore().getRole() == DataStoreRole.Primary) { //copy template to primary storage return processor.copyTemplateToPrimaryStorage(cmd); - } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary && destDataStore.getRole() == DataStoreRole.Primary) { + } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary && + destDataStore.getRole() == DataStoreRole.Primary) { //clone template to a volume return processor.cloneVolumeFromBaseTemplate(cmd); } else if (srcData.getObjectType() == DataObjectType.VOLUME && - (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) { + (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) { //copy volume from image cache to primary return processor.copyVolumeFromImageCacheToPrimary(cmd); } else if (srcData.getObjectType() == DataObjectType.VOLUME && srcData.getDataStore().getRole() == DataStoreRole.Primary) { @@ -89,7 +90,7 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma return processor.createTemplateFromVolume(cmd); } } else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.SNAPSHOT && - srcData.getDataStore().getRole() == DataStoreRole.Primary) { + srcData.getDataStore().getRole() == DataStoreRole.Primary) { return processor.backupSnapshot(cmd); } else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.VOLUME) { return processor.createVolumeFromSnapshot(cmd); diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java index 2a6547acded..f3d34b06c96 100644 --- a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java +++ b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java @@ -39,6 +39,7 @@ import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.log4j.Logger; + import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType; @@ -75,8 +76,8 @@ public class HttpTemplateDownloader extends ManagedContextRunnable implements Te private ResourceType resourceType = ResourceType.TEMPLATE; private final HttpMethodRetryHandler myretryhandler; - public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes, String user, - String password, Proxy proxy, ResourceType resourceType) { + public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes, + String user, String password, Proxy proxy, ResourceType resourceType) { _storage = storageLayer; this.downloadUrl = downloadUrl; setToDir(toDir); diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java index ede21ce7db2..2dbfb482069 100644 --- a/core/src/com/cloud/storage/template/IsoProcessor.java +++ b/core/src/com/cloud/storage/template/IsoProcessor.java @@ -24,8 +24,8 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import com.cloud.storage.StorageLayer; import com.cloud.storage.Storage.ImageFormat; +import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; @Local(value = Processor.class) diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/com/cloud/storage/template/Processor.java index 3d137dcbd18..4887e4e00d3 100644 --- a/core/src/com/cloud/storage/template/Processor.java +++ b/core/src/com/cloud/storage/template/Processor.java @@ -16,12 +16,12 @@ // under the License. package com.cloud.storage.template; +import java.io.File; + import com.cloud.exception.InternalErrorException; import com.cloud.storage.Storage.ImageFormat; import com.cloud.utils.component.Adapter; -import java.io.File; - /** * Generic interface to process different types of image formats * for templates downloaded and for conversion from one format diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java index e5f232ff78b..b3c0cc90cf6 100644 --- a/core/src/com/cloud/storage/template/QCOW2Processor.java +++ b/core/src/com/cloud/storage/template/QCOW2Processor.java @@ -81,6 +81,7 @@ public class QCOW2Processor extends AdapterBase implements Processor { return info; } + @Override public Long getVirtualSize(File file) { FileInputStream strm = null; byte[] b = new byte[8]; diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/com/cloud/storage/template/S3TemplateDownloader.java index a1110136441..21b7a599887 100644 --- a/core/src/com/cloud/storage/template/S3TemplateDownloader.java +++ b/core/src/com/cloud/storage/template/S3TemplateDownloader.java @@ -215,7 +215,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp InputStream in = !chunked ? new BufferedInputStream(request.getResponseBodyAsStream()) : new ChunkedInputStream(request.getResponseBodyAsStream()); s_logger.info("Starting download from " + getDownloadUrl() + " to s3 bucket " + s3.getBucketName() + " remoteSize=" + remoteSize + " , max size=" + - maxTemplateSizeInByte); + maxTemplateSizeInByte); Date start = new Date(); // compute s3 key @@ -261,7 +261,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp // single part upload, with 5GB limit in Amazon S3Utils.putObject(s3, putObjectRequest); while (status != TemplateDownloader.Status.DOWNLOAD_FINISHED && status != TemplateDownloader.Status.UNRECOVERABLE_ERROR && - status != TemplateDownloader.Status.ABORTED) { + status != TemplateDownloader.Status.ABORTED) { // wait for completion } } diff --git a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java index 466958de4cc..7eb0b5fa669 100644 --- a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java +++ b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java @@ -18,9 +18,10 @@ package com.cloud.storage.template; import java.io.File; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + import com.cloud.storage.StorageLayer; public abstract class TemplateDownloaderBase extends ManagedContextRunnable implements TemplateDownloader { @@ -119,6 +120,7 @@ public abstract class TemplateDownloaderBase extends ManagedContextRunnable impl return true; } + @Override public long getMaxTemplateSizeInBytes() { return this.MAX_TEMPLATE_SIZE_IN_BYTES; } diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/com/cloud/storage/template/TemplateLocation.java index b97ff76f4c9..48b040adb43 100644 --- a/core/src/com/cloud/storage/template/TemplateLocation.java +++ b/core/src/com/cloud/storage/template/TemplateLocation.java @@ -24,9 +24,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; -import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType; import org.apache.log4j.Logger; +import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType; + import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.storage.template.Processor.FormatInfo; diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java index e0fdb35ab79..308ea6472ef 100644 --- a/core/src/com/cloud/storage/template/VhdProcessor.java +++ b/core/src/com/cloud/storage/template/VhdProcessor.java @@ -25,7 +25,6 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import com.cloud.utils.exception.CloudRuntimeException; import org.apache.log4j.Logger; import com.cloud.exception.InternalErrorException; @@ -33,6 +32,7 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.AdapterBase; +import com.cloud.utils.exception.CloudRuntimeException; /** * VhdProcessor processes the downloaded template for VHD. It diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index 92c0ce6a253..be201438a1c 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -22,9 +22,10 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.log4j.Logger; import com.cloud.exception.InternalErrorException; import com.cloud.storage.Storage.ImageFormat; diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java index 21fedf9e09e..01c05f004f9 100644 --- a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java +++ b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java @@ -17,7 +17,6 @@ package org.apache.cloudstack.storage.to; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; -import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.storage.DataStoreRole; diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java index a46351bff7a..03b460902bf 100644 --- a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java @@ -17,12 +17,12 @@ package org.apache.cloudstack.storage.to; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.agent.api.to.DataTO; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; public class SnapshotObjectTO implements DataTO { private String path; diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java index f25cc71607c..b201c386f49 100644 --- a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java @@ -16,12 +16,12 @@ // under the License. package org.apache.cloudstack.storage.to; -import com.cloud.hypervisor.Hypervisor; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.agent.api.to.DataTO; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java index b8c7faa89c0..4499049b900 100644 --- a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java @@ -16,12 +16,12 @@ // under the License. package org.apache.cloudstack.storage.to; -import com.cloud.hypervisor.Hypervisor; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.agent.api.to.DataTO; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.Storage; import com.cloud.storage.Volume; diff --git a/core/test/com/cloud/network/HAProxyConfiguratorTest.java b/core/test/com/cloud/network/HAProxyConfiguratorTest.java index 2e6cb4522d1..33cf50b5111 100644 --- a/core/test/com/cloud/network/HAProxyConfiguratorTest.java +++ b/core/test/com/cloud/network/HAProxyConfiguratorTest.java @@ -16,14 +16,13 @@ // under the License. package com.cloud.network; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.mockito.Mockito; import com.cloud.agent.api.routing.LoadBalancerConfigCommand; import com.cloud.agent.api.to.LoadBalancerTO; diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java index 6aaa00bc2c8..4411c47f36f 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java @@ -36,8 +36,9 @@ public class BackupSnapshotAnswerTest { StoragePool pool = Mockito.mock(StoragePool.class); - bsc = new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid", - "prevBackupUuid", false, "vmName", 5); + bsc = + new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid", + "prevBackupUuid", false, "vmName", 5); bsa = new BackupSnapshotAnswer(bsc, true, "results", "bussname", false); } diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java index 3b66c67e23a..eaa9b94fee1 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java @@ -148,11 +148,11 @@ public class BackupSnapshotCommandTest { }; }; - BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", - "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5); + BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, + "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5); - BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", - "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5); + BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, + "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5); @Test public void testGetSecondaryStorageUrl() { diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java index ac9efb12364..b0872bfc520 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java @@ -20,21 +20,21 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.cloud.agent.api.storage.ResizeVolumeCommand; -import com.cloud.agent.api.to.StorageFilerTO; -import com.cloud.storage.Storage; -import com.cloud.storage.StoragePool; -import com.cloud.storage.StoragePoolStatus; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import com.cloud.agent.api.CheckNetworkAnswer; import com.cloud.agent.api.CheckNetworkCommand; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; +import com.cloud.agent.api.storage.ResizeVolumeCommand; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.storage.Storage; +import com.cloud.storage.StoragePool; +import com.cloud.storage.StoragePoolStatus; public class CheckNetworkAnswerTest { CheckNetworkCommand cnc; diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java index 1934210896b..d266eb3aabe 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java @@ -35,10 +35,12 @@ import com.cloud.resource.ResourceState; public class CheckOnHostCommandTest { public Host host = new Host() { + @Override public Status getState() { return Status.Up; }; + @Override public long getId() { return 101L; }; @@ -48,14 +50,17 @@ public class CheckOnHostCommandTest { return "101"; } + @Override public String getName() { return "hostName"; }; + @Override public Type getType() { return Host.Type.Storage; }; + @Override public Date getCreated() { Date date = null; try { @@ -66,62 +71,77 @@ public class CheckOnHostCommandTest { return date; } + @Override public Status getStatus() { return Status.Up; }; + @Override public String getPrivateIpAddress() { return "10.1.1.1"; }; + @Override public String getStorageIpAddress() { return "10.1.1.2"; }; + @Override public String getGuid() { return "bed9f83e-cac3-11e1-ac8a-0050568b007e"; }; + @Override public Long getTotalMemory() { return 100000000000L; } + @Override public Integer getCpuSockets() { return 1; }; + @Override public Integer getCpus() { return 16; }; + @Override public Long getSpeed() { return 2000000000L; }; + @Override public Integer getProxyPort() { return 22; }; + @Override public Long getPodId() { return 16L; }; + @Override public long getDataCenterId() { return 17L; }; + @Override public String getParent() { return "parent"; }; + @Override public String getStorageIpAddressDeux() { return "10.1.1.3"; }; + @Override public HypervisorType getHypervisorType() { return HypervisorType.XenServer; }; + @Override public Date getDisconnectedOn() { Date date = null; try { @@ -132,26 +152,32 @@ public class CheckOnHostCommandTest { return date; } + @Override public String getVersion() { return "4.0.1"; }; + @Override public long getTotalSize() { return 100000000000L; }; + @Override public String getCapabilities() { return "capabilities"; }; + @Override public long getLastPinged() { return 1L; }; + @Override public Long getManagementServerId() { return 2L; }; + @Override public Date getRemoved() { Date date = null; try { @@ -162,54 +188,67 @@ public class CheckOnHostCommandTest { return date; }; + @Override public Long getClusterId() { return 3L; }; + @Override public String getPublicIpAddress() { return "10.1.1.4"; }; + @Override public String getPublicNetmask() { return "255.255.255.8"; }; + @Override public String getPrivateNetmask() { return "255.255.255.16"; }; + @Override public String getStorageNetmask() { return "255.255.255.24"; }; + @Override public String getStorageMacAddress() { return "01:f4:17:38:0e:26"; }; + @Override public String getPublicMacAddress() { return "02:f4:17:38:0e:26"; }; + @Override public String getPrivateMacAddress() { return "03:f4:17:38:0e:26"; }; + @Override public String getStorageNetmaskDeux() { return "255.255.255.25"; }; + @Override public String getStorageMacAddressDeux() { return "01:f4:17:38:0e:27"; }; + @Override public String getHypervisorVersion() { return "1.2.3.0"; }; + @Override public boolean isInMaintenanceStates() { return false; }; + @Override public ResourceState getResourceState() { return ResourceState.Enabled; }; diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java index c915229b0b0..8339a98b9f7 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java @@ -35,22 +35,27 @@ import com.cloud.storage.StoragePoolStatus; public class SnapshotCommandTest { public StoragePool pool = new StoragePool() { + @Override public long getId() { return 1L; }; + @Override public String getName() { return "name"; }; + @Override public String getUuid() { return "bed9f83e-cac3-11e1-ac8a-0050568b007e"; }; + @Override public StoragePoolType getPoolType() { return StoragePoolType.Filesystem; }; + @Override public Date getCreated() { Date date = null; try { @@ -61,58 +66,72 @@ public class SnapshotCommandTest { return date; } + @Override public Date getUpdateTime() { return new Date(); }; + @Override public long getDataCenterId() { return 0L; }; + @Override public long getCapacityBytes() { return 0L; }; + @Override public long getUsedBytes() { return 0L; }; + @Override public Long getCapacityIops() { return 0L; }; + @Override public Long getClusterId() { return 0L; }; + @Override public String getHostAddress() { return "hostAddress"; }; + @Override public String getPath() { return "path"; }; + @Override public String getUserInfo() { return "userInfo"; }; + @Override public boolean isShared() { return false; }; + @Override public boolean isLocal() { return false; }; + @Override public StoragePoolStatus getStatus() { return StoragePoolStatus.Up; }; + @Override public int getPort() { return 25; }; + @Override public Long getPodId() { return 0L; } diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java index 18aaafe939f..67578709c9b 100644 --- a/engine/api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/api/src/com/cloud/vm/VirtualMachineManager.java @@ -50,7 +50,7 @@ import com.cloud.utils.fsm.NoTransitionException; public interface VirtualMachineManager extends Manager { static final ConfigKey ExecuteInSequence = new ConfigKey("Advanced", Boolean.class, "execute.in.sequence.hypervisor.commands", "false", "If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the agent side." - + " If set to false, these commands become asynchronous. Default value is false.", true); + + " If set to false, these commands become asynchronous. Default value is false.", true); public interface Topics { public static final String VM_POWER_STATE = "vm.powerstate"; @@ -78,8 +78,8 @@ public interface VirtualMachineManager extends Manager { LinkedHashMap dataDiskOfferings, LinkedHashMap auxiliaryNetworks, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException; - void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, LinkedHashMap networkProfiles, - DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException; + void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, + LinkedHashMap networkProfiles, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException; void start(String vmUuid, Map params); @@ -109,7 +109,8 @@ public interface VirtualMachineManager extends Manager { void migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException; - void migrateWithStorage(String vmUuid, long srcId, long destId, Map volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException; + void migrateWithStorage(String vmUuid, long srcId, long destId, Map volumeToPool) throws ResourceUnavailableException, + ConcurrentOperationException; void reboot(String vmUuid, Map params) throws InsufficientCapacityException, ResourceUnavailableException; diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java index e416503fc38..773c683ebf5 100755 --- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java @@ -90,7 +90,8 @@ public interface VirtualMachineEntity extends CloudStackEntity { * @param exclude list of areas to exclude * @return a reservation id */ - String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException; + String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, + ResourceUnavailableException; /** * Migrate this VM to a certain destination. diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java index efdb6753392..bc532c30f29 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api; import javax.ws.rs.GET; - import javax.ws.rs.POST; import javax.ws.rs.Produces; diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java index f5c95530838..059b33041c8 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java @@ -20,7 +20,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api; import java.util.List; -import com.cloud.dc.Pod; import com.cloud.org.Cluster; import com.cloud.org.Grouping.AllocationState; diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java index d36cd7987db..7891b90e2aa 100755 --- a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; /** * All entities returned by the Cloud Orchestration Platform must implement diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java index ee28f3c86e7..fc196e24568 100755 --- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java @@ -74,9 +74,11 @@ public interface NetworkOrchestrationService { throws ConcurrentOperationException; List setupNetwork(Account owner, NetworkOffering offering, Network predefined, DeploymentPlan plan, String name, String displayText, - boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException; + boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled) + throws ConcurrentOperationException; - void allocate(VirtualMachineProfile vm, LinkedHashMap networks) throws InsufficientCapacityException, ConcurrentOperationException; + void allocate(VirtualMachineProfile vm, LinkedHashMap networks) throws InsufficientCapacityException, + ConcurrentOperationException; void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException; @@ -89,8 +91,8 @@ public interface NetworkOrchestrationService { List getNicProfiles(VirtualMachine vm); - Pair implementNetwork(long networkId, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException; + Pair implementNetwork(long networkId, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; /** * prepares vm nic change for migration @@ -191,8 +193,8 @@ public interface NetworkOrchestrationService { boolean shutdownNetworkElementsAndResources(ReservationContext context, boolean b, Network network); - void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById) throws ConcurrentOperationException, - InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException; + void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById) + throws ConcurrentOperationException, InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException; Map finalizeServicesAndProvidersForNetwork(NetworkOffering offering, Long physicalNetworkId); diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java index a7df43731b8..7379ed690a6 100644 --- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java @@ -52,8 +52,8 @@ import com.cloud.vm.VirtualMachineProfile; * to provision volumes. */ public interface VolumeOrchestrationService { - VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType) throws ConcurrentOperationException, - StorageUnavailableException; + VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType) + throws ConcurrentOperationException, StorageUnavailableException; Volume allocateDuplicateVolume(Volume oldVol, Long templateId); @@ -87,7 +87,8 @@ public interface VolumeOrchestrationService { boolean canVmRestartOnAnotherServer(long vmId); - DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, Account owner); + DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, + Account owner); String getVmNameFromVolumeId(long volumeId); diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java index 4e5521728ee..93f969f7a1c 100755 --- a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java @@ -61,15 +61,16 @@ public interface OrchestrationService { @POST @Path("/createvm") VirtualMachineEntity createVirtualMachine(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("template-id") String templateId, - @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("cpu") int cpu, - @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, @QueryParam("compute-tags") List computeTags, - @QueryParam("root-disk-tags") List rootDiskTags, @QueryParam("network-nic-map") Map networkNicMap, - @QueryParam("deploymentplan") DeploymentPlan plan, @QueryParam("root-disk-size") Long rootDiskSize) throws InsufficientCapacityException; + @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, + @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, + @QueryParam("compute-tags") List computeTags, @QueryParam("root-disk-tags") List rootDiskTags, + @QueryParam("network-nic-map") Map networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan, + @QueryParam("root-disk-size") Long rootDiskSize) throws InsufficientCapacityException; @POST VirtualMachineEntity createVirtualMachineFromScratch(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("iso-id") String isoId, - @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("os") String os, - @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, + @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, + @QueryParam("os") String os, @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, @QueryParam("compute-tags") List computeTags, @QueryParam("root-disk-tags") List rootDiskTags, @QueryParam("network-nic-map") Map networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan) throws InsufficientCapacityException; diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java index f73d6aaf8af..3d73721c74d 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreDriver.java @@ -18,12 +18,13 @@ */ package org.apache.cloudstack.engine.subsystem.api.storage; -import com.cloud.agent.api.to.DataStoreTO; -import com.cloud.agent.api.to.DataTO; +import java.util.Map; + import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.command.CommandResult; -import java.util.Map; +import com.cloud.agent.api.to.DataStoreTO; +import com.cloud.agent.api.to.DataTO; public interface DataStoreDriver { Map getCapabilities(); diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java index d25e10ed34a..d643d7fab78 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProviderManager.java @@ -18,8 +18,6 @@ */ package org.apache.cloudstack.engine.subsystem.api.storage; -import java.util.List; - import com.cloud.storage.DataStoreProviderApiService; import com.cloud.utils.component.Manager; diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java index 61c900614d0..b21616a5094 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java @@ -44,6 +44,14 @@ public interface ObjectInDataStoreStateMachine extends StateObject Wait = new ConfigKey("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return", true); + static final ConfigKey Wait = new ConfigKey("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return", + true); public enum TapAgentsAction { Add, Del, Contains, diff --git a/engine/components-api/src/com/cloud/alert/AlertManager.java b/engine/components-api/src/com/cloud/alert/AlertManager.java index 8b221913012..a00f3bb3177 100755 --- a/engine/components-api/src/com/cloud/alert/AlertManager.java +++ b/engine/components-api/src/com/cloud/alert/AlertManager.java @@ -52,13 +52,15 @@ public interface AlertManager extends Manager { public static final short ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED = 26; // Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only static final ConfigKey StorageCapacityThreshold = new ConfigKey(Double.class, "cluster.storage.capacity.notificationthreshold", "Alert", "0.75", - "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", true, ConfigKey.Scope.Cluster, null); + "Percentage (as a value between 0 and 1) of storage utilization above which alerts will be sent about low storage available.", true, ConfigKey.Scope.Cluster, + null); static final ConfigKey CPUCapacityThreshold = new ConfigKey(Double.class, "cluster.cpu.allocated.capacity.notificationthreshold", "Alert", "0.75", "Percentage (as a value between 0 and 1) of cpu utilization above which alerts will be sent about low cpu available.", true, ConfigKey.Scope.Cluster, null); - static final ConfigKey MemoryCapacityThreshold = new ConfigKey(Double.class, "cluster.memory.allocated.capacity.notificationthreshold", "Alert", "0.75", - "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", true, ConfigKey.Scope.Cluster, null); - static final ConfigKey StorageAllocatedCapacityThreshold = new ConfigKey(Double.class, "cluster.storage.allocated.capacity.notificationthreshold", "Alert", - "0.75", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", true, + static final ConfigKey MemoryCapacityThreshold = new ConfigKey(Double.class, "cluster.memory.allocated.capacity.notificationthreshold", "Alert", + "0.75", "Percentage (as a value between 0 and 1) of memory utilization above which alerts will be sent about low memory available.", true, + ConfigKey.Scope.Cluster, null); + static final ConfigKey StorageAllocatedCapacityThreshold = new ConfigKey(Double.class, "cluster.storage.allocated.capacity.notificationthreshold", + "Alert", "0.75", "Percentage (as a value between 0 and 1) of allocated storage utilization above which alerts will be sent about low storage available.", true, ConfigKey.Scope.Cluster, null); void clearAlert(short alertType, long dataCenterId, long podId); diff --git a/engine/components-api/src/com/cloud/capacity/CapacityManager.java b/engine/components-api/src/com/cloud/capacity/CapacityManager.java index 6032261aa0f..4332ede20dd 100755 --- a/engine/components-api/src/com/cloud/capacity/CapacityManager.java +++ b/engine/components-api/src/com/cloud/capacity/CapacityManager.java @@ -41,12 +41,18 @@ public interface CapacityManager { static final ConfigKey MemOverprovisioningFactor = new ConfigKey(Float.class, MemOverprovisioningFactorCK, "Advanced", "1.0", "Used for memory overprovisioning calculation", true, ConfigKey.Scope.Cluster, null); static final ConfigKey StorageCapacityDisableThreshold = new ConfigKey("Alert", Double.class, StorageCapacityDisableThresholdCK, "0.85", - "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", true, ConfigKey.Scope.Zone); + "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", true, + ConfigKey.Scope.Zone); static final ConfigKey StorageOverprovisioningFactor = new ConfigKey("Storage", Double.class, StorageOverprovisioningFactorCK, "2", "Used for storage overprovisioning calculation; available storage will be (actualStorageSize * storage.overprovisioning.factor)", true, ConfigKey.Scope.Zone); - static final ConfigKey StorageAllocatedCapacityDisableThreshold = new ConfigKey("Alert", Double.class, StorageAllocatedCapacityDisableThresholdCK, "0.85", - "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.", true, - ConfigKey.Scope.Zone); + static final ConfigKey StorageAllocatedCapacityDisableThreshold = + new ConfigKey( + "Alert", + Double.class, + StorageAllocatedCapacityDisableThresholdCK, + "0.85", + "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.", + true, ConfigKey.Scope.Zone); public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId); diff --git a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java index 3c538632d4f..13ca3f9bf0f 100755 --- a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java +++ b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java @@ -39,10 +39,7 @@ import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.Availability; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.org.Grouping.AllocationState; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.DiskOfferingVO; import com.cloud.user.Account; -import com.cloud.vm.VirtualMachine; /** * ConfigurationManager handles adding pods/zones, changing IP ranges, enabling external firewalls, and editing @@ -137,8 +134,8 @@ public interface ConfigurationManager { * (true if it is ok to not validate that gateway IP address overlap with Start/End IP of the POD) * @return Pod */ - HostPodVO - createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationState, boolean skipGatewayOverlapCheck); + HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationState, + boolean skipGatewayOverlapCheck); /** * Creates a new zone @@ -162,8 +159,9 @@ public interface ConfigurationManager { * @throws * @throws */ - DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, Long domainId, - NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1, String ip6Dns2); + DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, + Long domainId, NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1, + String ip6Dns2); /** * Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated @@ -214,9 +212,9 @@ public interface ConfigurationManager { boolean conserveMode, Map> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent, Map details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive); - Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId, String startIP, String endIP, String vlanGateway, - String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) throws InsufficientCapacityException, - ConcurrentOperationException, InvalidParameterValueException; + Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId, String startIP, String endIP, + String vlanGateway, String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) + throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException; void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException; diff --git a/engine/components-api/src/com/cloud/event/UsageEventUtils.java b/engine/components-api/src/com/cloud/event/UsageEventUtils.java index 2b7cf3ce007..e71afb015db 100644 --- a/engine/components-api/src/com/cloud/event/UsageEventUtils.java +++ b/engine/components-api/src/com/cloud/event/UsageEventUtils.java @@ -25,7 +25,6 @@ import java.util.Map; import javax.annotation.PostConstruct; import javax.inject.Inject; -import com.cloud.event.dao.UsageEventDetailsDao; import org.apache.log4j.Logger; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -39,8 +38,6 @@ import com.cloud.event.dao.UsageEventDao; import com.cloud.user.Account; import com.cloud.user.dao.AccountDao; import com.cloud.utils.component.ComponentContext; -import org.springframework.beans.factory.annotation.Autowire; -import org.springframework.beans.factory.annotation.Autowired; public class UsageEventUtils { @@ -67,14 +64,14 @@ public class UsageEventUtils { _dcDao = dcDao; } - public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, Long size, - String entityType, String entityUUID) { + public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, + Long size, String entityType, String entityUUID) { saveUsageEvent(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, size); publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID); } - public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, Long size, - Long virtualSize, String entityType, String entityUUID) { + public static void publishUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, + Long size, Long virtualSize, String entityType, String entityUUID) { saveUsageEvent(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, size, virtualSize); publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID); } @@ -107,8 +104,8 @@ public class UsageEventUtils { publishUsageEvent(usageType, accountId, zoneId, entityType, entityUUID); } - private static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, String resourceType, - Map details) { + private static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, + String resourceType, Map details) { UsageEventVO usageEvent = new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, resourceType); _usageEventDao.persist(usageEvent); _usageEventDao.saveDetails(usageEvent.getId(), details); @@ -127,11 +124,13 @@ public class UsageEventUtils { _usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName)); } - public static void saveUsageEvent(String usageType, long accountId, long zoneId, long ipAddressId, String ipAddress, boolean isSourceNat, String guestType, boolean isSystem) { + public static void saveUsageEvent(String usageType, long accountId, long zoneId, long ipAddressId, String ipAddress, boolean isSourceNat, String guestType, + boolean isSystem) { _usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, ipAddressId, ipAddress, isSourceNat, guestType, isSystem)); } - public static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, String resourceType) { + public static void saveUsageEvent(String usageType, long accountId, long zoneId, long resourceId, String resourceName, Long offeringId, Long templateId, + String resourceType) { _usageEventDao.persist(new UsageEventVO(usageType, accountId, zoneId, resourceId, resourceName, offeringId, templateId, resourceType)); } diff --git a/engine/components-api/src/com/cloud/network/IpAddressManager.java b/engine/components-api/src/com/cloud/network/IpAddressManager.java index 24ece3467fd..e7061f9ecd9 100644 --- a/engine/components-api/src/com/cloud/network/IpAddressManager.java +++ b/engine/components-api/src/com/cloud/network/IpAddressManager.java @@ -40,8 +40,8 @@ import com.cloud.vm.VirtualMachineProfile; public interface IpAddressManager { static final String UseSystemPublicIpsCK = "use.system.public.ips"; static final ConfigKey UseSystemPublicIps = new ConfigKey("Advanced", Boolean.class, UseSystemPublicIpsCK, "true", - "If true, when account has dedicated public ip range(s), once the ips dedicated to the account have been consumed ips will be acquired from the system pool", true, - ConfigKey.Scope.Account); + "If true, when account has dedicated public ip range(s), once the ips dedicated to the account have been consumed ips will be acquired from the system pool", + true, ConfigKey.Scope.Account); /** * Assigns a new public ip address. @@ -73,7 +73,8 @@ public interface IpAddressManager { */ boolean disassociatePublicIpAddress(long id, long userId, Account caller); - boolean applyRules(List rules, FirewallRule.Purpose purpose, NetworkRuleApplier applier, boolean continueOnError) throws ResourceUnavailableException; + boolean applyRules(List rules, FirewallRule.Purpose purpose, NetworkRuleApplier applier, boolean continueOnError) + throws ResourceUnavailableException; /** * @throws ResourceAllocationException TODO @@ -93,7 +94,8 @@ public interface IpAddressManager { boolean applyIpAssociations(Network network, boolean continueOnError) throws ResourceUnavailableException; - boolean applyIpAssociations(Network network, boolean rulesRevoked, boolean continueOnError, List publicIps) throws ResourceUnavailableException; + boolean applyIpAssociations(Network network, boolean rulesRevoked, boolean continueOnError, List publicIps) + throws ResourceUnavailableException; IPAddressVO markIpAsUnavailable(long addrId); @@ -125,13 +127,13 @@ public interface IpAddressManager { IPAddressVO associateIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException; - IpAddress allocatePortableIp(Account ipOwner, Account caller, long dcId, Long networkId, Long vpcID) throws ConcurrentOperationException, ResourceAllocationException, - InsufficientAddressCapacityException; + IpAddress allocatePortableIp(Account ipOwner, Account caller, long dcId, Long networkId, Long vpcID) throws ConcurrentOperationException, + ResourceAllocationException, InsufficientAddressCapacityException; boolean releasePortableIpAddress(long addrId); - IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, ResourceUnavailableException, - InsufficientAddressCapacityException, ConcurrentOperationException; + IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, + ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException; IPAddressVO disassociatePortableIPToGuestNetwork(long ipAddrId, long networkId) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException; @@ -159,11 +161,11 @@ public interface IpAddressManager { PublicIp assignDedicateIpAddress(Account owner, Long guestNtwkId, Long vpcId, long dcId, boolean isSourceNat) throws ConcurrentOperationException, InsufficientAddressCapacityException; - IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone) throws ConcurrentOperationException, ResourceAllocationException, - InsufficientAddressCapacityException; + IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone) throws ConcurrentOperationException, + ResourceAllocationException, InsufficientAddressCapacityException; - PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List vlanDbIds, Long networkId, String requestedIp, boolean isSystem) - throws InsufficientAddressCapacityException; + PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List vlanDbIds, Long networkId, String requestedIp, + boolean isSystem) throws InsufficientAddressCapacityException; int getRuleCountForIp(Long addressId, FirewallRule.Purpose purpose, FirewallRule.State state); diff --git a/engine/components-api/src/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/com/cloud/network/NetworkStateListener.java index 4f02dc2f2c4..12190613ce8 100644 --- a/engine/components-api/src/com/cloud/network/NetworkStateListener.java +++ b/engine/components-api/src/com/cloud/network/NetworkStateListener.java @@ -75,8 +75,8 @@ public class NetworkStateListener implements StateListener eventDescription = new HashMap(); eventDescription.put("resource", resourceName); eventDescription.put("id", vo.getUuid()); diff --git a/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java b/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java index 05eb7791a8a..6b3ae02da02 100644 --- a/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java +++ b/engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java @@ -24,8 +24,8 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; -import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRule.LbSslCert; +import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.rules.LbStickinessMethod; import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.LoadBalancerContainer.Scheme; diff --git a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java index 0f6d0ce8b31..6085b4b4341 100644 --- a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java +++ b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java @@ -44,8 +44,8 @@ public interface FirewallManager extends FirewallService { */ void detectRulesConflict(FirewallRule newRule) throws NetworkRuleConflictException; - void validateFirewallRule(Account caller, IPAddressVO ipAddress, Integer portStart, Integer portEnd, String proto, Purpose purpose, FirewallRuleType type, Long networkid, - FirewallRule.TrafficType trafficType); + void validateFirewallRule(Account caller, IPAddressVO ipAddress, Integer portStart, Integer portEnd, String proto, Purpose purpose, FirewallRuleType type, + Long networkid, FirewallRule.TrafficType trafficType); boolean applyRules(List rules, boolean continueOnError, boolean updateRulesInDB) throws ResourceUnavailableException; @@ -72,8 +72,8 @@ public interface FirewallManager extends FirewallService { // FirewallRule.FirewallRuleType type, Long networkId, FirewallRule.TrafficType traffictype) // throws NetworkRuleConflictException; - FirewallRule createRuleForAllCidrs(long ipAddrId, Account caller, Integer startPort, Integer endPort, String protocol, Integer icmpCode, Integer icmpType, Long relatedRuleId, - long networkId) throws NetworkRuleConflictException; + FirewallRule createRuleForAllCidrs(long ipAddrId, Account caller, Integer startPort, Integer endPort, String protocol, Integer icmpCode, Integer icmpType, + Long relatedRuleId, long networkId) throws NetworkRuleConflictException; boolean revokeAllFirewallRulesForNetwork(long networkId, long userId, Account caller) throws ResourceUnavailableException; diff --git a/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java b/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java index 25dff5265e8..06952fc2e7d 100644 --- a/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java +++ b/engine/components-api/src/com/cloud/network/vpc/NetworkACLManager.java @@ -16,11 +16,10 @@ // under the License. package com.cloud.network.vpc; +import java.util.List; + import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.dao.NetworkVO; -import com.cloud.user.Account; - -import java.util.List; public interface NetworkACLManager { diff --git a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java index 98bd8e62849..ebfa90a4466 100644 --- a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java +++ b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java @@ -106,8 +106,10 @@ public interface VpcManager { * @throws InsufficientCapacityException * @throws ResourceAllocationException */ - Network createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner, Long domainId, - PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller, Boolean displayNetworkEnabled) + Network + createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner, + Long domainId, PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller, + Boolean displayNetworkEnabled) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException; @@ -159,7 +161,8 @@ public interface VpcManager { * @param gateway * @param networkOwner TODO */ - void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, Long aclId); + void + validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, Long aclId); List getVpcPrivateGateways(long vpcId); } diff --git a/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java b/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java index 3704adfa416..b0ca283f9ed 100755 --- a/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java +++ b/engine/components-api/src/com/cloud/resource/ResourceStateAdapter.java @@ -19,9 +19,7 @@ package com.cloud.resource; import java.util.List; import java.util.Map; -import com.cloud.agent.api.StartupAnswer; import com.cloud.agent.api.StartupCommand; -import com.cloud.exception.ConnectionException; import com.cloud.host.HostVO; import com.cloud.utils.component.Adapter; @@ -55,7 +53,8 @@ public interface ResourceStateAdapter extends Adapter { public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd); - public HostVO createHostVOForDirectConnectAgent(HostVO host, final StartupCommand[] startup, ServerResource resource, Map details, List hostTags); + public HostVO createHostVOForDirectConnectAgent(HostVO host, final StartupCommand[] startup, ServerResource resource, Map details, + List hostTags); public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) throws UnableDeleteHostException; } diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java index ef7935a050e..3c31301caa7 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java @@ -32,9 +32,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + import com.cloud.agent.Listener; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthCommand; @@ -112,9 +113,9 @@ public abstract class AgentAttache { protected AgentManagerImpl _agentMgr; public final static String[] s_commandsAllowedInMaintenanceMode = new String[] {MaintainCommand.class.toString(), MigrateCommand.class.toString(), - StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(), - ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString(), ClusterSyncCommand.class.toString(), - CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString()}; + StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(), + ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString(), ClusterSyncCommand.class.toString(), + CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString()}; protected final static String[] s_commandsNotAllowedInConnectingMode = new String[] {StartCommand.class.toString(), CreateCommand.class.toString()}; static { Arrays.sort(s_commandsAllowedInMaintenanceMode); diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index cf850476f7e..1e8b1488c9c 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -38,12 +38,13 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -97,9 +98,8 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.QueryBuilder; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.HypervisorVersionChangedException; import com.cloud.utils.fsm.NoTransitionException; @@ -166,8 +166,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl @Inject ResourceManager _resourceMgr; - protected final ConfigKey Workers = new ConfigKey(Integer.class, "workers", "Advanced", "5", "Number of worker threads handling remote agent connections.", - false); + protected final ConfigKey Workers = new ConfigKey(Integer.class, "workers", "Advanced", "5", + "Number of worker threads handling remote agent connections.", false); protected final ConfigKey Port = new ConfigKey(Integer.class, "port", "Advanced", "8250", "Port to listen on for remote agent connections.", false); protected final ConfigKey PingInterval = new ConfigKey(Integer.class, "ping.interval", "Advanced", "60", "Interval to send application level pings to make sure the connection is still working", false); @@ -177,8 +177,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl "Seconds to wait before alerting on a disconnected agent", true); protected final ConfigKey DirectAgentLoadSize = new ConfigKey(Integer.class, "direct.agent.load.size", "Advanced", "16", "The number of direct agents to load each time", false); - protected final ConfigKey DirectAgentPoolSize = new ConfigKey(Integer.class, "direct.agent.pool.size", "Advanced", "500", "Default size for DirectAgentPool", - false); + protected final ConfigKey DirectAgentPoolSize = new ConfigKey(Integer.class, "direct.agent.pool.size", "Advanced", "500", + "Default size for DirectAgentPool", false); protected final ConfigKey DirectAgentThreadCap = new ConfigKey(Float.class, "direct.agent.thread.cap", "Advanced", "0.1", "Percentage (as a value between 0 and 1) of direct.agent.pool.size to be used as upper thread cap for a single direct agent to process requests", false); @@ -494,13 +494,13 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl if (e instanceof ConnectionException) { ConnectionException ce = (ConnectionException)e; if (ce.isSetupError()) { - s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + - e.getMessage()); + s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + + " due to " + e.getMessage()); handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true); throw ce; } else { - s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + " due to " + - e.getMessage()); + s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + + " due to " + e.getMessage()); handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true); return attache; } @@ -508,9 +508,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl handleDisconnectWithoutInvestigation(attache, Event.ShutdownRequested, true, true); throw new CloudRuntimeException("Unable to connect " + attache.getId(), e); } else { - s_logger.error( - "Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage(), - e); + s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + + " due to " + e.getMessage(), e); handleDisconnectWithoutInvestigation(attache, Event.AgentDisconnected, true, true); throw new CloudRuntimeException("Unable to connect " + attache.getId(), e); } @@ -1071,6 +1070,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl _request = request; } + @Override protected void runInContext() { _request.logD("Processing the first command "); StartupCommand[] startups = new StartupCommand[_cmds.length]; @@ -1170,7 +1170,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl } else if (cmd instanceof ShutdownCommand) { final ShutdownCommand shutdown = (ShutdownCommand)cmd; final String reason = shutdown.getReason(); - s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " + shutdown.getDetail()); + s_logger.info("Host " + attache.getId() + " has informed us that it is shutting down with reason " + reason + " and detail " + + shutdown.getDetail()); if (reason.equals(ShutdownCommand.Update)) { //disconnectWithoutInvestigation(attache, Event.UpdateNeeded); throw new CloudRuntimeException("Agent update not implemented"); @@ -1197,17 +1198,18 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl // gateway (cannot ping the default route) DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId()); HostPodVO podVO = _podDao.findById(host.getPodId()); - String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + - podVO.getName(); + String hostDesc = + "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(), "Host lost connection to gateway, " + - hostDesc, "Host [" + hostDesc + - "] lost connection to gateway (default route) and is possibly having network connection issues."); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId(), + "Host lost connection to gateway, " + hostDesc, "Host [" + hostDesc + + "] lost connection to gateway (default route) and is possibly having network connection issues."); } else { _alertMgr.clearAlert(AlertManager.ALERT_TYPE_ROUTING, host.getDataCenterId(), host.getPodId()); } } else { - s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId + "; can't find the host in the DB"); + s_logger.debug("Not processing " + PingRoutingCommand.class.getSimpleName() + " for agent id=" + cmdHostId + + "; can't find the host in the DB"); } } answer = new PingAnswer((PingCommand)cmd); @@ -1330,9 +1332,10 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl try { return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao); } catch (NoTransitionException e1) { - status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + ", mangement server id is " + msId); + status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + + ", mangement server id is " + msId); throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + - e1.getMessage()); + e1.getMessage()); } } finally { _agentStatusLock.unlock(); diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java index 68961321415..23c3f7694bc 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java @@ -20,16 +20,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.channels.SocketChannel; -import java.util.Arrays; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedList; import javax.net.ssl.SSLEngine; import org.apache.log4j.Logger; -import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; import com.cloud.agent.api.Command; import com.cloud.agent.transport.Request; @@ -71,6 +68,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout return _forward; } + @Override protected void checkAvailability(final Command[] cmds) throws AgentUnavailableException { if (_transferMode) { @@ -250,6 +248,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout _transferRequests.clear(); } + @Override public void cleanup(final Status state) { super.cleanup(state); _transferRequests.clear(); diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 93bf5ea370a..a73d5a50d9d 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -43,13 +43,16 @@ import javax.naming.ConfigurationException; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; +import org.apache.log4j.Logger; + +import com.google.gson.Gson; + import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.managed.context.ManagedContextTimerTask; import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -85,12 +88,11 @@ import com.cloud.serializer.GsonHelper; import com.cloud.utils.DateUtil; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.QueryBuilder; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.nio.Link; import com.cloud.utils.nio.Task; -import com.google.gson.Gson; @Local(value = {AgentManager.class, ClusteredAgentRebalanceService.class}) public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService { @@ -130,8 +132,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust "Enable agent load balancing between management server nodes", true); protected final ConfigKey ConnectedAgentThreshold = new ConfigKey(Double.class, "agent.load.threshold", "Advanced", "0.7", "What percentage of the agents can be held by one management server before load balancing happens", true); - protected final ConfigKey LoadSize = new ConfigKey(Integer.class, "direct.agent.load.size", "Advanced", "16", "How many agents to connect to in each round", - true); + protected final ConfigKey LoadSize = new ConfigKey(Integer.class, "direct.agent.load.size", "Advanced", "16", + "How many agents to connect to in each round", true); protected final ConfigKey ScanInterval = new ConfigKey(Integer.class, "direct.agent.scan.interval", "Advanced", "90", "Interval between scans to load agents", false, ConfigKey.Scope.Global, 1000); @@ -332,7 +334,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust HostTransferMapVO transferVO = _hostTransferDao.findById(hostId); if (transferVO != null) { if (transferVO.getFutureOwner() == _nodeId && transferVO.getState() == HostTransferState.TransferStarted) { - s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " + _nodeId); + s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + " as the host is being connected to " + + _nodeId); return true; } } @@ -342,7 +345,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust //but the host has already reconnected to the current management server if (!attache.forForward()) { s_logger.debug("Not processing " + Event.AgentDisconnected + " event for the host id=" + hostId + - " as the host is directly connected to the current management server " + _nodeId); + " as the host is directly connected to the current management server " + _nodeId); return true; } @@ -388,17 +391,17 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust protected static void logT(byte[] bytes, final String msg) { s_logger.trace("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } protected static void logD(byte[] bytes, final String msg) { s_logger.debug("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } protected static void logI(byte[] bytes, final String msg) { s_logger.info("Seq " + Request.getAgentId(bytes) + "-" + Request.getSequence(bytes) + ": MgmtId " + Request.getManagementServerId(bytes) + ": " + - (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); + (Request.isRequest(bytes) ? "Req: " : "Resp: ") + msg); } public boolean routeToPeer(String peer, byte[] bytes) { @@ -723,7 +726,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } @Override - public boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException, OperationTimedoutException { + public boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException, + OperationTimedoutException { boolean result = false; if (event == Event.RequestAgentRebalance) { return setToWaitForRebalance(agentId, currentOwnerId, futureOwnerId); @@ -790,7 +794,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } else { if (s_logger.isDebugEnabled()) { s_logger.debug("There are no hosts to rebalance in the system. Current number of active management server nodes in the system is " + allMS.size() + - "; number of managed agents is " + allManagedAgents.size()); + "; number of managed agents is " + allManagedAgents.size()); } return; } @@ -942,7 +946,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust // remove the host from re-balance list and delete from op_host_transfer DB // no need to do anything with the real attache as we haven't modified it yet Date cutTime = DateUtil.currentGMTTime(); - HostTransferMapVO transferMap = _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut)); + HostTransferMapVO transferMap = + _hostTransferDao.findActiveHostTransferMapByHostId(hostId, new Date(cutTime.getTime() - rebalanceTimeOut)); if (transferMap == null) { s_logger.debug("Timed out waiting for the host id=" + hostId + " to be ready to transfer, skipping rebalance for the host"); @@ -960,7 +965,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust ManagementServerHostVO ms = _mshostDao.findByMsid(transferMap.getFutureOwner()); if (ms != null && ms.getState() != ManagementServerHost.State.Up) { - s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + ", skipping rebalance for the host"); + s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + + ", skipping rebalance for the host"); iterator.remove(); _hostTransferDao.completeAgentTransfer(hostId); continue; @@ -977,7 +983,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } else { s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + - " and listener queue size is " + attache.getNonRecurringListenersSize()); + " and listener queue size is " + attache.getNonRecurringListenersSize()); } } } else { @@ -1044,7 +1050,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust if (result) { if (s_logger.isDebugEnabled()) { s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + " as a part of rebalance process"); } result = loadDirectlyConnectedHost(host, true); } else { @@ -1053,16 +1059,16 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } catch (Exception ex) { s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process due to:", ex); + " as a part of rebalance process due to:", ex); result = false; } if (result) { s_logger.debug("Successfully loaded directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + " as a part of rebalance process"); } else { s_logger.warn("Failed to load directly connected host " + host.getId() + "(" + host.getName() + ") to the management server " + _nodeId + - " as a part of rebalance process"); + " as a part of rebalance process"); } } @@ -1093,8 +1099,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust //2) Get all transfer requests and route them to peer Request requestToTransfer = forwardAttache.getRequestToTransfer(); while (requestToTransfer != null) { - s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " + _nodeId + " to " + - futureOwnerId); + s_logger.debug("Forwarding request " + requestToTransfer.getSequence() + " held in transfer attache " + hostId + " from the management server " + + _nodeId + " to " + futureOwnerId); boolean routeResult = routeToPeer(Long.toString(futureOwnerId), requestToTransfer.getBytes()); if (!routeResult) { logD(requestToTransfer.getBytes(), "Failed to route request to peer"); @@ -1148,7 +1154,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust s_logger.warn("Attache for the agent " + hostId + " no longer exists on management server " + _nodeId + ", can't start host rebalancing"); } else { s_logger.warn("Attache for the agent " + hostId + " has request queue size= " + attache.getQueueSize() + " and listener queue size " + - attache.getNonRecurringListenersSize() + ", can't start host rebalancing"); + attache.getNonRecurringListenersSize() + ", can't start host rebalancing"); } return false; } @@ -1205,7 +1211,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust // Scheduling host scan task in peer MS is a best effort operation during host add, regular host scan // happens at fixed intervals anyways. So handling any exceptions that may be thrown s_logger.warn("Exception happened while trying to schedule host scan task on mgmt server " + _clusterMgr.getSelfPeerName() + - ", ignoring as regular host scan happens at fixed interval anyways", e); + ", ignoring as regular host scan happens at fixed interval anyways", e); return null; } @@ -1321,15 +1327,15 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust String jsonReturn = _gson.toJson(answers); if (s_logger.isDebugEnabled()) { - s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) + - " ms, return result: " + jsonReturn); + s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + + (System.currentTimeMillis() - startTick) + " ms, return result: " + jsonReturn); } return jsonReturn; } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + (System.currentTimeMillis() - startTick) + - " ms, return null result"); + s_logger.debug("Completed dispatching -> " + pdu.getAgentId() + ", json: " + pdu.getJsonPackage() + " in " + + (System.currentTimeMillis() - startTick) + " ms, return null result"); } } } catch (AgentUnavailableException e) { @@ -1379,12 +1385,12 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust double load = managedHostsCount / allHostsCount; if (load >= ConnectedAgentThreshold.value()) { s_logger.debug("Scheduling agent rebalancing task as the average agent load " + load + " is more than the threshold " + - ConnectedAgentThreshold.value()); + ConnectedAgentThreshold.value()); scheduleRebalanceAgents(); _agentLbHappened = true; } else { s_logger.debug("Not scheduling agent rebalancing task as the averages load " + load + " is less than the threshold " + - ConnectedAgentThreshold.value()); + ConnectedAgentThreshold.value()); } } } diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java index 0f235fab388..d7c082795e9 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredDirectAgentAttache.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.agent.manager; -import com.cloud.agent.AgentManager; import com.cloud.agent.transport.Request; import com.cloud.agent.transport.Response; import com.cloud.exception.AgentUnavailableException; @@ -28,7 +27,8 @@ public class ClusteredDirectAgentAttache extends DirectAgentAttache implements R private final ClusteredAgentManagerImpl _mgr; private final long _nodeId; - public ClusteredDirectAgentAttache(AgentManagerImpl agentMgr, long id, String name, long mgmtId, ServerResource resource, boolean maintenance, ClusteredAgentManagerImpl mgr) { + public ClusteredDirectAgentAttache(AgentManagerImpl agentMgr, long id, String name, long mgmtId, ServerResource resource, boolean maintenance, + ClusteredAgentManagerImpl mgr) { super(agentMgr, id, name, resource, maintenance, mgr); _mgr = mgr; _nodeId = mgmtId; diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java index 29b146a4081..ef002d0f3eb 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java @@ -21,9 +21,10 @@ import java.util.List; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.CronCommand; @@ -133,7 +134,8 @@ public class DirectAgentAttache extends AgentAttache { protected synchronized void runInContext() { try { if (_outstandingTaskCount.incrementAndGet() > _agentMgr.getDirectAgentThreadCap()) { - s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + "), bailing out"); + s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + + "), bailing out"); return; } @@ -195,7 +197,8 @@ public class DirectAgentAttache extends AgentAttache { long seq = _req.getSequence(); try { if (_outstandingTaskCount.incrementAndGet() > _agentMgr.getDirectAgentThreadCap()) { - s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + "), bailing out"); + s_logger.warn("Task execution for direct attache(" + _id + ") has reached maximum outstanding limit(" + _agentMgr.getDirectAgentThreadCap() + + "), bailing out"); bailout(); return; } diff --git a/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java b/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java index 9d339a11ef7..2146b00f172 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java +++ b/engine/orchestration/src/com/cloud/agent/manager/SynchronousListener.java @@ -116,7 +116,8 @@ public class SynchronousListener implements Listener { profiler.stop(); if (s_logger.isTraceEnabled()) { - s_logger.trace("Synchronized command - sending completed, time: " + profiler.getDuration() + ", answer: " + (_answers != null ? _answers[0].toString() : "null")); + s_logger.trace("Synchronized command - sending completed, time: " + profiler.getDuration() + ", answer: " + + (_answers != null ? _answers[0].toString() : "null")); } return _answers; } diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java index aa30ab012be..be75cf2bd18 100755 --- a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java +++ b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java @@ -55,7 +55,7 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements if (allHosts.size() <= avLoad) { s_logger.debug("Agent load = " + allHosts.size() + " for management server " + msId + " doesn't exceed average system agent load = " + avLoad + - "; so it doesn't participate in agent rebalancing process"); + "; so it doesn't participate in agent rebalancing process"); return null; } @@ -65,7 +65,8 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements List directHosts = sc.list(); if (directHosts.isEmpty()) { - s_logger.debug("No direct agents in status " + Status.Up + " exist for the management server " + msId + "; so it doesn't participate in agent rebalancing process"); + s_logger.debug("No direct agents in status " + Status.Up + " exist for the management server " + msId + + "; so it doesn't participate in agent rebalancing process"); return null; } @@ -91,7 +92,7 @@ public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements List hostsToReturn = new ArrayList(); s_logger.debug("Management server " + msId + " can give away " + hostsToGive + " as it currently owns " + allHosts.size() + - " and the average agent load in the system is " + avLoad + "; finalyzing list of hosts to give away..."); + " and the average agent load in the system is " + avLoad + "; finalyzing list of hosts to give away..."); for (Long cluster : hostToClusterMap.keySet()) { List hostsInCluster = hostToClusterMap.get(cluster); hostsLeft = hostsLeft - hostsInCluster.size(); diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index b3cf81e10a4..187c701993d 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -282,7 +282,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac Map _vmGurus = new HashMap(); protected StateMachine2 _stateMachine; - static final ConfigKey StartRetry = new ConfigKey("Advanced", Integer.class, "start.retry", "10", "Number of times to retry create and start commands", true); + static final ConfigKey StartRetry = new ConfigKey("Advanced", Integer.class, "start.retry", "10", + "Number of times to retry create and start commands", true); static final ConfigKey VmOpWaitInterval = new ConfigKey("Advanced", Integer.class, "vm.op.wait.interval", "120", "Time (in seconds) to wait before checking if a previous operation has succeeded", true); @@ -296,8 +297,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac "Time (in seconds) to wait before cancelling a operation", false); static final ConfigKey VmDestroyForcestop = new ConfigKey("Advanced", Boolean.class, "vm.destroy.forcestop", "false", "On destroy, force-stop takes this value ", true); - static final ConfigKey ClusterDeltaSyncInterval = new ConfigKey("Advanced", Integer.class, "sync.interval", "60", "Cluster Delta sync interval in seconds", - false); + static final ConfigKey ClusterDeltaSyncInterval = new ConfigKey("Advanced", Integer.class, "sync.interval", "60", + "Cluster Delta sync interval in seconds", false); ScheduledExecutorService _executor = null; @@ -312,9 +313,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override @DB - public void allocate(String vmInstanceName, final VirtualMachineTemplate template, ServiceOffering serviceOffering, final Pair rootDiskOffering, - LinkedHashMap dataDiskOfferings, final LinkedHashMap auxiliaryNetworks, DeploymentPlan plan, - HypervisorType hyperType) throws InsufficientCapacityException { + public void allocate(String vmInstanceName, final VirtualMachineTemplate template, ServiceOffering serviceOffering, + final Pair rootDiskOffering, LinkedHashMap dataDiskOfferings, + final LinkedHashMap auxiliaryNetworks, DeploymentPlan plan, HypervisorType hyperType) + throws InsufficientCapacityException { VMInstanceVO vm = _vmDao.findVMByInstanceName(vmInstanceName); final Account owner = _entityMgr.findById(Account.class, vm.getAccountId()); @@ -329,7 +331,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } assert (plan.getClusterId() == null && plan.getPoolId() == null) : "We currently don't support cluster and pool preset yet"; final VMInstanceVO vmFinal = _vmDao.persist(vm); - final LinkedHashMap dataDiskOfferingsFinal = dataDiskOfferings == null ? new LinkedHashMap() : dataDiskOfferings; + final LinkedHashMap dataDiskOfferingsFinal = + dataDiskOfferings == null ? new LinkedHashMap() : dataDiskOfferings; final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmFinal, template, serviceOffering, null, null); @@ -370,8 +373,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } @Override - public void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, LinkedHashMap networks, - DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException { + public void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, + LinkedHashMap networks, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException { allocate(vmInstanceName, template, serviceOffering, new Pair(serviceOffering, null), null, networks, plan, hyperType); } @@ -550,8 +553,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } @DB - protected Ternary changeToStartState(VirtualMachineGuru vmGuru, final VMInstanceVO vm, final User caller, final Account account) - throws ConcurrentOperationException { + protected Ternary changeToStartState(VirtualMachineGuru vmGuru, final VMInstanceVO vm, final User caller, + final Account account) throws ConcurrentOperationException { long vmId = vm.getId(); ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Starting, vm.getType(), vm.getId()); @@ -559,23 +562,24 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac while (retry-- != 0) { try { final ItWorkVO workFinal = work; - Ternary result = Transaction.execute(new TransactionCallbackWithException, NoTransitionException>() { - @Override - public Ternary doInTransaction(TransactionStatus status) throws NoTransitionException { - Journal journal = new Journal.LogJournal("Creating " + vm, s_logger); - ItWorkVO work = _workDao.persist(workFinal); - ReservationContextImpl context = new ReservationContextImpl(work.getId(), journal, caller, account); + Ternary result = + Transaction.execute(new TransactionCallbackWithException, NoTransitionException>() { + @Override + public Ternary doInTransaction(TransactionStatus status) throws NoTransitionException { + Journal journal = new Journal.LogJournal("Creating " + vm, s_logger); + ItWorkVO work = _workDao.persist(workFinal); + ReservationContextImpl context = new ReservationContextImpl(work.getId(), journal, caller, account); - if (stateTransitTo(vm, Event.StartRequested, null, work.getId())) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Successfully transitioned to start state for " + vm + " reservation id = " + work.getId()); + if (stateTransitTo(vm, Event.StartRequested, null, work.getId())) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Successfully transitioned to start state for " + vm + " reservation id = " + work.getId()); + } + return new Ternary(vm, context, work); } - return new Ternary(vm, context, work); - } - return new Ternary(null, null, work); - } - }); + return new Ternary(null, null, work); + } + }); work = result.third(); if (result.first() != null) @@ -681,11 +685,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null, ctx); if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) { if (s_logger.isDebugEnabled()) { - s_logger.debug("advanceStart: DeploymentPlan is provided, using dcId:" + planToDeploy.getDataCenterId() + ", podId: " + planToDeploy.getPodId() + ", clusterId: " + - planToDeploy.getClusterId() + ", hostId: " + planToDeploy.getHostId() + ", poolId: " + planToDeploy.getPoolId()); + s_logger.debug("advanceStart: DeploymentPlan is provided, using dcId:" + planToDeploy.getDataCenterId() + ", podId: " + planToDeploy.getPodId() + + ", clusterId: " + planToDeploy.getClusterId() + ", hostId: " + planToDeploy.getHostId() + ", poolId: " + planToDeploy.getPoolId()); } - plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), - planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId(), ctx); + plan = + new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), + planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId(), ctx); } HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType()); @@ -743,20 +748,21 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // planner if (s_logger.isDebugEnabled()) { s_logger.debug("Cannot satisfy the deployment plan passed in since the ready Root volume is in different cluster. volume's cluster: " + - rootVolClusterId + ", cluster specified: " + clusterIdSpecified); + rootVolClusterId + ", cluster specified: " + clusterIdSpecified); } throw new ResourceUnavailableException( - "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm, - Cluster.class, clusterIdSpecified); + "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + + vm, Cluster.class, clusterIdSpecified); } } - plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), - vol.getPoolId(), null, ctx); + plan = + new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), + planToDeploy.getHostId(), vol.getPoolId(), null, ctx); } else { plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId(), null, ctx); if (s_logger.isDebugEnabled()) { s_logger.debug(vol + " is READY, changing deployment plan to use this pool's dcId: " + rootVolDcId + " , podId: " + rootVolPodId + - " , and clusterId: " + rootVolClusterId); + " , and clusterId: " + rootVolClusterId); } planChangedByVolume = true; } @@ -1146,7 +1152,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac advanceStop(vm, cleanUpEvenIfUnableToStop); } - private void advanceStop(VMInstanceVO vm, boolean cleanUpEvenIfUnableToStop) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException { + private void advanceStop(VMInstanceVO vm, boolean cleanUpEvenIfUnableToStop) throws AgentUnavailableException, OperationTimedoutException, + ConcurrentOperationException { State state = vm.getState(); if (state == State.Stopped) { if (s_logger.isDebugEnabled()) { @@ -1606,9 +1613,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.info("Migration was unsuccessful. Cleaning up: " + vm); _networkMgr.rollbackNicForMigration(vmSrc, profile); - _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " + - fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " + - dest.getPod().getName(), "Migrate Command failed. Please check logs."); + _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), + "Unable to migrate vm " + vm.getInstanceName() + " from host " + fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " + + dest.getPod().getName(), "Migrate Command failed. Please check logs."); try { _agentMgr.send(dstHostId, new Commands(cleanup(vm)), null); } catch (AgentUnavailableException ae) { @@ -1641,8 +1648,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (_poolHostDao.findByPoolHost(pool.getId(), host.getId()) == null || pool.isLocal() != diskOffering.getUseLocalStorage()) { // Cannot find a pool for the volume. Throw an exception. throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + pool + " while migrating vm to host " + host + - ". Either the pool is not accessible from the " + - "host or because of the offering with which the volume is created it cannot be placed on " + "the given pool."); + ". Either the pool is not accessible from the " + "host or because of the offering with which the volume is created it cannot be placed on " + + "the given pool."); } else if (pool.getId() == currentPool.getId()) { // If the pool to migrate too is the same as current pool, remove the volume from the list of // volumes to be migrated. @@ -1674,7 +1681,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (!currentPoolAvailable && !volumeToPool.containsKey(volume)) { // Cannot find a pool for the volume. Throw an exception. throw new CloudRuntimeException("Cannot find a storage pool which is available for volume " + volume + " while migrating virtual machine " + - profile.getVirtualMachine() + " to host " + host); + profile.getVirtualMachine() + " to host " + host); } } } @@ -1730,7 +1737,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // a vm and not migrating a vm with storage. if (volumeToPool.isEmpty()) { throw new InvalidParameterValueException("Migration of the vm " + vm + "from host " + srcHost + " to destination host " + destHost + - " doesn't involve migrating the volumes."); + " doesn't involve migrating the volumes."); } short alertType = AlertManager.ALERT_TYPE_USERVM_MIGRATE; @@ -1782,8 +1789,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } finally { if (!migrated) { s_logger.info("Migration was unsuccessful. Cleaning up: " + vm); - _alertMgr.sendAlert(alertType, srcHost.getDataCenterId(), srcHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " + srcHost.getName() + - " in zone " + dc.getName() + " and pod " + dc.getName(), + _alertMgr.sendAlert(alertType, srcHost.getDataCenterId(), srcHost.getPodId(), + "Unable to migrate vm " + vm.getInstanceName() + " from host " + srcHost.getName() + " in zone " + dc.getName() + " and pod " + dc.getName(), "Migrate Command failed. Please check logs."); try { _agentMgr.send(destHostId, new Commands(cleanup(vm.getInstanceName())), null); @@ -2000,8 +2007,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac AgentVmInfo info = infos.remove(vm.getId()); // sync VM Snapshots related transient states - List vmSnapshotsInTrasientStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, - VMSnapshot.State.Creating); + List vmSnapshotsInTrasientStates = + _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, VMSnapshot.State.Creating); if (vmSnapshotsInTrasientStates.size() > 1) { s_logger.info("Found vm " + vm.getInstanceName() + " with VM snapshots in transient states, needs to sync VM snapshot state"); if (!_vmSnapshotMgr.syncVMSnapshot(vm, hostId)) { @@ -2123,8 +2130,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac AgentVmInfo info = infos.remove(vm.getId()); // sync VM Snapshots related transient states - List vmSnapshotsInExpungingStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Creating, - VMSnapshot.State.Reverting); + List vmSnapshotsInExpungingStates = + _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Creating, VMSnapshot.State.Reverting); if (vmSnapshotsInExpungingStates.size() > 0) { s_logger.info("Found vm " + vm.getInstanceName() + " in state. " + vm.getState() + ", needs to sync VM snapshot state"); Long hostId = null; @@ -2144,7 +2151,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if ((info == null && (vm.getState() == State.Running || vm.getState() == State.Starting)) || (info != null && (info.state == State.Running && vm.getState() == State.Starting))) { s_logger.info("Found vm " + vm.getInstanceName() + " in inconsistent state. " + vm.getState() + " on CS while " + (info == null ? "Stopped" : "Running") + - " on agent"); + " on agent"); info = new AgentVmInfo(vm.getInstanceName(), vm, State.Stopped); // Bug 13850- grab outstanding work item if any for this VM state so that we mark it as DONE after we change VM state, else it will remain pending @@ -2181,7 +2188,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac e.printStackTrace(); } } else if (info != null && - (vm.getState() == State.Stopped || vm.getState() == State.Stopping || vm.isRemoved() || vm.getState() == State.Destroyed || vm.getState() == State.Expunging)) { + (vm.getState() == State.Stopped || vm.getState() == State.Stopping || vm.isRemoved() || vm.getState() == State.Destroyed || vm.getState() == State.Expunging)) { Host host = _hostDao.findByGuid(info.getHostUuid()); if (host != null) { s_logger.warn("Stopping a VM which is stopped/stopping/destroyed/expunging " + info.name); @@ -2335,9 +2342,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac HostVO hostVO = _hostDao.findById(vm.getHostId()); String hostDesc = "name: " + hostVO.getName() + " (id:" + hostVO.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getInstanceName() + ", id: " + vm.getId() + ") stopped on host " + - hostDesc + " due to storage failure", - "Virtual Machine " + vm.getInstanceName() + " (id: " + vm.getId() + ") running on host [" + vm.getHostId() + "] stopped due to storage failure."); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getInstanceName() + ", id: " + vm.getId() + + ") stopped on host " + hostDesc + " due to storage failure", "Virtual Machine " + vm.getInstanceName() + " (id: " + vm.getId() + ") running on host [" + + vm.getHostId() + "] stopped due to storage failure."); } // track hypervsion tools version if (info.hvtoolsversion != null && !info.hvtoolsversion.isEmpty()) { @@ -2362,7 +2369,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (serverState == State.Starting) { if (vm.getHostId() != null && vm.getHostId() != hostId) { s_logger.info("CloudStack is starting VM on host " + vm.getHostId() + ", but status report comes from a different host " + hostId + - ", skip status sync for vm: " + vm.getInstanceName()); + ", skip status sync for vm: " + vm.getInstanceName()); return null; } } @@ -2387,7 +2394,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (serverState == State.Starting) { if (vm.getHostId() != null && vm.getHostId() != hostId) { s_logger.info("CloudStack is starting VM on host " + vm.getHostId() + ", but status report comes from a different host " + hostId + - ", skip status sync for vm: " + vm.getInstanceName()); + ", skip status sync for vm: " + vm.getInstanceName()); return null; } } @@ -2402,8 +2409,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // if (vm.getHostId() == null || hostId != vm.getHostId()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("detected host change when VM " + vm + " is at running state, VM could be live-migrated externally from host " + vm.getHostId() + - " to host " + hostId); + s_logger.debug("detected host change when VM " + vm + " is at running state, VM could be live-migrated externally from host " + + vm.getHostId() + " to host " + hostId); } stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId); @@ -2500,8 +2507,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return command; } - private void ensureVmRunningContext(long hostId, VMInstanceVO vm, Event cause) throws OperationTimedoutException, ResourceUnavailableException, NoTransitionException, - InsufficientAddressCapacityException { + private void ensureVmRunningContext(long hostId, VMInstanceVO vm, Event cause) throws OperationTimedoutException, ResourceUnavailableException, + NoTransitionException, InsufficientAddressCapacityException { VirtualMachineGuru vmGuru = getVmGuru(vm); s_logger.debug("VM state is starting on full sync so updating it to running"); @@ -2529,8 +2536,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac List nics = _nicsDao.listByVmId(profile.getId()); for (NicVO nic : nics) { Network network = _networkModel.getNetwork(nic.getNetworkId()); - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network), - _networkModel.getNetworkTag(profile.getHypervisorType(), network)); + NicProfile nicProfile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(profile.getHypervisorType(), network)); profile.addNic(nicProfile); } @@ -2701,7 +2709,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } try { lock.addRef(); - List instances = _vmDao.findVMInTransition(new Date(new Date().getTime() - (AgentManager.Wait.value() * 1000)), State.Starting, State.Stopping); + List instances = + _vmDao.findVMInTransition(new Date(new Date().getTime() - (AgentManager.Wait.value() * 1000)), State.Starting, State.Stopping); for (VMInstanceVO instance : instances) { State state = instance.getState(); if (state == State.Stopping) { @@ -2768,17 +2777,18 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (!(vmInstance.getState().equals(State.Stopped) || vmInstance.getState().equals(State.Running))) { s_logger.warn("Unable to upgrade virtual machine " + vmInstance.toString() + " in state " + vmInstance.getState()); throw new InvalidParameterValueException("Unable to upgrade virtual machine " + vmInstance.toString() + " " + " in state " + vmInstance.getState() + - "; make sure the virtual machine is stopped/running"); + "; make sure the virtual machine is stopped/running"); } // Check if the service offering being upgraded to is what the VM is already running with if (vmInstance.getServiceOfferingId() == newServiceOffering.getId()) { if (s_logger.isInfoEnabled()) { - s_logger.info("Not upgrading vm " + vmInstance.toString() + " since it already has the requested " + "service offering (" + newServiceOffering.getName() + ")"); + s_logger.info("Not upgrading vm " + vmInstance.toString() + " since it already has the requested " + "service offering (" + newServiceOffering.getName() + + ")"); } throw new InvalidParameterValueException("Not upgrading vm " + vmInstance.toString() + " since it already " + "has the requested service offering (" + - newServiceOffering.getName() + ")"); + newServiceOffering.getName() + ")"); } ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId()); @@ -2796,8 +2806,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // offering if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { throw new InvalidParameterValueException("Unable to upgrade virtual machine " + vmInstance.toString() + - ", cannot switch between local storage and shared storage service offerings. Current offering " + "useLocalStorage=" + - currentServiceOffering.getUseLocalStorage() + ", target offering useLocalStorage=" + newServiceOffering.getUseLocalStorage()); + ", cannot switch between local storage and shared storage service offerings. Current offering " + "useLocalStorage=" + + currentServiceOffering.getUseLocalStorage() + ", target offering useLocalStorage=" + newServiceOffering.getUseLocalStorage()); } // if vm is a system vm, check if it is a system service offering, if yes return with error as it cannot be used for user vms @@ -2807,8 +2817,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // Check that there are enough resources to upgrade the service offering if (!isVirtualMachineUpgradable(vmInstance, newServiceOffering)) { - throw new InvalidParameterValueException("Unable to upgrade virtual machine, not enough resources available " + "for an offering of " + newServiceOffering.getCpu() + - " cpu(s) at " + newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize() + " MB of memory"); + throw new InvalidParameterValueException("Unable to upgrade virtual machine, not enough resources available " + "for an offering of " + + newServiceOffering.getCpu() + " cpu(s) at " + newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize() + " MB of memory"); } // Check that the service offering being upgraded to has all the tags of the current service offering @@ -2816,8 +2826,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac List newTags = StringUtils.csvTagsToList(newServiceOffering.getTags()); if (!newTags.containsAll(currentTags)) { throw new InvalidParameterValueException("Unable to upgrade virtual machine; the new service offering " + "does not have all the tags of the " + - "current service offering. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " + - newTags); + "current service offering. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " + newTags); } } @@ -2922,11 +2931,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // if specified nic is associated with PF/LB/Static NAT if (rulesMgr.listAssociatedRulesForGuestNic(nic).size() > 0) { - throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic has associated Port forwarding or Load balancer or Static NAT rules."); + throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + + ", nic has associated Port forwarding or Load balancer or Static NAT rules."); } - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()), - _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); + NicProfile nicProfile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()), + _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); //1) Unplug the nic if (vm.getState() == State.Running) { @@ -2936,8 +2947,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (result) { s_logger.debug("Nic is unplugged successfully for vm " + vm + " in network " + network); long isDefault = (nic.isDefaultNic()) ? 1 : 0; - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), Long.toString(nic.getId()), - network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), + Long.toString(nic.getId()), network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid()); } else { s_logger.warn("Failed to unplug nic for the vm " + vm + " from network " + network); return false; @@ -3008,8 +3019,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } try { - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()), - _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); + NicProfile nicProfile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(network.getId(), vm.getId()), + _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); //1) Unplug the nic if (vm.getState() == State.Running) { @@ -3097,7 +3109,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } @Override - public void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId) throws ResourceUnavailableException, ConcurrentOperationException { + public void migrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId) throws ResourceUnavailableException, + ConcurrentOperationException { VMInstanceVO vm = _vmDao.findByUuid(vmUuid); s_logger.info("Migrating " + vm + " to " + dest); @@ -3230,9 +3243,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (!migrated) { s_logger.info("Migration was unsuccessful. Cleaning up: " + vm); - _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from host " + - fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " + - dest.getPod().getName(), "Migrate Command failed. Please check logs."); + _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(), + "Unable to migrate vm " + vm.getInstanceName() + " from host " + fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " + + dest.getPod().getName(), "Migrate Command failed. Please check logs."); try { _agentMgr.send(dstHostId, new Commands(cleanup(vm.getInstanceName())), null); } catch (AgentUnavailableException ae) { @@ -3326,8 +3339,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac Float memoryOvercommitRatio = CapacityManager.MemOverprovisioningFactor.valueIn(hostVo.getClusterId()); Float cpuOvercommitRatio = CapacityManager.CpuOverprovisioningFactor.valueIn(hostVo.getClusterId()); long minMemory = (long)(newServiceOffering.getRamSize() / memoryOvercommitRatio); - ScaleVmCommand reconfigureCmd = new ScaleVmCommand(vm.getInstanceName(), newServiceOffering.getCpu(), (int)(newServiceOffering.getSpeed() / cpuOvercommitRatio), - newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse()); + ScaleVmCommand reconfigureCmd = + new ScaleVmCommand(vm.getInstanceName(), newServiceOffering.getCpu(), (int)(newServiceOffering.getSpeed() / cpuOvercommitRatio), + newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse()); Long dstHostId = vm.getHostId(); ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Running, vm.getType(), vm.getId()); @@ -3376,8 +3390,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public ConfigKey[] getConfigKeys() { - return new ConfigKey[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, VmOpLockStateRetry, - VmOpWaitInterval, ExecuteInSequence}; + return new ConfigKey[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, + VmOpLockStateRetry, VmOpWaitInterval, ExecuteInSequence}; } public List getStoragePoolAllocators() { diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java index 4c47b6c004d..7c533026f99 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.engine.cloud.entity.api; +import java.util.Map; + import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; import com.cloud.deploy.DeploymentPlan; @@ -27,8 +29,6 @@ import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.vm.VirtualMachineProfile; -import java.util.Map; - public interface VMEntityManager { VMEntityVO loadVirtualMachine(String vmId); @@ -38,8 +38,8 @@ public interface VMEntityManager { String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException; - void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map params) throws InsufficientCapacityException, - ResourceUnavailableException; + void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map params) + throws InsufficientCapacityException, ResourceUnavailableException; boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java index d9c0d2dcbcc..c02e0adf98e 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java @@ -138,8 +138,8 @@ public class VMEntityManagerImpl implements VMEntityManager { } @Override - public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude) throws InsufficientCapacityException, - ResourceUnavailableException { + public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude) + throws InsufficientCapacityException, ResourceUnavailableException { //call planner and get the deployDestination. //load vm instance and offerings and call virtualMachineManagerImpl @@ -148,8 +148,9 @@ public class VMEntityManagerImpl implements VMEntityManager { VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm); DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null); if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) { - plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), - planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId()); + plan = + new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), + planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId()); } boolean planChangedByReadyVolume = false; @@ -169,12 +170,13 @@ public class VMEntityManagerImpl implements VMEntityManager { // cannot satisfy the plan passed in to the // planner throw new ResourceUnavailableException( - "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm, Cluster.class, - clusterIdSpecified); + "Root volume is ready in different cluster, Deployment plan provided cannot be satisfied, unable to create a deployment for " + vm, + Cluster.class, clusterIdSpecified); } } - plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), - vol.getPoolId(), null, null); + plan = + new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), + vol.getPoolId(), null, null); } else { plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId(), null, null); planChangedByReadyVolume = true; @@ -223,8 +225,8 @@ public class VMEntityManagerImpl implements VMEntityManager { VMReservationVO vmReservation = _reservationDao.findByReservationId(reservationId); if (vmReservation != null) { - DataCenterDeployment reservedPlan = new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(), - null, null); + DataCenterDeployment reservedPlan = + new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(), null, null); try { _itMgr.start(vm.getUuid(), params, reservedPlan); } catch (Exception ex) { diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java index 3d596d2a89c..ed8909cda48 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java @@ -23,9 +23,10 @@ import java.util.Map; import javax.inject.Inject; -import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; import org.springframework.stereotype.Component; +import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; + import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.exception.AgentUnavailableException; @@ -50,8 +51,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { this.vmEntityVO = this.manager.loadVirtualMachine(vmId); } - public void init(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List computeTags, List rootDiskTags, - List networks) { + public void init(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List computeTags, + List rootDiskTags, List networks) { init(vmId); this.vmEntityVO.setOwner(owner); this.vmEntityVO.setHostname(hostName); @@ -196,7 +197,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { } @Override - public String reserve(String plannerToUse, DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException { + public String reserve(String plannerToUse, DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, + ResourceUnavailableException { return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude); } @@ -207,7 +209,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { } @Override - public void deploy(String reservationId, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException { + public void deploy(String reservationId, String caller, Map params) throws InsufficientCapacityException, + ResourceUnavailableException { manager.deployVirtualMachine(reservationId, this.vmEntityVO, caller, params); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java index 006a366fde1..a5416c0df43 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; + import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.org.Cluster.ClusterType; import com.cloud.org.Grouping.AllocationState; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java index 5bd2193d2e4..41366f73a01 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.engine.datacenter.entity.api; import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; @@ -28,7 +30,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDa import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; -import org.springframework.stereotype.Component; import com.cloud.exception.InvalidParameterValueException; import com.cloud.utils.fsm.NoTransitionException; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java index bccadcb4424..ee434bb2291 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java @@ -23,10 +23,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; + import com.cloud.utils.fsm.FiniteStateObject; import com.cloud.utils.fsm.NoTransitionException; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java index 723ce3ad375..82b6150a5a3 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java @@ -208,8 +208,8 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity { this.firewallProvider = firewallProvider; } - public EngineDataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, - NetworkType zoneType, String zoneToken, String domainSuffix) { + public EngineDataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, + Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) { this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false, false, null, null); this.id = id; this.allocationState = Grouping.AllocationState.Enabled; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java index 910dea440e4..b064a35864d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java @@ -403,10 +403,10 @@ public class EngineHostVO implements EngineHost, Identity { this.orchestrationState = State.Disabled; } - public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask, - String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, String duxStorageNetmask, - String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, - String parent, long totalSize, StoragePoolType fsType) { + public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, + String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, + String duxStorageNetmask, String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, + long serverId, long ping, String parent, long totalSize, StoragePoolType fsType) { this(id, name, type, @@ -440,9 +440,10 @@ public class EngineHostVO implements EngineHost, Identity { this.orchestrationState = State.Disabled; } - public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask, - String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, String version, String url, - Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, long dom0MinMemory, String caps) { + public EngineHostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, + String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, + String version, String url, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, + long dom0MinMemory, String caps) { this.id = id; this.name = name; this.status = status; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java index f821049dc72..b93d8f5d796 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java @@ -22,9 +22,10 @@ import java.util.Map; import javax.ejb.Local; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO; import org.springframework.stereotype.Component; +import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java index ee2c576a6f0..b21b230d36f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java @@ -28,13 +28,14 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.org.Grouping; @@ -230,7 +231,8 @@ public class EngineClusterDaoImpl extends GenericDaoBase GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); clusterIdSearch.selectFields(clusterIdSearch.entity().getId()); - clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), JoinBuilder.JoinType.INNER); + clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), + JoinBuilder.JoinType.INNER); clusterIdSearch.done(); SearchCriteria sc = clusterIdSearch.create(); @@ -276,7 +278,12 @@ public class EngineClusterDaoImpl extends GenericDaoBase EngineClusterVO dbCluster = findByIdIncludingRemoved(vo.getId()); if (dbCluster != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); - str.append(": DB Data={id=").append(dbCluster.getId()).append("; state=").append(dbCluster.getState()).append(";updatedTime=").append(dbCluster.getLastUpdated()); + str.append(": DB Data={id=") + .append(dbCluster.getId()) + .append("; state=") + .append(dbCluster.getState()) + .append(";updatedTime=") + .append(dbCluster.getLastUpdated()); str.append(": New Data={id=") .append(vo.getId()) .append("; state=") diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java index f7be7d2ac3c..4b6818e8c31 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java @@ -26,12 +26,13 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.TableGenerator; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.org.Grouping; import com.cloud.utils.NumbersUtil; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java index b6e90153201..a332a4ccbf9 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.host.Host; import com.cloud.host.Host.Type; -import com.cloud.host.Status; import com.cloud.info.RunningHostCountInfo; import com.cloud.resource.ResourceState; import com.cloud.utils.db.GenericDao; @@ -34,7 +33,8 @@ import com.cloud.utils.fsm.StateDao; * Data Access Object for server * */ -public interface EngineHostDao extends GenericDao, StateDao { +public interface EngineHostDao extends GenericDao, + StateDao { long countBy(long clusterId, ResourceState... states); /** diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java index 7e01374eaa4..97ac5897d20 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java @@ -502,7 +502,8 @@ public class EngineHostDaoImpl extends GenericDaoBase implem List result = new ArrayList(); ResultSet rs = null; try { - String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;"; + String sql = + "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;"; pstmt = txn.prepareStatement(sql); pstmt.setLong(1, timeout); rs = pstmt.executeQuery(); @@ -593,10 +594,11 @@ public class EngineHostDaoImpl extends GenericDaoBase implem @Override @DB public List getRunningHostCounts(Date cutTime) { - String sql = "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " - + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL " - + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " - + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type"; + String sql = + "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " + + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL " + + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " + + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type"; ArrayList l = new ArrayList(); @@ -752,8 +754,8 @@ public class EngineHostDaoImpl extends GenericDaoBase implem } @Override - public List lockRows(SearchCriteria sc, - Filter filter, boolean exclusive) { + public List lockRows( + SearchCriteria sc, Filter filter, boolean exclusive) { // TODO Auto-generated method stub return null; } @@ -766,15 +768,15 @@ public class EngineHostDaoImpl extends GenericDaoBase implem } @Override - public List search(SearchCriteria sc, - Filter filter) { + public List search( + SearchCriteria sc, Filter filter) { // TODO Auto-generated method stub return null; } @Override - public List search(SearchCriteria sc, - Filter filter, boolean enable_query_cache) { + public List search( + SearchCriteria sc, Filter filter, boolean enable_query_cache) { // TODO Auto-generated method stub return null; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java index 72d7dbac7c0..46480ef424f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java @@ -26,21 +26,22 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.org.Grouping; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; +import com.cloud.utils.db.UpdateBuilder; @Component(value = "EngineHostPodDao") @Local(value = {EngineHostPodDao.class}) @@ -162,7 +163,7 @@ public class EngineHostPodDaoImpl extends GenericDaoBase builder.set(vo, "state", nextState); builder.set(vo, "lastUpdated", new Date()); - int rows = update((EngineHostPodVO)vo, sc); + int rows = update(vo, sc); if (rows == 0 && s_logger.isDebugEnabled()) { EngineHostPodVO dbDC = findByIdIncludingRemoved(vo.getId()); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java index fb142f4e655..12b8a598564 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; import java.util.List; + import com.cloud.host.HostTagVO; import com.cloud.utils.db.GenericDao; 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 aaa44dd4938..303f1e09ee8 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java @@ -96,8 +96,8 @@ public class CloudOrchestrator implements OrchestrationService { public CloudOrchestrator() { } - public VirtualMachineEntity createFromScratch(String uuid, String iso, String os, String hypervisor, String hostName, int cpu, int speed, long memory, List networks, - List computeTags, Map details, String owner) { + public VirtualMachineEntity createFromScratch(String uuid, String iso, String os, String hypervisor, String hostName, int cpu, int speed, long memory, + List networks, List computeTags, Map details, String owner) { return null; } @@ -150,9 +150,9 @@ public class CloudOrchestrator implements OrchestrationService { } @Override - public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu, int speed, - long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan, Long rootDiskSize) - throws InsufficientCapacityException { + public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu, + int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan, + Long rootDiskSize) throws InsufficientCapacityException { // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager); @@ -198,14 +198,15 @@ public class CloudOrchestrator implements OrchestrationService { dataDiskOfferings.put(diskOffering, size); } - _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, plan, hypervisorType); + _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, plan, + hypervisorType); return vmEntity; } @Override - public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os, int cpu, - int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan) + public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os, + int cpu, int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan) throws InsufficientCapacityException { // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 27ba7db870d..7179944f7ba 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -37,6 +37,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -167,14 +168,14 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.GlobalLock; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.NoTransitionException; import com.cloud.utils.fsm.StateMachine2; @@ -411,36 +412,41 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkOfferingVO offering = null; //#1 - quick cloud network offering if (_networkOfferingDao.findByUniqueName(NetworkOffering.QuickCloudNoServices) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, "Offering for QuickCloud with no services", TrafficType.Guest, null, true, - Availability.Optional, null, new HashMap>(), true, Network.GuestType.Shared, false, null, true, null, true, false, - null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, "Offering for QuickCloud with no services", TrafficType.Guest, null, true, + Availability.Optional, null, new HashMap>(), true, Network.GuestType.Shared, false, null, true, null, + true, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } //#2 - SG enabled network offering if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOfferingWithSGService) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "Offering for Shared Security group enabled networks", - TrafficType.Guest, null, true, Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, - true, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, + "Offering for Shared Security group enabled networks", TrafficType.Guest, null, true, Availability.Optional, null, + defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } //#3 - shared network offering with no SG service if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOffering) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, null, true, - Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, null, false, - null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, null, true, + Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, + null, false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } //#4 - default isolated offering with Source nat service if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService, - "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Required, null, - defaultIsolatedSourceNatEnabledNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService, + "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Required, null, + defaultIsolatedSourceNatEnabledNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, + false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); @@ -448,9 +454,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //#5 - default vpc offering with LB service if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, - "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null, defaultVPCOffProviders, - true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, + "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null, + defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } @@ -459,18 +466,21 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB) == null) { //remove LB service defaultVPCOffProviders.remove(Service.Lb); - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, - "Offering for Isolated VPC networks with Source Nat service enabled and LB service disabled", TrafficType.Guest, null, false, Availability.Optional, null, - defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, + "Offering for Isolated VPC networks with Source Nat service enabled and LB service disabled", TrafficType.Guest, null, false, + Availability.Optional, null, defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, + null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } //#7 - isolated offering with source nat disabled if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOffering) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service", - TrafficType.Guest, null, true, Availability.Optional, null, defaultIsolatedNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, - null, true, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service", + TrafficType.Guest, null, true, Availability.Optional, null, defaultIsolatedNetworkOfferingProviders, true, Network.GuestType.Isolated, false, + null, true, null, true, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } @@ -492,9 +502,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra internalLbOffProviders.put(Service.SourceNat, defaultVpcProvider); if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, - "Offering for Isolated VPC networks with Internal Lb support", TrafficType.Guest, null, false, Availability.Optional, null, internalLbOffProviders, true, - Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, + "Offering for Isolated VPC networks with Internal Lb support", TrafficType.Guest, null, false, Availability.Optional, null, + internalLbOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); offering.setInternalLb(true); offering.setPublicLb(false); @@ -524,9 +535,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra serviceCapabilityMap.put(Service.StaticNat, eip); if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedEIPandELBNetworkOffering) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedEIPandELBNetworkOffering, - "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, null, true, Availability.Optional, null, - netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedEIPandELBNetworkOffering, + "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, null, true, Availability.Optional, null, + netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true); offering.setState(NetworkOffering.State.Enabled); offering.setDedicatedLB(false); _networkOfferingDao.update(offering.getId(), offering); @@ -556,7 +568,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra podVlanMapSB.and("podId", podVlanMapSB.entity().getPodId(), Op.EQ); AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); - AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); + AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), + JoinType.INNER); AssignIpAddressFromPodVlanSearch.done(); @@ -594,9 +607,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override @DB - public List setupNetwork(final Account owner, final NetworkOffering offering, final Network predefined, final DeploymentPlan plan, final String name, - final String displayText, boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess, final Long vpcId, - final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException { + public List setupNetwork(final Account owner, final NetworkOffering offering, final Network predefined, final DeploymentPlan plan, + final String name, final String displayText, boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess, + final Long vpcId, final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException { Account locked = _accountDao.acquireInLockTable(owner.getId()); if (locked == null) { @@ -606,7 +619,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (predefined == null || (offering.getTrafficType() != TrafficType.Guest && predefined.getCidr() == null && predefined.getBroadcastUri() == null && !(predefined.getBroadcastDomainType() == BroadcastDomainType.Vlan || - predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined.getBroadcastDomainType() == BroadcastDomainType.Vxlan))) { + predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined.getBroadcastDomainType() == BroadcastDomainType.Vxlan))) { List configs = _networksDao.listBy(owner.getId(), offering.getId(), plan.getDataCenterId()); if (configs.size() > 0) { if (s_logger.isDebugEnabled()) { @@ -614,8 +627,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } if (errorIfAlreadySetup) { - InvalidParameterValueException ex = new InvalidParameterValueException( - "Found existing network configuration (with specified id) for offering (with specified id)"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Found existing network configuration (with specified id) for offering (with specified id)"); ex.addProxyObject(offering.getUuid(), "offeringId"); ex.addProxyObject(configs.get(0).getUuid(), "networkConfigId"); throw ex; @@ -653,9 +666,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { - NetworkVO vo = new NetworkVO(id, network, offering.getId(), guru.getName(), owner.getDomainId(), owner.getId(), relatedFile, name, displayText, - predefined.getNetworkDomain(), offering.getGuestType(), plan.getDataCenterId(), plan.getPhysicalNetworkId(), aclType, offering.getSpecifyIpRanges(), - vpcId); + NetworkVO vo = + new NetworkVO(id, network, offering.getId(), guru.getName(), owner.getDomainId(), owner.getId(), relatedFile, name, displayText, + predefined.getNetworkDomain(), offering.getGuestType(), plan.getDataCenterId(), plan.getPhysicalNetworkId(), aclType, + offering.getSpecifyIpRanges(), vpcId); vo.setDisplayNetwork(isDisplayNetworkEnabled == null ? true : isDisplayNetworkEnabled); networks.add(_networksDao.persist(vo, vo.getGuestType() == Network.GuestType.Isolated, finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId()))); @@ -787,8 +801,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra vo = _nicDao.persist(vo); Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId()); - NicProfile vmNic = new NicProfile(vo, network, vo.getBroadcastUri(), vo.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), - _networkModel.getNetworkTag(vm.getHypervisorType(), network)); + NicProfile vmNic = + new NicProfile(vo, network, vo.getBroadcastUri(), vo.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(vm.getHypervisorType(), network)); return new Pair(vmNic, Integer.valueOf(deviceId)); } @@ -1011,7 +1026,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra boolean sharedSourceNat = offering.getSharedSourceNat(); DataCenter zone = _dcDao.findById(network.getDataCenterId()); - if (!sharedSourceNat && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) && + if (!sharedSourceNat && + _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) && (network.getGuestType() == Network.GuestType.Isolated || (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced))) { List ips = null; @@ -1040,8 +1056,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // because the serializer would look up the NetworkVO class's table and retrieve the // network id instead of the physical network id. // So just throw this exception as is. We may need to TBD by changing the serializer. - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (s_logger.isDebugEnabled()) { @@ -1049,7 +1065,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } if (!element.implement(network, offering, dest, context)) { - CloudRuntimeException ex = new CloudRuntimeException("Failed to implement provider " + element.getProvider().getName() + " for network with specified id"); + CloudRuntimeException ex = + new CloudRuntimeException("Failed to implement provider " + element.getProvider().getName() + " for network with specified id"); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -1061,8 +1078,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (!reprogramNetworkRules(network.getId(), CallContext.current().getCallingAccount(), network)) { s_logger.warn("Failed to re-program the network as a part of network " + network + " implement"); // see DataCenterVO.java - ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class, - network.getDataCenterId()); + ResourceUnavailableException ex = + new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class, + network.getDataCenterId()); ex.addProxyObject(_entityMgr.findById(DataCenter.class, network.getDataCenterId()).getUuid()); throw ex; } @@ -1095,7 +1113,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId()); //there are no egress rules then apply the default egress rule DataCenter zone = _dcDao.findById(network.getDataCenterId()); - if (offering.getEgressDefaultPolicy() && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.Firewall) && + if (offering.getEgressDefaultPolicy() && + _networkModel.areServicesSupportedInNetwork(network.getId(), Service.Firewall) && (network.getGuestType() == Network.GuestType.Isolated || (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced))) { // add default egress rule to accept the traffic _firewallMgr.applyDefaultEgressFirewallRule(network.getId(), true); @@ -1198,8 +1217,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } @Override - public void prepare(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException { + public void prepare(VirtualMachineProfile vmProfile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException { List nics = _nicDao.listByVmId(vmProfile.getId()); // we have to implement default nics first - to ensure that default network elements start up first in multiple @@ -1252,7 +1271,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra profile = new NicProfile(nic, network, broadcastUri, isolationUri, - networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); + networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); guru.reserve(profile, network, vmProfile, dest, context); nic.setIp4Address(profile.getIp4Address()); nic.setAddressFormat(profile.getFormat()); @@ -1271,8 +1290,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra updateNic(nic, network.getId(), 1); } else { - profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), - _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); + profile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); guru.updateNicProfile(profile, network); nic.setState(Nic.State.Reserved); updateNic(nic, network.getId(), 1); @@ -1282,14 +1302,15 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + element.getName() + " to prepare for " + nic); } if (!prepareElement(element, network, profile, vmProfile, dest, context)) { - throw new InsufficientAddressCapacityException("unable to configure the dhcp service, due to insufficiant address capacity", Network.class, network.getId()); + throw new InsufficientAddressCapacityException("unable to configure the dhcp service, due to insufficiant address capacity", Network.class, + network.getId()); } } } @@ -1308,8 +1329,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId()); NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName()); - NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), - _networkModel.getNetworkTag(vm.getHypervisorType(), network)); + NicProfile profile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(vm.getHypervisorType(), network)); if (guru instanceof NetworkMigrationResponder) { if (!((NetworkMigrationResponder)guru).prepareMigration(profile, network, vm, dest, context)) { s_logger.error("NetworkGuru " + guru + " prepareForMigration failed."); // XXX: Transaction error @@ -1319,8 +1341,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (element instanceof NetworkMigrationResponder) { if (!((NetworkMigrationResponder)element).prepareMigration(profile, network, vm, dest, context)) { @@ -1359,8 +1381,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (element instanceof NetworkMigrationResponder) { ((NetworkMigrationResponder)element).commitMigration(nicSrc, network, src, src_context, dst_context); @@ -1390,8 +1412,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (element instanceof NetworkMigrationResponder) { ((NetworkMigrationResponder)element).rollbackMigration(nicDst, network, dst, src_context, dst_context); @@ -1434,8 +1456,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName()); nic.setState(Nic.State.Releasing); _nicDao.update(nic.getId(), nic); - NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, - _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); + NicProfile profile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(vmProfile.getHypervisorType(), network)); if (guru.release(profile, vmProfile, nic.getReservationId())) { applyProfileToNicForRelease(nic, profile); nic.setState(Nic.State.Allocated); @@ -1464,8 +1487,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + element.getName() + " to release " + profile); @@ -1499,8 +1522,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra nic.setState(Nic.State.Deallocating); _nicDao.update(nic.getId(), nic); NetworkVO network = _networksDao.findById(nic.getNetworkId()); - NicProfile profile = new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag( - vm.getHypervisorType(), network)); + NicProfile profile = + new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vm.getHypervisorType(), + network)); /* * We need to release the nics with a Create ReservationStrategy here @@ -1511,8 +1535,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : _networkElements) { if (providersToImplement.contains(element.getProvider())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + - network.getPhysicalNetworkId()); + throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + element.getName() + " to release " + nic); @@ -1604,8 +1628,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @DB public Network createGuestNetwork(long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk, final long zoneId, final ACLType aclType, Boolean subdomainAccess, - final Long vpcId, final String ip6Gateway, final String ip6Cidr, final Boolean isDisplayNetworkEnabled, final String isolatedPvlan) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceAllocationException { + final Long vpcId, final String ip6Gateway, final String ip6Cidr, final Boolean isDisplayNetworkEnabled, final String isolatedPvlan) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId); // this method supports only guest network creation @@ -1623,7 +1647,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // Validate network offering if (ntwkOff.getState() != NetworkOffering.State.Enabled) { // see NetworkOfferingVO - InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled); + InvalidParameterValueException ex = + new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled); ex.addProxyObject(ntwkOff.getUuid(), "networkOfferingId"); throw ex; } @@ -1661,8 +1686,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // if zone is basic, only Shared network offerings w/o source nat service are allowed if (!(ntwkOff.getGuestType() == GuestType.Shared && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))) { - throw new InvalidParameterValueException("For zone of type " + NetworkType.Basic + " only offerings of " + "guestType " + GuestType.Shared + " with disabled " + - Service.SourceNat.getName() + " service are allowed"); + throw new InvalidParameterValueException("For zone of type " + NetworkType.Basic + " only offerings of " + "guestType " + GuestType.Shared + + " with disabled " + Service.SourceNat.getName() + " service are allowed"); } if (domainId == null || domainId != Domain.ROOT_DOMAIN) { @@ -1725,7 +1750,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //don't allow to specify vlan tag used by physical network for dynamic vlan allocation if (_dcDao.findVnet(zoneId, pNtwk.getId(), vlanId).size() > 0) { throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " + - zone.getName()); + zone.getName()); } String uri = BroadcastDomainType.fromString(vlanId).toString(); // For Isolated networks, don't allow to create network with vlan that already exists in the zone @@ -1752,8 +1777,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra int vnetsAllocatedToAccount = _datacenterVnetDao.countVnetsAllocatedToAccount(zoneId, owner.getAccountId()); int vnetsDedicatedToAccount = _datacenterVnetDao.countVnetsDedicatedToAccount(zoneId, owner.getAccountId()); if (vnetsAllocatedToAccount < vnetsDedicatedToAccount) { - throw new InvalidParameterValueException("Specified vlan " + vlanId + " doesn't belong" + " to the vlan range dedicated to the owner " + - owner.getAccountName()); + throw new InvalidParameterValueException("Specified vlan " + vlanId + " doesn't belong" + + " to the vlan range dedicated to the owner " + owner.getAccountName()); } } } @@ -1762,7 +1787,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } else { // don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or // shared network with same Vlan ID in the zone - if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) { + if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || + _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) { throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId); } } @@ -1771,8 +1797,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // If networkDomain is not specified, take it from the global configuration if (_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Dns)) { - Map dnsCapabilities = _networkModel.getNetworkOfferingServiceCapabilities(_entityMgr.findById(NetworkOffering.class, networkOfferingId), - Service.Dns); + Map dnsCapabilities = + _networkModel.getNetworkOfferingServiceCapabilities(_entityMgr.findById(NetworkOffering.class, networkOfferingId), Service.Dns); String isUpdateDnsSupported = dnsCapabilities.get(Capability.AllowDnsSuffixModification); if (isUpdateDnsSupported == null || !Boolean.valueOf(isUpdateDnsSupported)) { if (networkDomain != null) { @@ -1796,10 +1822,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } else { // validate network domain if (!NetUtils.verifyDomainName(networkDomain)) { - throw new InvalidParameterValueException( - "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain " - + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + throw new InvalidParameterValueException("Invalid network domain. Total length shouldn't exceed 190 chars. Each domain " + + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " + + "and the hyphen ('-'); can't start or end with \"-\""); } } } @@ -1808,13 +1833,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // In Advance zone Cidr for Shared networks and Isolated networks w/o source nat service can't be NULL - 2.2.x // limitation, remove after we introduce support for multiple ip ranges // with different Cidrs for the same Shared network - boolean cidrRequired = zone.getNetworkType() == NetworkType.Advanced && - ntwkOff.getTrafficType() == TrafficType.Guest && - (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering( - ntwkOff.getId(), Service.SourceNat))); + boolean cidrRequired = + zone.getNetworkType() == NetworkType.Advanced && + ntwkOff.getTrafficType() == TrafficType.Guest && + (ntwkOff.getGuestType() == GuestType.Shared || (ntwkOff.getGuestType() == GuestType.Isolated && !_networkModel.areServicesSupportedByNetworkOffering( + ntwkOff.getId(), Service.SourceNat))); if (cidr == null && ip6Cidr == null && cidrRequired) { throw new InvalidParameterValueException("StartIp/endIp/gateway/netmask are required when create network of" + " type " + Network.GuestType.Shared + - " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled"); + " and network of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + " disabled"); } // No cidr can be specified in Basic zone @@ -1871,8 +1897,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } } - List networks = setupNetwork(owner, ntwkOff, userNetwork, plan, name, displayText, true, domainId, aclType, subdomainAccessFinal, vpcId, - isDisplayNetworkEnabled); + List networks = + setupNetwork(owner, ntwkOff, userNetwork, plan, name, displayText, true, domainId, aclType, subdomainAccessFinal, vpcId, isDisplayNetworkEnabled); Network network = null; if (networks == null || networks.isEmpty()) { @@ -2032,7 +2058,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName() + - " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); + " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); success = false; } if (s_logger.isDebugEnabled()) { @@ -2120,7 +2146,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { s_logger.warn("Unable to complete destroy of the network elements due to element: " + element.getName() + - " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); + " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); success = false; } @@ -2327,8 +2353,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } @Override - public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { NetworkVO network = _networksDao.findById(networkId); @@ -2437,9 +2463,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); if ((networkOffering.getGuestType() == Network.GuestType.Shared) && (_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.SourceNat) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) || + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( networkOfferingId, Service.Lb))) { return true; } @@ -2872,7 +2898,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (checkPhysicalNetwork) { if (!_pNSPDao.isServiceProviderEnabled(physicalNetworkId, provider, service)) { throw new UnsupportedServiceException("Provider " + provider + " is either not enabled or doesn't " + "support service " + service + - " in physical network id=" + physicalNetworkId); + " in physical network id=" + physicalNetworkId); } } @@ -2972,8 +2998,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId()); NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName()); - NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, - _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vm.getHypervisorType(), network)); + NicProfile profile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network), + _networkModel.getNetworkTag(vm.getHypervisorType(), network)); guru.updateNicProfile(profile, network); profiles.add(profile); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java index d199ab80042..fdc2d2393e3 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -31,6 +31,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -173,8 +174,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati // Find a destination storage pool with the specified criteria DiskOffering diskOffering = _entityMgr.findById(DiskOffering.class, volume.getDiskOfferingId()); ; - DiskProfile dskCh = new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), - diskOffering.getTagsArray(), diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null); + DiskProfile dskCh = + new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getTagsArray(), + diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null); dskCh.setHyperType(dataDiskHyperType); DataCenter destPoolDataCenter = _entityMgr.findById(DataCenter.class, destPoolDcId); Pod destPoolPod = _entityMgr.findById(Pod.class, destPoolPodId); @@ -195,8 +197,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } public VolumeVO allocateDuplicateVolumeVO(Volume oldVol, Long templateId) { - VolumeVO newVol = new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(), - oldVol.getSize(), oldVol.getMinIops(), oldVol.getMaxIops(), oldVol.get_iScsiName()); + VolumeVO newVol = + new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(), + oldVol.getSize(), oldVol.getMinIops(), oldVol.getMaxIops(), oldVol.get_iScsiName()); if (templateId != null) { newVol.setTemplateId(templateId); } else { @@ -309,8 +312,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), ss.getSize(), diskOffering.getTagsArray(), diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), Storage.ImageFormat.ISO != template.getFormat() ? template.getId() : null); } else { - return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getTagsArray(), - diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null); + return new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), diskOffering.getId(), diskOffering.getDiskSize(), + diskOffering.getTagsArray(), diskOffering.getUseLocalStorage(), diskOffering.isRecreatable(), null); } } @@ -343,8 +346,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } @DB - public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, ServiceOffering offering, - DiskOffering diskOffering, List avoids, long size, HypervisorType hyperType) { + public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, + ServiceOffering offering, DiskOffering diskOffering, List avoids, long size, HypervisorType hyperType) { StoragePool pool = null; if (diskOffering != null && diskOffering.isCustomized()) { @@ -502,8 +505,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } else { size = (size * 1024 * 1024 * 1024); } - VolumeVO vol = new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), - null); + VolumeVO vol = + new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), null); if (vm != null) { vol.setInstanceId(vm.getId()); } @@ -523,8 +526,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati // Save usage event and update resource count for user vm volumes if (vm instanceof UserVm) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offering.getId(), null, size, - Volume.class.getName(), vol.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offering.getId(), + null, size, Volume.class.getName(), vol.getUuid()); _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume); _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, new Long(vol.getSize())); @@ -533,15 +536,16 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } @Override - public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, Account owner) { + public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, + Account owner) { assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template really...."; Long size = _tmpltMgr.getTemplateSize(template.getId(), vm.getDataCenterId()); if (rootDisksize != null) { size = (rootDisksize * 1024 * 1024 * 1024); } - VolumeVO vol = new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), - null); + VolumeVO vol = + new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), size, offering.getMinIops(), offering.getMaxIops(), null); vol.setFormat(getSupportedImageFormatForCluster(template.getHypervisorType())); if (vm != null) { vol.setInstanceId(vm.getId()); @@ -566,8 +570,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati offeringId = offering.getId(); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, null, size, - Volume.class.getName(), vol.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, null, + size, Volume.class.getName(), vol.getUuid()); _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume); _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, new Long(vol.getSize())); @@ -594,17 +598,19 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati if (!volume.getFormat().equals(getSupportedImageFormatForCluster(rootDiskHyperType))) { throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " + volume.getFormat().getFileExtension() + - " is not compatible with the vm hypervisor type"); + " is not compatible with the vm hypervisor type"); } - VolumeInfo volumeOnPrimary = copyVolumeFromSecToPrimary(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList(), - volume.getSize(), rootDiskHyperType); + VolumeInfo volumeOnPrimary = + copyVolumeFromSecToPrimary(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList(), volume.getSize(), + rootDiskHyperType); return volumeOnPrimary; } @Override - public VolumeInfo createVolumeOnPrimaryStorage(VirtualMachine vm, Volume rootVolumeOfVm, VolumeInfo volume, HypervisorType rootDiskHyperType) throws NoTransitionException { + public VolumeInfo createVolumeOnPrimaryStorage(VirtualMachine vm, Volume rootVolumeOfVm, VolumeInfo volume, HypervisorType rootDiskHyperType) + throws NoTransitionException { VirtualMachineTemplate rootDiskTmplt = _entityMgr.findById(VirtualMachineTemplate.class, vm.getTemplateId()); DataCenter dcVO = _entityMgr.findById(DataCenter.class, vm.getDataCenterId()); Pod pod = _entityMgr.findById(Pod.class, vm.getPodIdToDeployIn()); @@ -639,7 +645,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati if (volTemplateId != null && volTemplateId.longValue() != vmTemplateId) { if (s_logger.isDebugEnabled()) { s_logger.debug("switchVolume: Old Volume's templateId: " + volTemplateId + " does not match the VM's templateId: " + vmTemplateId + - ", updating templateId in the new Volume"); + ", updating templateId in the new Volume"); } templateIdToUse = vmTemplateId; } @@ -696,7 +702,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati for (VolumeVO vol : volumesForVm) { if (vol.getVolumeType().equals(Type.ROOT)) { // Destroy volume if not already destroyed - boolean volumeAlreadyDestroyed = (vol.getState() == Volume.State.Destroy || vol.getState() == Volume.State.Expunged || vol.getState() == Volume.State.Expunging); + boolean volumeAlreadyDestroyed = + (vol.getState() == Volume.State.Destroy || vol.getState() == Volume.State.Expunged || vol.getState() == Volume.State.Expunging); if (!volumeAlreadyDestroyed) { volService.destroyVolume(vol.getId()); } else { @@ -937,7 +944,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati if (s_logger.isDebugEnabled()) { s_logger.debug("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool + " assigned by deploymentPlanner"); } - throw new CloudRuntimeException("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool + " assigned by deploymentPlanner"); + throw new CloudRuntimeException("Local volume " + vol + " cannot be recreated on storagepool " + assignedPool + + " assigned by deploymentPlanner"); } else { //Check if storage migration is enabled in config if (StorageHAMigrationEnabled.value()) { @@ -1040,7 +1048,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } @Override - public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException, ConcurrentOperationException { + public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException, + ConcurrentOperationException { if (dest == null) { if (s_logger.isDebugEnabled()) { @@ -1095,8 +1104,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati return true; } - public static final ConfigKey MaxVolumeSize = new ConfigKey(Long.class, "storage.max.volume.size", "Storage", "2000", "The maximum size for a volume (in GB).", - true); + public static final ConfigKey MaxVolumeSize = new ConfigKey(Long.class, "storage.max.volume.size", "Storage", "2000", + "The maximum size for a volume (in GB).", true); public static final ConfigKey RecreatableSystemVmEnabled = new ConfigKey(Boolean.class, "recreate.systemvm.enabled", "Advanced", "false", "If true, will recreate system vm root disk whenever starting system vm", true); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java index 0d854ddb179..86eab58ff0b 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java @@ -25,6 +25,9 @@ import java.util.Map; import javax.inject.Inject; import javax.ws.rs.Path; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager; @@ -35,8 +38,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl; import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import com.cloud.host.Host; import com.cloud.host.Status; diff --git a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java index b0c315ade8f..2c308f0161f 100644 --- a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -32,6 +32,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -232,7 +233,7 @@ public class VirtualMachineManagerImplTest { when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User); when(_host.getId()).thenReturn(1L); when(_hostDao.findById(anyLong())).thenReturn(null); - when(_entityMgr.findById(Mockito.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512)); + when(_entityMgr.findById(Matchers.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512)); when(_workDao.persist(_work)).thenReturn(_work); when(_workDao.update("1", _work)).thenReturn(true); when(_work.getId()).thenReturn("1"); @@ -268,8 +269,9 @@ public class VirtualMachineManagerImplTest { doReturn(1L).when(_vmInstance).getDataCenterId(); doReturn(1L).when(hostVO).getClusterId(); when(CapacityManager.CpuOverprovisioningFactor.valueIn(1L)).thenReturn(1.0f); - ScaleVmCommand reconfigureCmd = new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), - newServiceOffering.getRamSize(), newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse()); + ScaleVmCommand reconfigureCmd = + new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), newServiceOffering.getRamSize(), + newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse()); Answer answer = new ScaleVmAnswer(reconfigureCmd, true, "details"); when(_agentMgr.send(2l, reconfigureCmd)).thenReturn(null); _vmMgr.reConfigureVm(_vmInstance.getUuid(), getSvcoffering(256), false); @@ -307,7 +309,8 @@ public class VirtualMachineManagerImplTest { boolean ha = false; boolean useLocalStorage = false; - ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); + ServiceOfferingVO serviceOffering = + new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); return serviceOffering; } @@ -430,8 +433,8 @@ public class VirtualMachineManagerImplTest { // Check migration of a vm fails when src and destination pool are not of same type; that is, one is shared and // other is local. @Test(expected = CloudRuntimeException.class) - public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException, - OperationTimedoutException { + public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, + VirtualMachineMigrationException, OperationTimedoutException { initializeMockConfigForMigratingVmWithVolumes(); when(_srcHostMock.getClusterId()).thenReturn(3L); @@ -445,8 +448,8 @@ public class VirtualMachineManagerImplTest { // Check migration of a vm fails when vm is not in Running state. @Test(expected = ConcurrentOperationException.class) - public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException, - OperationTimedoutException { + public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, + VirtualMachineMigrationException, OperationTimedoutException { initializeMockConfigForMigratingVmWithVolumes(); when(_srcHostMock.getClusterId()).thenReturn(3L); diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java index 03fe2e6bf58..4aed4d1ebf7 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.engine.provisioning.test; +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; + import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; -import org.mockito.Mockito; -import org.springframework.context.annotation.Bean; public class ChildTestConfiguration { diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java index 0c9e3ffd937..c2a9dc7989c 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java @@ -20,38 +20,37 @@ package org.apache.cloudstack.engine.provisioning.test; import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.UUID; import javax.inject.Inject; +import junit.framework.TestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; import org.apache.cloudstack.engine.service.api.ProvisioningService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.dc.DataCenter.NetworkType; -import junit.framework.TestCase; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/resource/provisioningContext.xml") public class ProvisioningTest extends TestCase { @@ -71,24 +70,26 @@ public class ProvisioningTest extends TestCase { @Inject EngineHostDao _hostDao; + @Override @Before public void setUp() { - EngineDataCenterVO dc = new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, - null, true, true, null, null); - Mockito.when(dcDao.findByUuid(Mockito.anyString())).thenReturn(dc); - Mockito.when(dcDao.persist((EngineDataCenterVO)Mockito.anyObject())).thenReturn(dc); + EngineDataCenterVO dc = + new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, + true, true, null, null); + Mockito.when(dcDao.findByUuid(Matchers.anyString())).thenReturn(dc); + Mockito.when(dcDao.persist((EngineDataCenterVO)Matchers.anyObject())).thenReturn(dc); EngineHostPodVO pod = new EngineHostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test"); - Mockito.when(_podDao.findByUuid(Mockito.anyString())).thenReturn(pod); - Mockito.when(_podDao.persist((EngineHostPodVO)Mockito.anyObject())).thenReturn(pod); + Mockito.when(_podDao.findByUuid(Matchers.anyString())).thenReturn(pod); + Mockito.when(_podDao.persist((EngineHostPodVO)Matchers.anyObject())).thenReturn(pod); EngineClusterVO cluster = new EngineClusterVO(); - Mockito.when(_clusterDao.findByUuid(Mockito.anyString())).thenReturn(cluster); - Mockito.when(_clusterDao.persist((EngineClusterVO)Mockito.anyObject())).thenReturn(cluster); + Mockito.when(_clusterDao.findByUuid(Matchers.anyString())).thenReturn(cluster); + Mockito.when(_clusterDao.persist((EngineClusterVO)Matchers.anyObject())).thenReturn(cluster); EngineHostVO host = new EngineHostVO("68765876598"); - Mockito.when(_hostDao.findByUuid(Mockito.anyString())).thenReturn(host); - Mockito.when(_hostDao.persist((EngineHostVO)Mockito.anyObject())).thenReturn(host); + Mockito.when(_hostDao.findByUuid(Matchers.anyString())).thenReturn(host); + Mockito.when(_hostDao.persist((EngineHostVO)Matchers.anyObject())).thenReturn(host); } diff --git a/engine/schema/src/com/cloud/capacity/CapacityVO.java b/engine/schema/src/com/cloud/capacity/CapacityVO.java index b430d0604d3..8df5c861cda 100755 --- a/engine/schema/src/com/cloud/capacity/CapacityVO.java +++ b/engine/schema/src/com/cloud/capacity/CapacityVO.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.capacity; -import javax.persistence.Transient; import java.util.Date; import javax.persistence.Column; @@ -27,9 +26,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "op_host_capacity") diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java index a44b8784d7d..de5a370026e 100755 --- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java +++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java @@ -27,18 +27,17 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.dc.ClusterDetailsDao; -import com.cloud.dc.ClusterDetailsVO; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; + import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; +import com.cloud.dc.ClusterDetailsDao; import com.cloud.storage.Storage; import com.cloud.utils.Pair; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.JoinBuilder.JoinType; @@ -55,11 +54,15 @@ public class CapacityDaoImpl extends GenericDaoBase implements private static final Logger s_logger = Logger.getLogger(CapacityDaoImpl.class); private static final String ADD_ALLOCATED_SQL = "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity + ? WHERE host_id = ? AND capacity_type = ?"; - private static final String SUBTRACT_ALLOCATED_SQL = "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE host_id = ? AND capacity_type = ?"; + private static final String SUBTRACT_ALLOCATED_SQL = + "UPDATE `cloud`.`op_host_capacity` SET used_capacity = used_capacity - ? WHERE host_id = ? AND capacity_type = ?"; - private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART1 = "SELECT DISTINCT capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id ) WHERE "; - private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART2 = " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE "; - private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART3 = " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value) - used_capacity + reserved_capacity) >= ?) "; + private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART1 = + "SELECT DISTINCT capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster on (cluster.id = capacity.cluster_id AND cluster.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (cluster.id = cluster_details.cluster_id ) WHERE "; + private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART2 = + " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? AND capacity.cluster_id IN (SELECT distinct capacity.cluster_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE "; + private static final String LIST_CLUSTERSINZONE_BY_HOST_CAPACITIES_PART3 = + " AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value) - used_capacity + reserved_capacity) >= ?) "; private final SearchBuilder _hostIdTypeSearch; private final SearchBuilder _hostOrPoolIdSearch; @@ -69,65 +72,78 @@ public class CapacityDaoImpl extends GenericDaoBase implements @Inject protected ClusterDetailsDao _clusterDetailsDao; - private static final String LIST_HOSTS_IN_CLUSTER_WITH_ENOUGH_CAPACITY = " SELECT host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity` host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details` cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND host.type = ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value ) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' " - + " AND host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity` capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id) where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity* cluster_details.value) - used_capacity ) >= ?)) "; + private static final String LIST_HOSTS_IN_CLUSTER_WITH_ENOUGH_CAPACITY = + " SELECT host_capacity.host_id FROM (`cloud`.`host` JOIN `cloud`.`op_host_capacity` host_capacity ON (host.id = host_capacity.host_id AND host.cluster_id = ?) JOIN `cloud`.`cluster_details` cluster_details ON (host_capacity.cluster_id = cluster_details.cluster_id) AND host.type = ? AND cluster_details.name='cpuOvercommitRatio' AND ((host_capacity.total_capacity *cluster_details.value ) - host_capacity.used_capacity) >= ? and host_capacity.capacity_type = '1' " + + " AND host_capacity.host_id IN (SELECT capacity.host_id FROM `cloud`.`op_host_capacity` capacity JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id= cluster_details.cluster_id) where capacity_type='0' AND cluster_details.name='memoryOvercommitRatio' AND ((total_capacity* cluster_details.value) - used_capacity ) >= ?)) "; - private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART1 = "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity ) FROM `cloud`.`op_host_capacity` capacity WHERE "; + private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART1 = + "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity ) FROM `cloud`.`op_host_capacity` capacity WHERE "; - private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART2 = " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; + private static final String ORDER_CLUSTERS_BY_AGGREGATE_CAPACITY_PART2 = + " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; - private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART1 = "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE "; + private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART1 = + "SELECT capacity.cluster_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE "; - private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART2 = " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; + private static final String ORDER_CLUSTERS_BY_AGGREGATE_OVERCOMMIT_CAPACITY_PART2 = + " AND capacity_type = ? AND cluster_details.name =? GROUP BY capacity.cluster_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; - private static final String LIST_PODSINZONE_BY_HOST_CAPACITY_TYPE = "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod " - + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE capacity.data_center_id = ? AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? "; + private static final String LIST_PODSINZONE_BY_HOST_CAPACITY_TYPE = + "SELECT DISTINCT capacity.pod_id FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod " + + " ON (pod.id = capacity.pod_id AND pod.removed is NULL) INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id ) WHERE capacity.data_center_id = ? AND capacity_type = ? AND cluster_details.name= ? AND ((total_capacity * cluster_details.value ) - used_capacity + reserved_capacity) >= ? "; - private static final String ORDER_PODS_BY_AGGREGATE_CAPACITY = " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity) FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC "; + private static final String ORDER_PODS_BY_AGGREGATE_CAPACITY = + " SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity) FROM `cloud`.`op_host_capacity` capacity WHERE data_center_id= ? AND capacity_type = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity) ASC "; - private static final String ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY = "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=? AND capacity_type = ? AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; + private static final String ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY = + "SELECT capacity.pod_id, SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` cluster_details ON (capacity.cluster_id = cluster_details.cluster_id) WHERE data_center_id=? AND capacity_type = ? AND cluster_details.name = ? GROUP BY capacity.pod_id ORDER BY SUM(used_capacity+reserved_capacity)/SUM(total_capacity * cluster_details.value) ASC"; - private static final String LIST_CAPACITY_BY_RESOURCE_STATE = "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity), sum(capacity.total_capacity), capacity_capacity_type " - + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center` dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)" - + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)" - + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)" - + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host` host ON (host.id = capacity.host_id AND host.removed is NULL)" - + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state = ? AND host.resource_state = ? AND capacity_type not in (3,4) "; + private static final String LIST_CAPACITY_BY_RESOURCE_STATE = + "SELECT capacity.data_center_id, sum(capacity.used_capacity), sum(capacity.reserved_quantity), sum(capacity.total_capacity), capacity_capacity_type " + + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`data_center` dc ON (dc.id = capacity.data_center_id AND dc.removed is NULL)" + + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host_pod_ref` pod ON (pod.id = capacity.pod_id AND pod.removed is NULL)" + + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster` cluster ON (cluster.id = capacity.cluster_id AND cluster.removed is NULL)" + + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`host` host ON (host.id = capacity.host_id AND host.removed is NULL)" + + "WHERE dc.allocation_state = ? AND pod.allocation_state = ? AND cluster.allocation_state = ? AND host.resource_state = ? AND capacity_type not in (3,4) "; - private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," - + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" - + "else sum(total_capacity) end)," - + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," - + "capacity.capacity_type, capacity.data_center_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'"; + private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART1 = + "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," + + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" + + "else sum(total_capacity) end)," + + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))" + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name='memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," + + "capacity.capacity_type, capacity.data_center_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled'"; private static final String LIST_CAPACITY_GROUP_BY_ZONE_TYPE_PART2 = " GROUP BY data_center_id, capacity_type order by percent desc limit "; - private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," - + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," - + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," - + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; + private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART1 = + "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," + + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," + + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," + + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; private static final String LIST_CAPACITY_GROUP_BY_POD_TYPE_PART2 = " GROUP BY pod_id, capacity_type order by percent desc limit "; - private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," - + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," - + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," - + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; + private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART1 = + "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," + + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," + + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)) percent," + + "capacity.capacity_type, capacity.data_center_id, pod_id, cluster_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2 = " GROUP BY cluster_id, capacity_type order by percent desc limit "; private static final String UPDATE_CAPACITY_STATE = "UPDATE `cloud`.`op_host_capacity` SET capacity_state = ? WHERE "; - private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART1 = "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," - + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," - + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " - + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) else sum(total_capacity) end)) percent," - + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; + private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART1 = + "SELECT sum(capacity.used_capacity), sum(capacity.reserved_capacity)," + + " (case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id))else sum(total_capacity) end)," + + "((sum(capacity.used_capacity) + sum(capacity.reserved_capacity)) / ( case capacity_type when 1 then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'cpuOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) " + + "when '0' then (sum(total_capacity) * (select value from `cloud`.`cluster_details` where cluster_details.name= 'memoryOvercommitRatio' AND cluster_details.cluster_id=capacity.cluster_id)) else sum(total_capacity) end)) percent," + + "capacity.capacity_type, capacity.data_center_id, pod_id FROM `cloud`.`op_host_capacity` capacity WHERE total_capacity > 0 AND data_center_id is not null AND capacity_state='Enabled' "; private static final String LIST_CAPACITY_GROUP_BY_CAPACITY_PART2 = " GROUP BY capacity_type"; @@ -145,20 +161,19 @@ public class CapacityDaoImpl extends GenericDaoBase implements * query from the configuration table * * */ - private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT clusterList.cluster_id " - + "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value " - + "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, " - + "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) " - + "WHEN 1 THEN ( CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL " - + "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?)" - + "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) END )" - + "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " - + "END configValue " - + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit ON overcommit.cluster_id = capacity.cluster_id " - + "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ?) cluster " - + + private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = + "SELECT clusterList.cluster_id " + + "FROM ( SELECT cluster.cluster_id cluster_id, ( (sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio, cluster.configValue value " + + "FROM ( SELECT capacity.cluster_id cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved, capacity.total_capacity * overcommit.value total, " + + "CASE (SELECT count(*) FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) " + + "WHEN 1 THEN ( CASE WHEN (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL " + + "THEN (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?)" + + "ELSE (SELECT details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id = capacity.cluster_id AND details.name = ? ) END )" + + "ELSE ( SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " + "END configValue " + + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit ON overcommit.cluster_id = capacity.cluster_id " + + "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ?) cluster " + - "GROUP BY cluster.cluster_id) clusterList " + "WHERE clusterList.ratio > clusterList.value; "; + "GROUP BY cluster.cluster_id) clusterList " + "WHERE clusterList.ratio > clusterList.value; "; public CapacityDaoImpl() { _hostIdTypeSearch = createSearchBuilder(); @@ -358,8 +373,8 @@ public class CapacityDaoImpl extends GenericDaoBase implements if (level == 3 && rs.getLong(7) != 0) capacityClusterId = rs.getLong(7); - SummedCapacity summedCapacity = new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4), (short)rs.getLong(5), rs.getLong(6), capacityPodId, - capacityClusterId); + SummedCapacity summedCapacity = + new SummedCapacity(rs.getLong(1), rs.getLong(2), rs.getLong(3), rs.getFloat(4), (short)rs.getLong(5), rs.getLong(6), capacityPodId, capacityClusterId); result.add(summedCapacity); } @@ -475,11 +490,11 @@ public class CapacityDaoImpl extends GenericDaoBase implements try { pstmt = txn.prepareAutoCloseStatement(sql.toString()); pstmt.setLong(1, id); - pstmt.setShort(2, CapacityVO.CAPACITY_TYPE_CPU); + pstmt.setShort(2, Capacity.CAPACITY_TYPE_CPU); pstmt.setString(3, "cpuOvercommitRatio"); pstmt.setLong(4, requiredCpu); pstmt.setLong(5, id); - pstmt.setShort(6, CapacityVO.CAPACITY_TYPE_MEMORY); + pstmt.setShort(6, Capacity.CAPACITY_TYPE_MEMORY); pstmt.setString(7, "memoryOvercommitRatio"); pstmt.setLong(8, requiredRam); @@ -652,7 +667,8 @@ public class CapacityDaoImpl extends GenericDaoBase implements SearchBuilder nonSharedStorage = _storagePoolDao.createSearchBuilder(); nonSharedStorage.and("poolTypes", nonSharedStorage.entity().getPoolType(), SearchCriteria.Op.IN); - SummedCapacitySearch.join("nonSharedStorage", nonSharedStorage, nonSharedStorage.entity().getId(), SummedCapacitySearch.entity().getHostOrPoolId(), JoinType.INNER); + SummedCapacitySearch.join("nonSharedStorage", nonSharedStorage, nonSharedStorage.entity().getId(), SummedCapacitySearch.entity().getHostOrPoolId(), + JoinType.INNER); nonSharedStorage.done(); if (zoneId != null) { @@ -772,11 +788,11 @@ public class CapacityDaoImpl extends GenericDaoBase implements try { pstmt = txn.prepareAutoCloseStatement(sql.toString()); pstmt.setLong(1, zoneId); - pstmt.setShort(2, CapacityVO.CAPACITY_TYPE_CPU); + pstmt.setShort(2, Capacity.CAPACITY_TYPE_CPU); pstmt.setString(3, "cpuOvercommitRatio"); pstmt.setLong(4, requiredCpu); pstmt.setLong(5, zoneId); - pstmt.setShort(6, CapacityVO.CAPACITY_TYPE_MEMORY); + pstmt.setShort(6, Capacity.CAPACITY_TYPE_MEMORY); pstmt.setString(7, "memoryOvercommitRatio"); pstmt.setLong(8, requiredRam); @@ -800,15 +816,15 @@ public class CapacityDaoImpl extends GenericDaoBase implements Map podCapacityMap = new HashMap(); StringBuilder sql = null; try { - if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_CPU | capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_MEMORY) { + if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_CPU | capacityTypeForOrdering == Capacity.CAPACITY_TYPE_MEMORY) { sql = new StringBuilder(ORDER_PODS_BY_AGGREGATE_OVERCOMMIT_CAPACITY); pstmt = txn.prepareAutoCloseStatement(sql.toString()); pstmt.setLong(1, zoneId); pstmt.setShort(2, capacityTypeForOrdering); - if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_CPU) { + if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_CPU) { pstmt.setString(3, "cpuOvercommitRatio"); - } else if (capacityTypeForOrdering == CapacityVO.CAPACITY_TYPE_MEMORY) { + } else if (capacityTypeForOrdering == Capacity.CAPACITY_TYPE_MEMORY) { pstmt.setString(3, "memoryOvercommitRatio"); } } else { diff --git a/engine/schema/src/com/cloud/certificate/CertificateVO.java b/engine/schema/src/com/cloud/certificate/CertificateVO.java index 1b42ffd1456..11bf8e88780 100644 --- a/engine/schema/src/com/cloud/certificate/CertificateVO.java +++ b/engine/schema/src/com/cloud/certificate/CertificateVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.certificate; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "certificate") public class CertificateVO implements InternalIdentity { @@ -43,6 +43,7 @@ public class CertificateVO implements InternalIdentity { public CertificateVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java index b307589787a..8d28b8ee2b8 100644 --- a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java +++ b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java @@ -25,9 +25,10 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "op_host_transfer") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @@ -87,6 +88,7 @@ public class HostTransferMapVO implements InternalIdentity { this.state = state; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java index 0f959df75f7..ae8f3822704 100644 --- a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java +++ b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.configuration; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java index c131495a74f..39217091975 100644 --- a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java +++ b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.configuration; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java index 4740fea5718..be429b518a9 100644 --- a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -32,10 +32,8 @@ import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.ResourceCountVO; import com.cloud.configuration.ResourceLimit; import com.cloud.domain.dao.DomainDao; -import com.cloud.domain.dao.DomainDaoImpl; import com.cloud.exception.UnsupportedServiceException; import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.AccountDaoImpl; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java index f01d36238f7..6461a9634fd 100644 --- a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java +++ b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java @@ -23,9 +23,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.user.OwnedBy; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.user.OwnedBy; + @Entity @Table(name = "account_vlan_map") public class AccountVlanMapVO implements OwnedBy, InternalIdentity { @@ -50,6 +51,7 @@ public class AccountVlanMapVO implements OwnedBy, InternalIdentity { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java index 9de85b5d52f..6eb9e7466a7 100644 --- a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java +++ b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "cluster_details") public class ClusterDetailsVO implements InternalIdentity { @@ -68,6 +68,7 @@ public class ClusterDetailsVO implements InternalIdentity { this.value = value; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/ClusterVO.java b/engine/schema/src/com/cloud/dc/ClusterVO.java index af0caceb598..b701542fbdb 100644 --- a/engine/schema/src/com/cloud/dc/ClusterVO.java +++ b/engine/schema/src/com/cloud/dc/ClusterVO.java @@ -28,14 +28,12 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.org.Cluster; -import com.cloud.org.Managed.ManagedState; import com.cloud.org.Grouping; +import com.cloud.org.Managed.ManagedState; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "cluster") @@ -96,22 +94,27 @@ public class ClusterVO implements Cluster { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } + @Override public String getName() { return name; } + @Override public long getDataCenterId() { return dataCenterId; } + @Override public long getPodId() { return podId; } + @Override public Cluster.ClusterType getClusterType() { return clusterType; } @@ -120,6 +123,7 @@ public class ClusterVO implements Cluster { this.clusterType = clusterType; } + @Override public AllocationState getAllocationState() { return allocationState; } @@ -128,6 +132,7 @@ public class ClusterVO implements Cluster { this.allocationState = allocationState; } + @Override public ManagedState getManagedState() { return managedState; } @@ -154,6 +159,7 @@ public class ClusterVO implements Cluster { return this.id == that.id; } + @Override public HypervisorType getHypervisorType() { return HypervisorType.getType(hypervisorType); } diff --git a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java index 6b9d86608ef..70b4df16654 100755 --- a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_dc_ip_address_alloc") public class DataCenterIpAddressVO implements InternalIdentity { @@ -77,6 +77,7 @@ public class DataCenterIpAddressVO implements InternalIdentity { this.podId = podId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java index 2f6d96d78d6..31d124c80ef 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_dc_link_local_ip_address_alloc") public class DataCenterLinkLocalIpAddressVO implements InternalIdentity { @@ -66,6 +66,7 @@ public class DataCenterLinkLocalIpAddressVO implements InternalIdentity { this.podId = podId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java b/engine/schema/src/com/cloud/dc/DataCenterVO.java index b81273b3a88..02aa98839ff 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterVO.java @@ -31,12 +31,10 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import javax.persistence.Transient; -import org.apache.cloudstack.api.Identity; import com.cloud.network.Network.Provider; import com.cloud.org.Grouping; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "data_center") @@ -190,8 +188,8 @@ public class DataCenterVO implements DataCenter { this.uuid = UUID.randomUUID().toString(); } - public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, - String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) { + public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, + NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) { this.name = name; this.description = description; this.dns1 = dns1; @@ -388,6 +386,7 @@ public class DataCenterVO implements DataCenter { details.put(name, value); } + @Override public AllocationState getAllocationState() { return allocationState; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java index 612a039279e..d3959df8af8 100755 --- a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_dc_vnet_alloc") public class DataCenterVnetVO implements InternalIdentity { @@ -75,6 +75,7 @@ public class DataCenterVnetVO implements InternalIdentity { this.takenAt = null; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/HostPodVO.java b/engine/schema/src/com/cloud/dc/HostPodVO.java index f1e79f0e0e0..d9971815f5e 100644 --- a/engine/schema/src/com/cloud/dc/HostPodVO.java +++ b/engine/schema/src/com/cloud/dc/HostPodVO.java @@ -28,11 +28,9 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.org.Grouping; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "host_pod_ref") @@ -96,6 +94,7 @@ public class HostPodVO implements Pod { return id; } + @Override public long getDataCenterId() { return dataCenterId; } @@ -104,6 +103,7 @@ public class HostPodVO implements Pod { this.dataCenterId = dataCenterId; } + @Override public String getName() { return name; } @@ -139,6 +139,7 @@ public class HostPodVO implements Pod { this.gateway = gateway; } + @Override public String getDescription() { return description; } @@ -147,6 +148,7 @@ public class HostPodVO implements Pod { this.description = description; } + @Override public AllocationState getAllocationState() { return allocationState; } @@ -165,6 +167,7 @@ public class HostPodVO implements Pod { return NumbersUtil.hash(id); } + @Override public boolean getExternalDhcp() { return externalDhcp; } diff --git a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java index dbbda911689..5f84cf28f68 100644 --- a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java +++ b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "pod_vlan_map") public class PodVlanMapVO implements InternalIdentity { @@ -48,6 +48,7 @@ public class PodVlanMapVO implements InternalIdentity { public PodVlanMapVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/PodVlanVO.java b/engine/schema/src/com/cloud/dc/PodVlanVO.java index 79b8ae04ed4..01668d9701f 100755 --- a/engine/schema/src/com/cloud/dc/PodVlanVO.java +++ b/engine/schema/src/com/cloud/dc/PodVlanVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_pod_vlan_alloc") public class PodVlanVO implements InternalIdentity { @@ -69,6 +69,7 @@ public class PodVlanVO implements InternalIdentity { this.takenAt = null; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java index a828205f06b..d7191428fdb 100755 --- a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -32,6 +30,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_dc_storage_network_ip_address") @SecondaryTables({@SecondaryTable(name = "dc_storage_network_ip_range", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "range_id", referencedColumnName = "id")})}) @@ -66,6 +66,7 @@ public class StorageNetworkIpAddressVO implements InternalIdentity { protected StorageNetworkIpAddressVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java index d09a26ef212..9b84ac7d23d 100755 --- a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java +++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.dc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.UUID; import javax.persistence.Column; @@ -33,8 +31,8 @@ import javax.persistence.Table; @Entity @Table(name = "dc_storage_network_ip_range") @SecondaryTables({@SecondaryTable(name = "networks", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "network_id", referencedColumnName = "id")}), - @SecondaryTable(name = "host_pod_ref", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "pod_id", referencedColumnName = "id")}), - @SecondaryTable(name = "data_center", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "data_center_id", referencedColumnName = "id")})}) + @SecondaryTable(name = "host_pod_ref", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "pod_id", referencedColumnName = "id")}), + @SecondaryTable(name = "data_center", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "data_center_id", referencedColumnName = "id")})}) public class StorageNetworkIpRangeVO implements StorageNetworkIpRange { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -93,6 +91,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } @@ -121,6 +120,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange { this.networkId = nwId; } + @Override public Integer getVlan() { return vlan; } @@ -133,6 +133,7 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange { this.startIp = start; } + @Override public String getStartIp() { return startIp; } @@ -141,14 +142,17 @@ public class StorageNetworkIpRangeVO implements StorageNetworkIpRange { this.endIp = end; } + @Override public String getEndIp() { return endIp; } + @Override public String getNetmask() { return netmask; } + @Override public String getGateway() { return this.gateway; } diff --git a/engine/schema/src/com/cloud/dc/VlanVO.java b/engine/schema/src/com/cloud/dc/VlanVO.java index 1061c9048de..ff103b9a07a 100644 --- a/engine/schema/src/com/cloud/dc/VlanVO.java +++ b/engine/schema/src/com/cloud/dc/VlanVO.java @@ -27,9 +27,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - @Entity @Table(name = "vlan") public class VlanVO implements Vlan { @@ -167,23 +164,24 @@ public class VlanVO implements Vlan { @Override public String toString() { if (toString == null) { - toString = new StringBuilder("Vlan[").append(vlanTag) - .append("|") - .append(vlanGateway) - .append("|") - .append(vlanNetmask) - .append("|") - .append(ip6Gateway) - .append("|") - .append(ip6Cidr) - .append("|") - .append(ipRange) - .append("|") - .append("|") - .append(ip6Range) - .append(networkId) - .append("]") - .toString(); + toString = + new StringBuilder("Vlan[").append(vlanTag) + .append("|") + .append(vlanGateway) + .append("|") + .append(vlanNetmask) + .append("|") + .append(ip6Gateway) + .append("|") + .append(ip6Cidr) + .append("|") + .append(ipRange) + .append("|") + .append("|") + .append(ip6Range) + .append(networkId) + .append("]") + .toString(); } return toString; } diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java index 17c7785dc31..c0f86f33b21 100644 --- a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java @@ -223,7 +223,8 @@ public class ClusterDaoImpl extends GenericDaoBase implements C GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); clusterIdSearch.selectFields(clusterIdSearch.entity().getId()); - clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), JoinBuilder.JoinType.INNER); + clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), + JoinBuilder.JoinType.INNER); clusterIdSearch.done(); SearchCriteria sc = clusterIdSearch.create(); diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java index 1de310fcce2..8c0dbe79621 100644 --- a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java @@ -17,6 +17,7 @@ package com.cloud.dc.dao; import java.util.List; + import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -78,6 +79,7 @@ public class ClusterVSMMapDaoImpl extends GenericDaoBase return listBy(sc); } + @Override public boolean remove(Long id) { TransactionLegacy txn = TransactionLegacy.currentTxn(); txn.start(); diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java index 335be8b2aca..9c6b553a7a5 100755 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -26,7 +26,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.TableGenerator; -import org.apache.cloudstack.api.ResourceDetail; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java index 441f3aea7d0..d4fb1b47b9d 100755 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java @@ -47,6 +47,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase AllIpCount; private final GenericSearchBuilder AllAllocatedIpCount; + @Override @DB public DataCenterIpAddressVO takeIpAddress(long dcId, long podId, long instanceId, String reservationId) { SearchCriteria sc = AllFieldsSearch.create(); @@ -68,6 +69,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase sc = AllFieldsSearch.create(); @@ -107,10 +109,12 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase= 1; } + @Override @DB public void addIpRange(long dcId, long podId, String start, String end) { TransactionLegacy txn = TransactionLegacy.currentTxn(); - String insertSql = "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))"; + String insertSql = + "INSERT INTO `cloud`.`op_dc_ip_address_alloc` (ip_address, data_center_id, pod_id, mac_address) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?))"; String updateSql = "UPDATE `cloud`.`data_center` set mac_address = mac_address+1 where id=?"; PreparedStatement stmt = null; @@ -139,6 +143,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase AllIpCount; private final GenericSearchBuilder AllAllocatedIpCount; + @Override @DB public DataCenterLinkLocalIpAddressVO takeIpAddress(long dcId, long podId, long instanceId, String reservationId) { SearchCriteria sc = AllFieldsSearch.create(); @@ -71,12 +72,14 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase sc = AllFieldsSearch.create(); sc.setParameters("pod", podId); return remove(sc) > 0; } + @Override @DB public void addIpRange(long dcId, long podId, String start, String end) { String insertSql = "INSERT INTO `cloud`.`op_dc_link_local_ip_address_alloc` (ip_address, data_center_id, pod_id) VALUES (?, ?, ?)"; @@ -102,6 +105,7 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase sc = AllFieldsSearch.create(); sc.setParameters("instance", nicId); @@ -132,12 +137,14 @@ public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase listByPodIdDcId(long podId, long dcId) { SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("pod", podId); return listBy(sc); } + @Override public int countIPs(long podId, long dcId, boolean onlyCountAllocated) { SearchCriteria sc; if (onlyCountAllocated) { diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java index 79244398a93..1783231f4fb 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDao.java @@ -20,7 +20,6 @@ import java.util.List; import com.cloud.dc.DataCenterVnetVO; import com.cloud.utils.db.GenericDao; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public interface DataCenterVnetDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java index 0498b71b230..3205fcd6af6 100755 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java @@ -67,6 +67,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase listAllocatedVnets(long physicalNetworkId) { SearchCriteria sc = DcSearchAllocated.create(); sc.setParameters("physicalNetworkId", physicalNetworkId); @@ -80,6 +81,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase listAllocatedVnetsInRange(long dcId, long physicalNetworkId, Integer start, Integer end) { SearchCriteria sc = DcSearchAllocatedInRange.create(); sc.setParameters("dc", dcId); @@ -88,6 +90,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase sc = SearchRange.create(); sc.setParameters("dc", dcId); @@ -96,6 +99,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase findVnet(long dcId, String vnet) { SearchCriteria sc = VnetDcSearch.create(); ; @@ -104,12 +108,14 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase sc = onlyCountAllocated ? countAllocatedZoneVlans.create() : countZoneVlans.create(); sc.setParameters("dc", dcId); return customSearch(sc, null).get(0); } + @Override public List findVnet(long dcId, long physicalNetworkId, String vnet) { SearchCriteria sc = VnetDcSearch.create(); sc.setParameters("dc", dcId); @@ -119,6 +125,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase argument each string is a vlan. not a vlanRange. public @@ -143,6 +150,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase argument each string is a vlan. not a vlanRange. + @Override public void deleteVnets(TransactionLegacy txn, long dcId, long physicalNetworkId, List vnets) { String deleteVnet = "DELETE FROM `cloud`.`op_dc_vnet_alloc` WHERE data_center_id=? AND physical_network_id=? AND taken IS NULL AND vnet=?"; try { @@ -159,12 +167,14 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase sc = VnetDcSearch.create(); sc.setParameters("physicalNetworkId", physicalNetworkId); remove(sc); } + @Override @DB public DataCenterVnetVO take(long physicalNetworkId, long accountId, String reservationId, List vlanDbIds) { SearchCriteria sc; @@ -191,6 +201,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase sc = VnetDcSearchAllocated.create(); sc.setParameters("vnet", vnet); diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDao.java b/engine/schema/src/com/cloud/dc/dao/HostPodDao.java index 1babef16d03..39c8a499192 100644 --- a/engine/schema/src/com/cloud/dc/dao/HostPodDao.java +++ b/engine/schema/src/com/cloud/dc/dao/HostPodDao.java @@ -21,7 +21,6 @@ import java.util.List; import com.cloud.dc.HostPodVO; import com.cloud.utils.db.GenericDao; -import com.cloud.vm.VirtualMachine; public interface HostPodDao extends GenericDao { public List listByDataCenterId(long id); diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java index f2e6cbac2c5..2b986133104 100755 --- a/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/PodVlanDaoImpl.java @@ -24,7 +24,6 @@ import java.util.List; import org.springframework.stereotype.Component; import com.cloud.dc.PodVlanVO; -import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -40,12 +39,14 @@ public class PodVlanDaoImpl extends GenericDaoBase implements P private final SearchBuilder VlanPodSearch; private final SearchBuilder PodSearchAllocated; + @Override public List listAllocatedVnets(long podId) { SearchCriteria sc = PodSearchAllocated.create(); sc.setParameters("podId", podId); return listBy(sc); } + @Override public void add(long podId, int start, int end) { String insertVnet = "INSERT INTO `cloud`.`op_pod_vlan_alloc` (vlan, pod_id) VALUES ( ?, ?)"; @@ -65,6 +66,7 @@ public class PodVlanDaoImpl extends GenericDaoBase implements P } } + @Override public void delete(long podId) { String deleteVnet = "DELETE FROM `cloud`.`op_pod_vlan_alloc` WHERE pod_id = ?"; @@ -78,6 +80,7 @@ public class PodVlanDaoImpl extends GenericDaoBase implements P } } + @Override public PodVlanVO take(long podId, long accountId) { SearchCriteria sc = FreeVlanSearch.create(); sc.setParameters("podId", podId); @@ -101,6 +104,7 @@ public class PodVlanDaoImpl extends GenericDaoBase implements P } } + @Override public void release(String vlan, long podId, long accountId) { SearchCriteria sc = VlanPodSearch.create(); sc.setParameters("vlan", vlan); diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java index f69346454e6..2e7381ca8ff 100755 --- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java @@ -29,8 +29,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.GenericQueryBuilder; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDao.java b/engine/schema/src/com/cloud/dc/dao/VlanDao.java index 9295586fc0d..485593e8f45 100755 --- a/engine/schema/src/com/cloud/dc/dao/VlanDao.java +++ b/engine/schema/src/com/cloud/dc/dao/VlanDao.java @@ -16,13 +16,13 @@ // under the License. package com.cloud.dc.dao; +import java.util.List; + import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; import com.cloud.utils.db.GenericDao; -import java.util.List; - public interface VlanDao extends GenericDao { VlanVO findByZoneAndVlanId(long zoneId, String vlanId); diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java index 0bd8d3a1d2c..a38a96eaa4f 100755 --- a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -16,6 +16,19 @@ // under the License. package com.cloud.dc.dao; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.springframework.stereotype.Component; + import com.cloud.dc.AccountVlanMapVO; import com.cloud.dc.PodVlanMapVO; import com.cloud.dc.Vlan; @@ -30,23 +43,13 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; @Component @Local(value = {VlanDao.class}) public class VlanDaoImpl extends GenericDaoBase implements VlanDao { - private final String FindZoneWideVlans = "SELECT * FROM vlan WHERE data_center_id=? and vlan_type=? and vlan_id!=? and id not in (select vlan_db_id from account_vlan_map)"; + private final String FindZoneWideVlans = + "SELECT * FROM vlan WHERE data_center_id=? and vlan_type=? and vlan_id!=? and id not in (select vlan_db_id from account_vlan_map)"; protected SearchBuilder ZoneVlanIdSearch; protected SearchBuilder ZoneSearch; diff --git a/engine/schema/src/com/cloud/domain/DomainVO.java b/engine/schema/src/com/cloud/domain/DomainVO.java index 68261e5c65c..f6494b3a230 100644 --- a/engine/schema/src/com/cloud/domain/DomainVO.java +++ b/engine/schema/src/com/cloud/domain/DomainVO.java @@ -26,10 +26,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.InternalIdentity; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.GenericDao; @Entity @@ -113,10 +111,10 @@ public class DomainVO implements Domain { @Override public void setParent(Long parent) { if (parent == null) { - this.parent = DomainVO.ROOT_DOMAIN; + this.parent = Domain.ROOT_DOMAIN; } else { - if (parent.longValue() <= DomainVO.ROOT_DOMAIN) - this.parent = DomainVO.ROOT_DOMAIN; + if (parent.longValue() <= Domain.ROOT_DOMAIN) + this.parent = Domain.ROOT_DOMAIN; else this.parent = parent; } diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java index 7c1f33ce973..e02daf16667 100644 --- a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java +++ b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java @@ -105,8 +105,8 @@ public class DomainDaoImpl extends GenericDaoBase implements Dom throw new IllegalArgumentException("Domain name is null. Please specify a valid domain name."); } - long parent = DomainVO.ROOT_DOMAIN; - if (domain.getParent() != null && domain.getParent().longValue() >= DomainVO.ROOT_DOMAIN) { + long parent = Domain.ROOT_DOMAIN; + if (domain.getParent() != null && domain.getParent().longValue() >= Domain.ROOT_DOMAIN) { parent = domain.getParent().longValue(); } @@ -147,7 +147,7 @@ public class DomainDaoImpl extends GenericDaoBase implements Dom @DB public boolean remove(Long id) { // check for any active users / domains assigned to the given domain id and don't remove the domain if there are any - if (id != null && id.longValue() == DomainVO.ROOT_DOMAIN) { + if (id != null && id.longValue() == Domain.ROOT_DOMAIN) { s_logger.error("Can not remove domain " + id + " as it is ROOT domain"); return false; } diff --git a/engine/schema/src/com/cloud/event/EventVO.java b/engine/schema/src/com/cloud/event/EventVO.java index 6f99d1c0e0a..487ba849c18 100644 --- a/engine/schema/src/com/cloud/event/EventVO.java +++ b/engine/schema/src/com/cloud/event/EventVO.java @@ -87,6 +87,7 @@ public class EventVO implements Event { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/event/UsageEventVO.java b/engine/schema/src/com/cloud/event/UsageEventVO.java index 7b4a99e3774..719a79bde6e 100644 --- a/engine/schema/src/com/cloud/event/UsageEventVO.java +++ b/engine/schema/src/com/cloud/event/UsageEventVO.java @@ -26,7 +26,6 @@ import javax.persistence.Id; import javax.persistence.Table; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "usage_event") diff --git a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java index 5306e4d54e3..be589e7649b 100644 --- a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java @@ -30,8 +30,8 @@ import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {EventDao.class}) diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java index 50b6bb0679d..f9261a96b87 100644 --- a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java @@ -48,10 +48,12 @@ public class UsageEventDaoImpl extends GenericDaoBase implem private final SearchBuilder latestEventsSearch; private final SearchBuilder IpeventsSearch; - private static final String COPY_EVENTS = "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) " - + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id > ? and vmevt.id <= ? "; - private static final String COPY_ALL_EVENTS = "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) " - + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id <= ?"; + private static final String COPY_EVENTS = + "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) " + + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id > ? and vmevt.id <= ? "; + private static final String COPY_ALL_EVENTS = + "INSERT INTO cloud_usage.usage_event (id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size) " + + "SELECT id, type, account_id, created, zone_id, resource_id, resource_name, offering_id, template_id, size, resource_type, virtual_size FROM cloud.usage_event vmevt WHERE vmevt.id <= ?"; private static final String MAX_EVENT = "select max(id) from cloud.usage_event where created <= ?"; @Inject protected UsageEventDetailsDao usageEventDetailsDao; diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java index cbd92b6f763..b2be1c934eb 100644 --- a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java @@ -16,18 +16,20 @@ // under the License. package com.cloud.event.dao; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.event.UsageEventDetailsVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Component @Local(value = {UsageEventDetailsDao.class}) diff --git a/engine/schema/src/com/cloud/host/DetailVO.java b/engine/schema/src/com/cloud/host/DetailVO.java index 21eac2c75e3..1c781c68407 100644 --- a/engine/schema/src/com/cloud/host/DetailVO.java +++ b/engine/schema/src/com/cloud/host/DetailVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.host; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "host_details") public class DetailVO implements InternalIdentity { @@ -67,6 +67,7 @@ public class DetailVO implements InternalIdentity { this.value = value; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/host/HostTagVO.java b/engine/schema/src/com/cloud/host/HostTagVO.java index 2393006178f..6b8b754849c 100644 --- a/engine/schema/src/com/cloud/host/HostTagVO.java +++ b/engine/schema/src/com/cloud/host/HostTagVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.host; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "host_tags") public class HostTagVO implements InternalIdentity { @@ -59,6 +59,7 @@ public class HostTagVO implements InternalIdentity { this.tag = tag; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java index 07b87a8fa9f..56c066b1b72 100755 --- a/engine/schema/src/com/cloud/host/HostVO.java +++ b/engine/schema/src/com/cloud/host/HostVO.java @@ -37,13 +37,11 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.cloudstack.api.Identity; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.resource.ResourceState; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "host") @@ -379,10 +377,10 @@ public class HostVO implements Host { this.uuid = UUID.randomUUID().toString(); } - public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask, - String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, String duxStorageNetmask, - String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, - String parent, long totalSize, StoragePoolType fsType) { + public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, + String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, + String duxStorageNetmask, String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, + long serverId, long ping, String parent, long totalSize, StoragePoolType fsType) { this(id, name, type, @@ -415,9 +413,10 @@ public class HostVO implements Host { this.uuid = UUID.randomUUID().toString(); } - public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask, - String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, String version, String url, - Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, long dom0MinMemory, String caps) { + public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, + String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, + String version, String url, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, + long dom0MinMemory, String caps) { this.id = id; this.name = name; this.status = status; diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java index c51e2c7ff60..08a436644ba 100755 --- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java @@ -284,8 +284,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao JoinType.LEFTOUTER); ClusterManagedSearch = _clusterDao.createSearchBuilder(); ClusterManagedSearch.and("managed", ClusterManagedSearch.entity().getManagedState(), SearchCriteria.Op.EQ); - UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(), - UnmanagedDirectConnectSearch.entity().getClusterId(), JoinType.INNER); + UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(), UnmanagedDirectConnectSearch.entity() + .getClusterId(), JoinType.INNER); UnmanagedDirectConnectSearch.done(); DirectConnectSearch = createSearchBuilder(); @@ -733,7 +733,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao List result = new ArrayList(); ResultSet rs = null; try { - String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;"; + String sql = + "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;"; pstmt = txn.prepareStatement(sql); pstmt.setLong(1, timeout); rs = pstmt.executeQuery(); @@ -824,10 +825,11 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override @DB public List getRunningHostCounts(Date cutTime) { - String sql = "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " - + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL " - + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " - + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type"; + String sql = + "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " + + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL " + + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid " + + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type"; ArrayList l = new ArrayList(); @@ -946,7 +948,13 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao .append(":lastpinged=") .append(host.getLastPinged()) .append("]"); - str.append("; Old=[status=").append(oldStatus.toString()).append(":msid=").append(host.getManagementServerId()).append(":lastpinged=").append(oldPingTime).append("]"); + str.append("; Old=[status=") + .append(oldStatus.toString()) + .append(":msid=") + .append(host.getManagementServerId()) + .append(":lastpinged=") + .append(oldPingTime) + .append("]"); str.append("; DB=[status=") .append(vo.getStatus().toString()) .append(":msid=") diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java index 4f38782787d..50c0b7e6d59 100644 --- a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java +++ b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java @@ -17,6 +17,7 @@ package com.cloud.host.dao; import java.util.List; + import com.cloud.host.HostTagVO; import com.cloud.utils.db.GenericDao; diff --git a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java index fd6e654e6d5..2deeb2e2e34 100644 --- a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java +++ b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java @@ -27,10 +27,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.NumbersUtil; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "hypervisor_capabilities") @@ -72,7 +70,8 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities { this.uuid = UUID.randomUUID().toString(); } - public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled, boolean storageMotionSupported) { + public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled, + boolean storageMotionSupported) { this.hypervisorType = hypervisorType; this.hypervisorVersion = hypervisorVersion; this.maxGuestsLimit = maxGuestsLimit; @@ -153,6 +152,7 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities { return storageMotionSupported; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java index b5057f7298d..2b94e69737d 100644 --- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java +++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java @@ -16,16 +16,18 @@ // under the License. package com.cloud.hypervisor.dao; +import java.util.List; + +import javax.ejb.Local; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorCapabilitiesVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = HypervisorCapabilitiesDao.class) diff --git a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java index 0d365fe3a4c..6c51a26713d 100644 --- a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java +++ b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java @@ -80,7 +80,8 @@ public class KeystoreDaoImpl extends GenericDaoBase implements try { txn.start(); - String sql = "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?"; + String sql = + "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?"; PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql); pstmt.setString(1, name); pstmt.setString(2, certificate); diff --git a/engine/schema/src/com/cloud/keystore/KeystoreVO.java b/engine/schema/src/com/cloud/keystore/KeystoreVO.java index fd5c18536d5..66dfac10058 100644 --- a/engine/schema/src/com/cloud/keystore/KeystoreVO.java +++ b/engine/schema/src/com/cloud/keystore/KeystoreVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.keystore; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "keystore") public class KeystoreVO implements InternalIdentity { @@ -51,6 +51,7 @@ public class KeystoreVO implements InternalIdentity { public KeystoreVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java index a3f00b7b0ab..f1e8fe8f82f 100644 --- a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java +++ b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java @@ -16,11 +16,6 @@ // under the License. package com.cloud.network; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import java.util.UUID; import javax.persistence.Column; @@ -32,7 +27,6 @@ import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; import com.cloud.network.rules.HealthCheckPolicy; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("load_balancer_healthcheck_policies")) @@ -106,38 +100,47 @@ public class LBHealthCheckPolicyVO implements HealthCheckPolicy { } + @Override public int getResponseTime() { return responseTime; } + @Override public int getHealthcheckInterval() { return healthcheckInterval; } + @Override public int getHealthcheckThresshold() { return healthcheckThresshold; } + @Override public int getUnhealthThresshold() { return unhealthThresshold; } + @Override public long getId() { return id; } + @Override public long getLoadBalancerId() { return loadBalancerId; } + @Override public String getpingpath() { return pingPath; } + @Override public String getDescription() { return description; } + @Override public boolean isRevoke() { return revoke; } diff --git a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java index 264e4152879..3098a68c27c 100644 --- a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java +++ b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java @@ -27,7 +27,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Transient; import com.cloud.utils.db.GenericDao; @@ -149,6 +148,7 @@ public class UserIpv6AddressVO implements UserIpv6Address { this.state = state; } + @Override public String getMacAddress() { return macAddress; } diff --git a/engine/schema/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/com/cloud/network/VpnUserVO.java index 09c14ad8902..07b6326e768 100644 --- a/engine/schema/src/com/cloud/network/VpnUserVO.java +++ b/engine/schema/src/com/cloud/network/VpnUserVO.java @@ -27,9 +27,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.Encrypt; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("vpn_users")) diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java index 93905a5154d..834422f1065 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.as; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("autoscale_policy_condition_map")) public class AutoScalePolicyConditionMapVO implements InternalIdentity { @@ -48,6 +48,7 @@ public class AutoScalePolicyConditionMapVO implements InternalIdentity { this.conditionId = conditionId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java index f8fbcb483f5..fbaf8e94d03 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java @@ -28,9 +28,10 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "autoscale_policies") @Inheritance(strategy = InheritanceType.JOINED) @@ -87,6 +88,7 @@ public class AutoScalePolicyVO implements AutoScalePolicy, InternalIdentity { return id; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java index 6bec99eeb10..b2753641e22 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.as; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("autoscale_vmgroup_policy_map")) public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity { @@ -51,6 +51,7 @@ public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity { this(vmgroupId, policyId); } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java index d1d85f9e293..4eed0863dd0 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java @@ -28,9 +28,10 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "autoscale_vmgroups") @Inheritance(strategy = InheritanceType.JOINED) @@ -83,7 +84,8 @@ public class AutoScaleVmGroupVO implements AutoScaleVmGroup, InternalIdentity { public AutoScaleVmGroupVO() { } - public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId, String state) { + public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId, + String state) { this.uuid = UUID.randomUUID().toString(); this.loadBalancerId = lbRuleId; this.minMembers = minMembers; diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java index a7ad532dc69..ec643b0a139 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java @@ -34,10 +34,11 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.utils.Pair; import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.NetUtils; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "autoscale_vmprofiles") diff --git a/engine/schema/src/com/cloud/network/as/ConditionVO.java b/engine/schema/src/com/cloud/network/as/ConditionVO.java index bbae72f2312..8d7e776c89f 100644 --- a/engine/schema/src/com/cloud/network/as/ConditionVO.java +++ b/engine/schema/src/com/cloud/network/as/ConditionVO.java @@ -30,9 +30,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.cloudstack.api.Identity; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "conditions") public class ConditionVO implements Condition, Identity, InternalIdentity { diff --git a/engine/schema/src/com/cloud/network/as/CounterVO.java b/engine/schema/src/com/cloud/network/as/CounterVO.java index b7b03f716b0..2ba71f0ced3 100644 --- a/engine/schema/src/com/cloud/network/as/CounterVO.java +++ b/engine/schema/src/com/cloud/network/as/CounterVO.java @@ -30,9 +30,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.cloudstack.api.Identity; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "counter") public class CounterVO implements Counter, Identity, InternalIdentity { diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java index 9a614f404d0..5933f36b8f7 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java @@ -47,6 +47,7 @@ public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase implements AutoScalePolicyDao { + @Override public int removeByAccountId(long accountId) { SearchCriteria sc = createSearchCriteria(); diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java index 8235823dcfc..2bb8fd3b61f 100644 --- a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java @@ -46,6 +46,7 @@ public class ConditionDaoImpl extends GenericDaoBase implemen return findOneBy(sc); } + @Override public int removeByAccountId(long accountId) { SearchCriteria sc = createSearchCriteria(); diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java index dc1ec895d80..e3b223edad1 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java @@ -16,11 +16,10 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.dao.AccountGuestVlanMapVO; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface AccountGuestVlanMapDao extends GenericDao { public List listAccountGuestVlanMapsByAccount(long accountId); diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java index 20fa5d00429..a31798fc923 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java @@ -16,11 +16,10 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.dao.AccountGuestVlanMapVO; -import com.cloud.network.dao.AccountGuestVlanMapDao; - import java.util.List; + import javax.ejb.Local; + import org.springframework.stereotype.Component; import com.cloud.utils.db.DB; diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java index 67227a76be3..4234c73441f 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java @@ -16,11 +16,17 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.GuestVlan; - -import javax.persistence.*; import java.util.UUID; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import com.cloud.network.GuestVlan; + @Entity @Table(name = "account_vnet_map") public class AccountGuestVlanMapVO implements GuestVlan { diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java index c9334effdce..11fa5ed7698 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java @@ -17,6 +17,7 @@ package com.cloud.network.dao; import java.util.List; + import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -77,7 +78,8 @@ public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, FirewallDeviceAllocationState allocationState) { + public List listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, + FirewallDeviceAllocationState allocationState) { SearchCriteria sc = allocationStateSearch.create(); sc.setParameters("physicalNetworkId", physicalNetworkId); sc.setParameters("providerName", providerName); diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java index 76460a3d601..2e49ba83423 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java @@ -16,9 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.UUID; import javax.persistence.Column; @@ -30,6 +27,9 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + /** * ExternalFirewallDeviceVO contains information of a external firewall device (Juniper SRX) added into a deployment */ @@ -97,6 +97,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } @@ -149,6 +150,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity { isDedicatedDevice = isDedicated; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java index b7baa7e19ba..b7555989f04 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java @@ -16,12 +16,12 @@ // under the License. package com.cloud.network.dao; +import java.util.List; + import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.utils.db.GenericDao; -import java.util.List; - public interface ExternalLoadBalancerDeviceDao extends GenericDao { /** diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java index 88c0d37ff1d..f12d06324bf 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java @@ -16,6 +16,12 @@ // under the License. package com.cloud.network.dao; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState; import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState; import com.cloud.utils.db.DB; @@ -23,10 +29,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = ExternalLoadBalancerDeviceDao.class) @@ -76,6 +78,7 @@ public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase listByPhysicalNetwork(long physicalNetworkId) { SearchCriteria sc = physicalNetworkIdSearch.create(); sc.setParameters("physicalNetworkId", physicalNetworkId); diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java index e7222a84315..8cc13fd23a0 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java @@ -16,13 +16,21 @@ // under the License. package com.cloud.network.dao; +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import javax.persistence.*; -import java.util.UUID; - /** * ExternalLoadBalancerDeviceVO contains information on external load balancer devices (F5/Netscaler VPX,MPX,SDX) added into a deployment */ @@ -92,7 +100,8 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity Provider // This state is set only for device that can dynamically provision LB appliances } - public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated, boolean gslbProvider) { + public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated, + boolean gslbProvider) { this.physicalNetworkId = physicalNetworkId; this.providerName = provider_name; this.deviceName = device_name; @@ -123,6 +132,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } @@ -215,6 +225,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity return gslbSitePrivateIP; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java index d0aacff956a..e6871bb35ad 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("firewall_rules_cidrs")) public class FirewallRulesCidrsVO implements InternalIdentity { @@ -47,6 +47,7 @@ public class FirewallRulesCidrsVO implements InternalIdentity { this.sourceCidrList = sourceCidrList; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java index 44989dc10c9..6a4348691c0 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java @@ -241,7 +241,8 @@ public class FirewallRulesDaoImpl extends GenericDaoBase i } @Override - public List listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol, FirewallRule.Purpose purpose) { + public List listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol, + FirewallRule.Purpose purpose) { SearchCriteria sc = NotRevokedSearch.create(); sc.setParameters("ipId", ipAddressId); sc.setParameters("state", State.Revoke); diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java index 5cc91e6f2a3..fb92cf9191a 100755 --- a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java @@ -16,14 +16,12 @@ // under the License. package com.cloud.network.dao; +import java.util.List; + import com.cloud.dc.Vlan.VlanType; -import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.Ip; -import java.sql.SQLException; -import java.util.List; - public interface IPAddressDao extends GenericDao { IPAddressVO markAsUnavailable(long ipAddressId); diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java index 8ad3f706399..97c4de142b1 100755 --- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java @@ -16,7 +16,18 @@ // under the License. package com.cloud.network.dao; -import com.cloud.dc.DataCenterVnetVO; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Date; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.VlanDao; @@ -33,17 +44,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.Ip; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import javax.ejb.Local; -import javax.inject.Inject; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Date; -import java.util.List; @Component @Local(value = {IPAddressDao.class}) @@ -112,7 +112,8 @@ public class IPAddressDaoImpl extends GenericDaoBase implemen SearchBuilder virtaulNetworkVlan = _vlanDao.createSearchBuilder(); virtaulNetworkVlan.and("vlanType", virtaulNetworkVlan.entity().getVlanType(), SearchCriteria.Op.EQ); - AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(), JoinBuilder.JoinType.INNER); + AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(), + JoinBuilder.JoinType.INNER); virtaulNetworkVlan.done(); AllIpCountForDashboard.done(); @@ -289,7 +290,8 @@ public class IPAddressDaoImpl extends GenericDaoBase implemen TransactionLegacy txn = TransactionLegacy.currentTxn(); int ipCount = 0; try { - String sql = "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)"; + String sql = + "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)"; PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql); pstmt.setLong(1, dcId); diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java index 3d4592d4d4f..d71a90fc4fc 100644 --- a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java @@ -253,6 +253,7 @@ public class IPAddressVO implements IpAddress { return state; } + @Override public void setState(State state) { this.state = state; } @@ -284,6 +285,7 @@ public class IPAddressVO implements IpAddress { this.uuid = uuid; } + @Override public Long getPhysicalNetworkId() { return physicalNetworkId; } diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java index 22571496adb..3bfb076c7f4 100644 --- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("inline_load_balancer_nic_map")) public class InlineLoadBalancerNicMapVO implements InternalIdentity { @@ -47,6 +47,7 @@ public class InlineLoadBalancerNicMapVO implements InternalIdentity { this.nicId = nicId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java index d7c2bc2dc8f..6e8dfbb0329 100644 --- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java +++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java @@ -30,9 +30,9 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; + import com.cloud.network.rules.StickinessPolicy; import com.cloud.utils.Pair; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("load_balancer_stickiness_policies")) @@ -97,6 +97,7 @@ public class LBStickinessPolicyVO implements StickinessPolicy { this.uuid = UUID.randomUUID().toString(); } + @Override public List> getParams() { List> paramsList = new ArrayList>(); String[] params = paramsInDB.split("[=&]"); @@ -107,26 +108,32 @@ public class LBStickinessPolicyVO implements StickinessPolicy { return paramsList; } + @Override public long getId() { return id; } + @Override public long getLoadBalancerId() { return loadBalancerId; } + @Override public String getName() { return name; } + @Override public String getDescription() { return description; } + @Override public String getMethodName() { return methodName; } + @Override public boolean isRevoke() { return revoke; } diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java index 1bd320ca230..1e038a1f814 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java @@ -16,11 +16,10 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.LBHealthCheckPolicyVO; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface LoadBalancerCertMapDao extends GenericDao { List listByCertId(Long certId); diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java index b196961b6a0..c84b97dbc60 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java @@ -16,15 +16,16 @@ // under the License. package com.cloud.network.dao; +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import javax.ejb.Local; -import javax.inject.Inject; -import java.util.List; - @Local(value = {LoadBalancerCertMapDao.class}) public class LoadBalancerCertMapDaoImpl extends GenericDaoBase implements LoadBalancerCertMapDao { diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java index ea89246fad2..f95c61733f2 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java @@ -16,13 +16,14 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; +import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import java.util.UUID; + +import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "load_balancer_cert_map") diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java index 27c8f79dccc..0a67106dc9b 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("load_balancer_vm_map")) public class LoadBalancerVMMapVO implements InternalIdentity { @@ -59,6 +59,7 @@ public class LoadBalancerVMMapVO implements InternalIdentity { this.revoke = revoke; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java index 88d83d49e39..865e7d2c365 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java @@ -65,8 +65,8 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer { public LoadBalancerVO() { } - public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId, long domainId, - String lbProtocol) { + public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId, + long domainId, String lbProtocol) { super(xId, srcIpId, srcPort, NetUtils.TCP_PROTO, networkId, accountId, domainId, Purpose.LoadBalancing, null, null, null, null); this.name = name; this.description = description; @@ -106,6 +106,7 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer { this.name = name; } + @Override public String getLbProtocol() { return lbProtocol; } diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java index 6856a919a2a..66e2531a9f8 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java @@ -17,10 +17,10 @@ package com.cloud.network.dao; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface MonitoringServiceDao extends GenericDao { List listAllServices(); diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java index 8a806273e51..c2292a245ba 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java @@ -17,13 +17,15 @@ package com.cloud.network.dao; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = MonitoringServiceDao.class) diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java index 62a6196ab05..1d7ef145397 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java @@ -16,11 +16,17 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.MonitoringService; - -import javax.persistence.*; import java.util.UUID; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import com.cloud.network.MonitoringService; + @Entity @Table(name = "monitoring_services") public class MonitoringServiceVO implements MonitoringService { @@ -64,6 +70,7 @@ public class MonitoringServiceVO implements MonitoringService { @Column(name = "uuid") String uuid = UUID.randomUUID().toString(); + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java index 7c71dee64e5..208d13075d5 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java @@ -23,9 +23,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.user.OwnedBy; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.user.OwnedBy; + @Entity @Table(name = "account_network_ref") public class NetworkAccountVO implements OwnedBy, InternalIdentity { diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/com/cloud/network/dao/NetworkDao.java index e9405e90046..6d49b0ac92b 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDao.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDao.java @@ -21,8 +21,8 @@ import java.util.Map; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.Network.State; +import com.cloud.network.Networks.TrafficType; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.fsm.StateDao; diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java index 5ead3168632..13fb64e4e9f 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java @@ -25,15 +25,16 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.TableGenerator; -import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; + import com.cloud.network.Network; +import com.cloud.network.Network.Event; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.Network.State; -import com.cloud.network.Network.Event; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; @@ -42,10 +43,17 @@ import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.utils.db.*; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.GenericSearchBuilder; +import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.JoinBuilder.JoinType; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.SequenceFetcher; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.NetUtils; @Component @@ -191,7 +199,8 @@ public class NetworkDaoImpl extends GenericDaoBase implements N SearchBuilder join4 = _accountsDao.createSearchBuilder(); join4.and("account", join4.entity().getAccountId(), Op.EQ); join4.and("isOwner", join4.entity().isOwner(), Op.EQ); - NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(), JoinBuilder.JoinType.INNER); + NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(), + JoinBuilder.JoinType.INNER); SearchBuilder join5 = _ntwkOffDao.createSearchBuilder(); join5.and("specifyVlan", join5.entity().getSpecifyVlan(), Op.EQ); NetworksRegularUserCanCreateSearch.join("ntwkOff", join5, NetworksRegularUserCanCreateSearch.entity().getNetworkOfferingId(), join5.entity().getId(), @@ -221,8 +230,8 @@ public class NetworkDaoImpl extends GenericDaoBase implements N OfferingAccountNetworkSearch.select(null, Func.DISTINCT, OfferingAccountNetworkSearch.entity().getId()); SearchBuilder ntwkOfferingJoin = _ntwkOffDao.createSearchBuilder(); ntwkOfferingJoin.and("isSystem", ntwkOfferingJoin.entity().isSystemOnly(), Op.EQ); - OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity().getId(), - JoinBuilder.JoinType.LEFT); + OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity() + .getId(), JoinBuilder.JoinType.LEFT); SearchBuilder ntwkAccountJoin = _accountsDao.createSearchBuilder(); ntwkAccountJoin.and("accountId", ntwkAccountJoin.entity().getAccountId(), Op.EQ); OfferingAccountNetworkSearch.join("ntwkAccountSearch", ntwkAccountJoin, OfferingAccountNetworkSearch.entity().getId(), ntwkAccountJoin.entity().getNetworkId(), diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java index 3ef6847be00..c4fb4811661 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java @@ -18,9 +18,10 @@ package com.cloud.network.dao; import javax.ejb.Local; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; + @Component @Local(value = NetworkDetailsDao.class) public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkDetailsDao { diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java index 8d7eff3aa5c..e5ee255b0b1 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java @@ -52,7 +52,7 @@ public class NetworkDomainDaoImpl extends GenericDaoBase @Override public List listDomainNetworkMapByDomain(Object... domainId) { SearchCriteria sc = DomainsSearch.create(); - sc.setParameters("domainId", (Object[])domainId); + sc.setParameters("domainId", domainId); return listBy(sc); } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java index a3be08bba01..99cbb50953a 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java @@ -23,9 +23,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.domain.PartOf; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.domain.PartOf; + @Entity @Table(name = "domain_network_ref") public class NetworkDomainVO implements PartOf, InternalIdentity { diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java index 096a09f0d90..9cf9a6158da 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java @@ -26,9 +26,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + /** * NetworkExternalFirewallVO contains information on the networks that are using external firewall */ @@ -66,6 +67,7 @@ public class NetworkExternalFirewallVO implements InternalIdentity { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java index 095a1ce7fe6..6ba5c8fd8b8 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java @@ -26,9 +26,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + /** * NetworkExternalLoadBalancerVO contains mapping of a network and the external load balancer device id assigned to the network */ @@ -67,6 +68,7 @@ public class NetworkExternalLoadBalancerVO implements InternalIdentity { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java index 03a60e90b70..307b96479e4 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java @@ -16,12 +16,9 @@ // under the License. package com.cloud.network.dao; -import java.util.List; - import org.springframework.stereotype.Component; import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; @@ -51,6 +48,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase implemen assert _activeNicsAttribute != null : "Cannot find activeNicsCount"; } + @Override public int getActiveNics(long networkId) { SearchCriteria sc = ActiveNicsSearch.create(); sc.setParameters("network", networkId); @@ -58,6 +56,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase implemen return customSearch(sc, null).get(0); } + @Override public void changeActiveNicsBy(long networkId, int count) { SearchCriteria sc = AllFieldsSearch.create(); @@ -70,12 +69,14 @@ public class NetworkOpDaoImpl extends GenericDaoBase implemen update(builder, sc, null); } + @Override public void setCheckForGc(long networkId) { NetworkOpVO vo = createForUpdate(); vo.setCheckForGc(true); update(networkId, vo); } + @Override public void clearCheckForGc(long networkId) { NetworkOpVO vo = createForUpdate(); vo.setCheckForGc(false); diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java index f23727952aa..ea381166b07 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java @@ -16,13 +16,13 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "op_networks") public class NetworkOpVO implements InternalIdentity { @@ -50,6 +50,7 @@ public class NetworkOpVO implements InternalIdentity { this.activeNicsCount = 0; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java index 17281dc3b91..ebb1eb2326b 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java @@ -37,12 +37,14 @@ public class NetworkRuleConfigDaoImpl extends GenericDaoBase listBySecurityGroupId(long securityGroupId) { SearchCriteria sc = SecurityGroupIdSearch.create(); sc.setParameters("securityGroupId", securityGroupId); return listBy(sc); } + @Override public void deleteBySecurityGroup(long securityGroupId) { SearchCriteria sc = SecurityGroupIdSearch.create(); sc.setParameters("securityGroupId", securityGroupId); diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java index 596c3ab500d..4e1e9aff456 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java @@ -25,11 +25,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.network.Network; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "ntwk_service_map") @@ -51,6 +51,7 @@ public class NetworkServiceMapVO implements InternalIdentity { @Column(name = GenericDao.CREATED_COLUMN) Date created; + @Override public long getId() { return id; } @@ -80,6 +81,7 @@ public class NetworkServiceMapVO implements InternalIdentity { this.provider = provider.getName(); } + @Override public String toString() { StringBuilder buf = new StringBuilder("[Network Service["); return buf.append(networkId).append("-").append(service).append("-").append(provider).append("]").toString(); diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java index 03960b8d5a5..f3776df89b8 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java @@ -180,7 +180,8 @@ public class NetworkVO implements Network { * @param dataCenterId * @param physicalNetworkId TODO */ - public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId, Long physicalNetworkId) { + public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId, + Long physicalNetworkId) { this.trafficType = trafficType; this.mode = mode; this.broadcastDomainType = broadcastDomainType; @@ -196,8 +197,8 @@ public class NetworkVO implements Network { this.uuid = UUID.randomUUID().toString(); } - public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText, String networkDomain, - GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) { + public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText, + String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) { this(id, that.getTrafficType(), that.getMode(), @@ -247,8 +248,9 @@ public class NetworkVO implements Network { * @param vpcId TODO * @param dataCenterId */ - public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId, long related, - String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) { + public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId, + long related, String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, + boolean specifyIpRanges, Long vpcId) { this(trafficType, mode, broadcastDomainType, networkOfferingId, State.Allocated, dcId, physicalNetworkId); this.domainId = domainId; this.accountId = accountId; @@ -334,6 +336,7 @@ public class NetworkVO implements Network { this.guruData = guruData; } + @Override public String getGuruName() { return guruName; } @@ -360,6 +363,7 @@ public class NetworkVO implements Network { return trafficType; } + @Override public void setTrafficType(TrafficType trafficType) { this.trafficType = trafficType; } @@ -510,6 +514,7 @@ public class NetworkVO implements Network { return buf.toString(); } + @Override public String getUuid() { return this.uuid; } @@ -518,6 +523,7 @@ public class NetworkVO implements Network { this.uuid = uuid; } + @Override public ControlledEntity.ACLType getAclType() { return aclType; } @@ -541,6 +547,7 @@ public class NetworkVO implements Network { return vpcId; } + @Override public String getIp6Cidr() { return ip6Cidr; } @@ -549,6 +556,7 @@ public class NetworkVO implements Network { this.ip6Cidr = ip6Cidr; } + @Override public String getIp6Gateway() { return ip6Gateway; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java index 1da9cc17e89..11b4399fcca 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java @@ -28,7 +28,8 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase implements GenericDao { +public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase implements + GenericDao { private final GenericSearchBuilder IsolationMethodSearch; private final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java index 1e8cc60889f..65d776ed5b8 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + /** * */ @@ -54,6 +54,7 @@ public class PhysicalNetworkIsolationMethodVO implements InternalIdentity { this.isolationMethod = isolationMethod; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java index 90b0cc4ceb2..415b513b405 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java @@ -30,10 +30,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.network.Network.Service; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "physical_network_service_providers") diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java index f39c6900560..df9030aacf6 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + /** * */ @@ -54,6 +54,7 @@ public class PhysicalNetworkTagVO implements InternalIdentity { this.tag = tag; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java index 9541d0fdcf4..395a4e3f269 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java @@ -29,7 +29,6 @@ import javax.persistence.Table; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkTrafficType; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "physical_network_traffic_types") @@ -70,8 +69,8 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType public PhysicalNetworkTrafficTypeVO() { } - public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, String vlan, - String hypervLabel) { + public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, + String vlan, String hypervLabel) { this.physicalNetworkId = physicalNetworkId; this.trafficType = trafficType; this.xenNetworkLabel = xenLabel; diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java index 43a9bd45082..837c9b42a54 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java @@ -17,6 +17,7 @@ package com.cloud.network.dao; import java.util.List; + import com.cloud.utils.db.GenericDao; public interface PortProfileDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java index 6ba546d40f1..211280dbe1f 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java @@ -20,6 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; + import javax.ejb.Local; import org.apache.log4j.Logger; @@ -29,8 +30,8 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component @@ -54,17 +55,20 @@ public class PortProfileDaoImpl extends GenericDaoBase impl accessVlanSearch.done(); } + @Override public PortProfileVO findByName(String portProfileName) { SearchCriteria sc = nameSearch.create(); sc.setParameters("portProfileName", portProfileName); return findOneBy(sc); } + @Override @DB public boolean doesVlanRangeClash(int lowVlanId, int highVlanId) { String dbName = "cloud"; String tableName = "port_profile"; - String condition = "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")"; + String condition = + "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")"; String selectSql = "SELECT * FROM `" + dbName + "`.`" + tableName + "` WHERE " + condition; TransactionLegacy txn = TransactionLegacy.currentTxn(); @@ -81,6 +85,7 @@ public class PortProfileDaoImpl extends GenericDaoBase impl return false; } + @Override public List listByVlanId(int vlanId) { SearchCriteria sc = accessVlanSearch.create(); sc.setParameters("accessVlanId", vlanId); diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java index 969c7f47b61..94ea0891057 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java @@ -25,9 +25,11 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.exception.InvalidParameterValueException; + import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.exception.InvalidParameterValueException; + /** * PortProfileVO contains information on portprofiles that are created on a Cisco Nexus 1000v VSM associated * with a VMWare cluster. @@ -86,6 +88,7 @@ public class PortProfileVO implements InternalIdentity { } // Accessor methods + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java index bcf2f93b946..495a99f5fa7 100644 --- a/engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/RouterNetworkDaoImpl.java @@ -20,7 +20,6 @@ import java.util.List; import org.springframework.stereotype.Component; -import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; @@ -46,12 +45,14 @@ public class RouterNetworkDaoImpl extends GenericDaoBase AllFieldsSearch.done(); } + @Override public List getRouterNetworks(long routerId) { SearchCriteria sc = RouterNetworksSearch.create(); sc.setParameters("routerId", routerId); return customSearch(sc, null); } + @Override public RouterNetworkVO findByRouterAndNetwork(long routerId, long networkId) { SearchCriteria sc = AllFieldsSearch.create(); sc.setParameters("routerId", routerId); diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java b/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java index 232b393577a..db86cfa26b0 100644 --- a/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java @@ -25,9 +25,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.network.Network; import com.cloud.network.Network.GuestType; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "router_network_ref") @@ -67,6 +68,7 @@ public class RouterNetworkVO implements InternalIdentity { return guestType; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java index 09a845a46f5..c922855d53d 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java @@ -29,7 +29,6 @@ import javax.persistence.Table; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.utils.db.Encrypt; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("s2s_customer_gateway")) @@ -82,8 +81,8 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway { public Site2SiteCustomerGatewayVO() { } - public Site2SiteCustomerGatewayVO(String name, long accountId, long domainId, String gatewayIp, String guestCidrList, String ipsecPsk, String ikePolicy, String espPolicy, - long ikeLifetime, long espLifetime, boolean dpd) { + public Site2SiteCustomerGatewayVO(String name, long accountId, long domainId, String gatewayIp, String guestCidrList, String ipsecPsk, String ikePolicy, + String espPolicy, long ikeLifetime, long espLifetime, boolean dpd) { this.name = name; this.gatewayIp = gatewayIp; this.guestCidrList = guestCidrList; @@ -193,6 +192,7 @@ public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway { this.dpd = dpd; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java index 33b2cf2deb0..96a4c2d520a 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java @@ -28,11 +28,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.network.Site2SiteVpnConnection; -import com.cloud.network.Site2SiteVpnConnection.State; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.network.Site2SiteVpnConnection; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = ("s2s_vpn_connection")) public class Site2SiteVpnConnectionVO implements Site2SiteVpnConnection, InternalIdentity { @@ -132,6 +132,7 @@ public class Site2SiteVpnConnectionVO implements Site2SiteVpnConnection, Interna this.removed = removed; } + @Override public String getUuid() { return uuid; } @@ -146,6 +147,7 @@ public class Site2SiteVpnConnectionVO implements Site2SiteVpnConnection, Interna return accountId; } + @Override public boolean isPassive() { return passive; } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java index 980a7ebb6a3..3a16bcdf139 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java @@ -28,7 +28,6 @@ import javax.persistence.Table; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("s2s_vpn_gateway")) @@ -99,6 +98,7 @@ public class Site2SiteVpnGatewayVO implements Site2SiteVpnGateway { this.removed = removed; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDao.java b/engine/schema/src/com/cloud/network/dao/SslCertDao.java index bc9c699d1e7..cea7fc502bb 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertDao.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertDao.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.network.dao; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface SslCertDao extends GenericDao { List listByAccountId(Long id); } \ No newline at end of file diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java index 7aba94f5509..99354c5dbc2 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java @@ -16,13 +16,14 @@ // under the License. package com.cloud.network.dao; +import java.util.List; + +import javax.ejb.Local; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import javax.ejb.Local; -import java.util.List; - @Local(value = {SslCertDao.class}) public class SslCertDaoImpl extends GenericDaoBase implements SslCertDao { diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/com/cloud/network/dao/SslCertVO.java index d117f3bfde2..7d73f49daed 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertVO.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertVO.java @@ -16,16 +16,15 @@ // under the License. package com.cloud.network.dao; -import com.cloud.network.lb.SslCert; -import com.cloud.utils.db.Encrypt; -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.api.InternalIdentity; +import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import java.util.UUID; + +import com.cloud.network.lb.SslCert; +import com.cloud.utils.db.Encrypt; @Entity @Table(name = "sslcerts") diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java index c0233dd1061..80c39d283a4 100644 --- a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java +++ b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDao.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.Network; import com.cloud.network.UserIpv6AddressVO; import com.cloud.utils.db.GenericDao; diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java index 30ba358b40c..f0ba19993df 100644 --- a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java @@ -17,25 +17,19 @@ package com.cloud.network.dao; import java.util.List; -import java.util.Map; import javax.ejb.Local; -import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.Network; import com.cloud.network.UserIpv6AddressVO; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.GenericQueryBuilder; @Component @Local(value = UserIpv6AddressDao.class) diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java index d9d11c35ab6..e2f2be91b3d 100644 --- a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java +++ b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDao.java @@ -18,9 +18,8 @@ package com.cloud.network.dao; import java.util.List; -import com.cloud.network.VirtualRouterProvider; -import com.cloud.network.element.VirtualRouterProviderVO; import com.cloud.network.VirtualRouterProvider.Type; +import com.cloud.network.element.VirtualRouterProviderVO; import com.cloud.utils.db.GenericDao; public interface VirtualRouterProviderDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java index d517e2cced7..4baf0a03c2a 100644 --- a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java @@ -22,8 +22,8 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.network.element.VirtualRouterProviderVO; import com.cloud.network.VirtualRouterProvider.Type; +import com.cloud.network.element.VirtualRouterProviderVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java b/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java index ebc4600c938..17bc16536b6 100644 --- a/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java +++ b/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java @@ -30,7 +30,6 @@ import javax.persistence.Table; import com.cloud.network.VirtualRouterProvider; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("virtual_router_providers")) @@ -71,6 +70,7 @@ public class VirtualRouterProviderVO implements VirtualRouterProvider { return nspId; } + @Override public String getUuid() { return uuid; } diff --git a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java index 039575d9404..a8aef2c0ef8 100644 --- a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java +++ b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java @@ -191,8 +191,8 @@ public class FirewallRuleVO implements FirewallRule { this.uuid = UUID.randomUUID().toString(); } - public FirewallRuleVO(String xId, Long ipAddressId, Integer portStart, Integer portEnd, String protocol, long networkId, long accountId, long domainId, Purpose purpose, - List sourceCidrs, Integer icmpCode, Integer icmpType, Long related, TrafficType trafficType) { + public FirewallRuleVO(String xId, Long ipAddressId, Integer portStart, Integer portEnd, String protocol, long networkId, long accountId, long domainId, + Purpose purpose, List sourceCidrs, Integer icmpCode, Integer icmpType, Long related, TrafficType trafficType) { this.xId = xId; if (xId == null) { this.xId = UUID.randomUUID().toString(); @@ -220,14 +220,14 @@ public class FirewallRuleVO implements FirewallRule { this.trafficType = trafficType; } - public FirewallRuleVO(String xId, Long ipAddressId, Integer portStart, Integer portEnd, String protocol, long networkId, long accountId, long domainId, Purpose purpose, - List sourceCidrs, Integer icmpCode, Integer icmpType, Long related, TrafficType trafficType, FirewallRuleType type) { + public FirewallRuleVO(String xId, Long ipAddressId, Integer portStart, Integer portEnd, String protocol, long networkId, long accountId, long domainId, + Purpose purpose, List sourceCidrs, Integer icmpCode, Integer icmpType, Long related, TrafficType trafficType, FirewallRuleType type) { this(xId, ipAddressId, portStart, portEnd, protocol, networkId, accountId, domainId, purpose, sourceCidrs, icmpCode, icmpType, related, trafficType); this.type = type; } - public FirewallRuleVO(String xId, long ipAddressId, int port, String protocol, long networkId, long accountId, long domainId, Purpose purpose, List sourceCidrs, - Integer icmpCode, Integer icmpType, Long related) { + public FirewallRuleVO(String xId, long ipAddressId, int port, String protocol, long networkId, long accountId, long domainId, Purpose purpose, + List sourceCidrs, Integer icmpCode, Integer icmpType, Long related) { this(xId, ipAddressId, port, port, protocol, networkId, accountId, domainId, purpose, sourceCidrs, icmpCode, icmpType, related, null); } diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java index f78f5be819f..45c0aeb4afd 100644 --- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java @@ -24,16 +24,13 @@ import javax.inject.Inject; import org.springframework.stereotype.Component; import com.cloud.network.dao.FirewallRulesCidrsDao; -import com.cloud.network.dao.FirewallRulesCidrsDaoImpl; import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.FirewallRule.State; import com.cloud.network.rules.PortForwardingRuleVO; - import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.vm.dao.NicSecondaryIpVO; @Component @Local(value = PortForwardingRulesDao.class) diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java index 2b408c6852a..3ec5cec59e6 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java @@ -27,7 +27,6 @@ import javax.persistence.Table; import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.utils.db.JoinType; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = ("security_group")) @@ -82,8 +81,8 @@ public class SecurityGroupRulesVO implements SecurityGroupRules { this.id = id; } - public SecurityGroupRulesVO(long id, String name, String description, Long domainId, Long accountId, Long ruleId, String ruleUuid, int startPort, int endPort, String protocol, - Long allowedNetworkId, String allowedSourceIpCidr) { + public SecurityGroupRulesVO(long id, String name, String description, Long domainId, Long accountId, Long ruleId, String ruleUuid, int startPort, int endPort, + String protocol, Long allowedNetworkId, String allowedSourceIpCidr) { this.id = id; this.name = name; this.description = description; diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java index e414fd48956..55020ea8e02 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java @@ -26,14 +26,15 @@ import javax.persistence.SecondaryTable; import javax.persistence.SecondaryTables; import javax.persistence.Table; -import com.cloud.vm.VirtualMachine.State; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.vm.VirtualMachine.State; + @Entity @Table(name = ("security_group_vm_map")) @SecondaryTables({@SecondaryTable(name = "nics", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "instance_id")}), - @SecondaryTable(name = "vm_instance", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id")}), - @SecondaryTable(name = "security_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "security_group_id", referencedColumnName = "id")})}) + @SecondaryTable(name = "vm_instance", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id")}), + @SecondaryTable(name = "security_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "security_group_id", referencedColumnName = "id")})}) public class SecurityGroupVMMapVO implements InternalIdentity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -63,6 +64,7 @@ public class SecurityGroupVMMapVO implements InternalIdentity { this.instanceId = instanceId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java index b032fe5c7af..df8427c1fbf 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java @@ -25,9 +25,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - @Entity @Table(name = ("security_group")) public class SecurityGroupVO implements SecurityGroup { diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java b/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java index c366e93c372..f6bd86dbcb6 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.security; -import org.apache.cloudstack.api.InternalIdentity; - /** * Work related to security groups for a vm * diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java index bd671cad77c..f646b6fdb34 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java @@ -29,9 +29,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "op_nwgrp_work") public class SecurityGroupWorkVO implements SecurityGroupWork, InternalIdentity { @@ -64,10 +65,12 @@ public class SecurityGroupWorkVO implements SecurityGroupWork, InternalIdentity protected SecurityGroupWorkVO() { } + @Override public long getId() { return id; } + @Override public Long getInstanceId() { return instanceId; } @@ -102,10 +105,12 @@ public class SecurityGroupWorkVO implements SecurityGroupWork, InternalIdentity return dateTaken; } + @Override public void setStep(Step step) { this.step = step; } + @Override public Step getStep() { return step; } @@ -114,6 +119,7 @@ public class SecurityGroupWorkVO implements SecurityGroupWork, InternalIdentity dateTaken = date; } + @Override public Long getLogsequenceNumber() { return logsequenceNumber; } diff --git a/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java b/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java index 23ce589e4cb..5d2c948ec43 100644 --- a/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java +++ b/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java @@ -25,9 +25,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + /** * Records the intent to update a VM's ingress ruleset * @@ -58,6 +59,7 @@ public class VmRulesetLogVO implements InternalIdentity { this.instanceId = instanceId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java index bbb29c68179..78bc128b542 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java @@ -26,8 +26,6 @@ import org.springframework.stereotype.Component; import com.cloud.network.security.SecurityGroupVO; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.tags.dao.ResourceTagsDaoImpl; - import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java index 21979ee3ab4..564ec08c341 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java @@ -78,6 +78,7 @@ public class SecurityGroupRuleDaoImpl extends GenericDaoBase listBySecurityGroupId(long securityGroupId, SecurityRuleType type) { SearchCriteria sc = securityGroupIdAndTypeSearch.create(); sc.setParameters("securityGroupId", securityGroupId); @@ -92,6 +93,7 @@ public class SecurityGroupRuleDaoImpl extends GenericDaoBase sc = securityGroupIdSearch.create(); sc.setParameters("securityGroupId", securityGroupId); diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java index 3ddfdd3a0e5..873d193ce0d 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java @@ -22,19 +22,14 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.VlanVO; -import com.cloud.dc.Vlan.VlanType; -import com.cloud.network.dao.IPAddressVO; import com.cloud.network.security.SecurityGroupVMMapVO; import com.cloud.utils.Pair; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; -import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.vm.VirtualMachine.State; @Component diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java index 3594c3a03cd..7daee18d15d 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java @@ -20,8 +20,8 @@ import java.util.Date; import java.util.List; import com.cloud.network.security.SecurityGroupWork; -import com.cloud.network.security.SecurityGroupWorkVO; import com.cloud.network.security.SecurityGroupWork.Step; +import com.cloud.network.security.SecurityGroupWorkVO; import com.cloud.utils.db.GenericDao; public interface SecurityGroupWorkDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 4f9a30a1eea..cfc3da5d970 100644 --- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -42,7 +42,7 @@ public class VmRulesetLogDaoImpl extends GenericDaoBase im protected static Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class); private SearchBuilder VmIdSearch; private String INSERT_OR_UPDATE = "INSERT INTO op_vm_ruleset_log (instance_id, created, logsequence) " - + " VALUES(?, now(), 1) ON DUPLICATE KEY UPDATE logsequence=logsequence+1"; + + " VALUES(?, now(), 1) ON DUPLICATE KEY UPDATE logsequence=logsequence+1"; private static HashMap cachedPrepStmtStrings = new HashMap(); final static private int cacheStringSizes[] = {512, 256, 128, 64, 32, 16, 8, 4, 2, 1}; diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java index 72e49004feb..e27848522ff 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java @@ -16,10 +16,10 @@ // under the License. package com.cloud.network.vpc; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + /* * Data Access Object for network_acl_item table */ diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java index 872eef7b444..f45b8c4dd51 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java @@ -16,13 +16,23 @@ // under the License. package com.cloud.network.vpc; -import com.cloud.network.rules.FirewallRule; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import com.cloud.utils.db.GenericDao; import com.cloud.utils.net.NetUtils; -import javax.persistence.*; -import java.util.*; - @Entity @Table(name = "network_acl_item") public class NetworkACLItemVO implements NetworkACLItem { @@ -78,8 +88,8 @@ public class NetworkACLItemVO implements NetworkACLItem { this.uuid = UUID.randomUUID().toString(); } - public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List sourceCidrs, Integer icmpCode, Integer icmpType, TrafficType trafficType, - Action action, int number) { + public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List sourceCidrs, Integer icmpCode, Integer icmpType, + TrafficType trafficType, Action action, int number) { this.sourcePortStart = portStart; this.sourcePortEnd = portEnd; this.protocol = protocol; diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java index 444b921a0bb..2f813c889ac 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java @@ -17,9 +17,15 @@ package com.cloud.network.vpc; -import javax.persistence.*; import java.util.UUID; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "network_acl") public class NetworkACLVO implements NetworkACL { diff --git a/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java b/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java index 3ee6b96d3c4..ad17eb1c8f3 100644 --- a/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java +++ b/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.network.vpc; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "private_ip_address") public class PrivateIpVO implements InternalIdentity { @@ -84,6 +84,7 @@ public class PrivateIpVO implements InternalIdentity { return takenAt; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java index b38618e09b1..08e39656c4d 100644 --- a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java +++ b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java @@ -28,9 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "static_routes") diff --git a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java index 08e98270985..5f156607889 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java @@ -107,8 +107,8 @@ public class VpcGatewayVO implements VpcGateway { * @param account_id * @param sourceNat */ - public VpcGatewayVO(String ip4Address, Type type, long vpcId, long zoneId, long networkId, String broadcastUri, String gateway, String netmask, long accountId, long domainId, - boolean sourceNat, long networkACLId) { + public VpcGatewayVO(String ip4Address, Type type, long vpcId, long zoneId, long networkId, String broadcastUri, String gateway, String netmask, long accountId, + long domainId, boolean sourceNat, long networkACLId) { this.ip4Address = ip4Address; this.type = type; this.vpcId = vpcId; diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java b/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java index 2f7c83ad3f1..c365ae7b441 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java @@ -25,10 +25,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "vpc_offering_service_map") @@ -50,6 +51,7 @@ public class VpcOfferingServiceMapVO implements InternalIdentity { @Column(name = GenericDao.CREATED_COLUMN) Date created; + @Override public long getId() { return id; } @@ -81,6 +83,7 @@ public class VpcOfferingServiceMapVO implements InternalIdentity { } } + @Override public String toString() { StringBuilder buf = new StringBuilder("[VPC Offering Service["); return buf.append(vpcOfferingId).append("-").append(service).append("-").append(provider).append("]").toString(); diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java index f37c7a5bab9..3a676e6af5e 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java @@ -29,7 +29,6 @@ import javax.persistence.Id; import javax.persistence.Table; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "vpc_offerings") diff --git a/engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java b/engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java index 15059ae6554..9fa4b505c65 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcServiceMapVO.java @@ -78,6 +78,7 @@ public class VpcServiceMapVO { this.provider = provider.getName(); } + @Override public String toString() { StringBuilder buf = new StringBuilder("[VPC Service["); return buf.append(vpcId).append("-").append(service).append("-").append(provider).append("]").toString(); diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java index c65f9646762..bc178d32ff9 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java @@ -16,12 +16,13 @@ // under the License. package com.cloud.network.vpc.dao; +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.NetworkACLVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; @Component @Local(value = NetworkACLDao.class) diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java index 8835e4d971a..31ff6f259ac 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java @@ -16,15 +16,21 @@ // under the License. package com.cloud.network.vpc.dao; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.NetworkACLItem.State; import com.cloud.network.vpc.NetworkACLItemDao; import com.cloud.network.vpc.NetworkACLItemVO; -import com.cloud.utils.db.*; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.GenericSearchBuilder; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = NetworkACLItemDao.class) diff --git a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java index 8811ceb1d0c..d2c2a731f98 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java @@ -27,8 +27,6 @@ import com.cloud.network.vpc.StaticRoute; import com.cloud.network.vpc.StaticRouteVO; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.tags.dao.ResourceTagsDaoImpl; - import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java index 3efe0fb45eb..b06560d876d 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java @@ -22,15 +22,14 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.network.Network; -import com.cloud.network.vpc.VpcServiceMapVO; import org.springframework.stereotype.Component; +import com.cloud.network.Network; import com.cloud.network.vpc.Vpc; +import com.cloud.network.vpc.VpcServiceMapVO; import com.cloud.network.vpc.VpcVO; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; - import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java index ed84983f810..73e7df3cadc 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.network.vpc.dao; +import java.util.List; + import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,8 +29,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import java.util.List; - @Component @Local(value = VpcGatewayDao.class) @DB() diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java index 4eee465cdaa..cb7ddec87a5 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.exception.UnsupportedServiceException; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; @@ -30,7 +32,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.springframework.stereotype.Component; @Component @Local(value = VpcServiceMapDao.class) diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java index fca7444cee0..c16c5ac4bf1 100644 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java @@ -57,6 +57,7 @@ public class NetworkOfferingDetailsVO implements InternalIdentity { this.value = value; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java index ec75a92be8f..5171b1b8a87 100644 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java @@ -25,10 +25,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "ntwk_offering_service_map") @@ -51,6 +52,7 @@ public class NetworkOfferingServiceMapVO implements InternalIdentity { @Column(name = GenericDao.CREATED_COLUMN) Date created; + @Override public long getId() { return id; } @@ -82,6 +84,7 @@ public class NetworkOfferingServiceMapVO implements InternalIdentity { } } + @Override public String toString() { StringBuilder buf = new StringBuilder("[Network Offering Service["); return buf.append(networkOfferingId).append("-").append(service).append("-").append(provider).append("]").toString(); diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java index 06f06708417..a0234621deb 100755 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java @@ -293,13 +293,14 @@ public class NetworkOfferingVO implements NetworkOffering { this.redundantRouter = redundantRouter; } + @Override public boolean getEgressDefaultPolicy() { return egressdefaultpolicy; } - public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, Integer multicastRateMbps, - boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean specifyIpRanges, boolean isPersistent, - boolean internalLb, boolean publicLb) { + public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, + Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, + boolean specifyIpRanges, boolean isPersistent, boolean internalLb, boolean publicLb) { this.name = name; this.displayText = displayText; this.rateMbps = rateMbps; @@ -327,10 +328,10 @@ public class NetworkOfferingVO implements NetworkOffering { this.internalLb = internalLb; } - public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, Integer multicastRateMbps, - boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean dedicatedLb, boolean sharedSourceNat, - boolean redundantRouter, boolean elasticIp, boolean elasticLb, boolean specifyIpRanges, boolean inline, boolean isPersistent, boolean associatePublicIP, - boolean publicLb, boolean internalLb, boolean egressdefaultpolicy) { + public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, + Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean dedicatedLb, + boolean sharedSourceNat, boolean redundantRouter, boolean elasticIp, boolean elasticLb, boolean specifyIpRanges, boolean inline, boolean isPersistent, + boolean associatePublicIP, boolean publicLb, boolean internalLb, boolean egressdefaultpolicy) { this(name, displayText, trafficType, @@ -454,6 +455,7 @@ public class NetworkOfferingVO implements NetworkOffering { this.isPersistent = isPersistent; } + @Override public boolean getIsPersistent() { return isPersistent; } diff --git a/engine/schema/src/com/cloud/projects/ProjectAccountVO.java b/engine/schema/src/com/cloud/projects/ProjectAccountVO.java index 6da4c3c502f..8a337d620d2 100644 --- a/engine/schema/src/com/cloud/projects/ProjectAccountVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectAccountVO.java @@ -27,9 +27,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "project_account") @SuppressWarnings("unused") @@ -65,6 +66,7 @@ public class ProjectAccountVO implements ProjectAccount, InternalIdentity { this.projectAccountId = project.getProjectAccountId(); } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java index 78f05c792e6..6136862f25c 100644 --- a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java @@ -28,9 +28,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "project_invitations") diff --git a/engine/schema/src/com/cloud/projects/ProjectVO.java b/engine/schema/src/com/cloud/projects/ProjectVO.java index c96a9e38194..d49e484dd31 100644 --- a/engine/schema/src/com/cloud/projects/ProjectVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectVO.java @@ -29,9 +29,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.cloudstack.api.Identity; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "projects") public class ProjectVO implements Project, Identity, InternalIdentity { diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java index 948904a1e8b..b2cf2d899f6 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java @@ -28,8 +28,6 @@ import com.cloud.projects.Project; import com.cloud.projects.ProjectVO; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.tags.dao.ResourceTagsDaoImpl; - import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java b/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java index 0e6d36feafc..a3886bc611d 100644 --- a/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java +++ b/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java @@ -27,9 +27,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import com.cloud.utils.DateUtil; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.DateUtil; + @Entity @Table(name = "cmd_exec_log") public class CommandExecLogVO implements InternalIdentity { @@ -66,6 +67,7 @@ public class CommandExecLogVO implements InternalIdentity { this.created = DateUtil.currentGMTTime(); } + @Override public long getId() { return this.id; } diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java index 312b668028e..67fea00a43e 100755 --- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java @@ -18,7 +18,12 @@ package com.cloud.service; import java.util.Map; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.Table; +import javax.persistence.Transient; import com.cloud.offering.ServiceOffering; import com.cloud.storage.DiskOfferingVO; @@ -98,7 +103,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering } public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, boolean limitCpuUse, - boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, Long domainId) { + boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, + Long domainId) { super(name, displayText, false, tags, recreatable, useLocalStorage, systemUse, true, domainId); this.cpu = cpu; this.ramSize = ramSize; @@ -111,9 +117,9 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.vm_type = vm_type == null ? null : vm_type.toString().toLowerCase(); } - public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, boolean limitResourceUse, - boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, Long domainId, - String hostTag) { + public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, + boolean limitResourceUse, boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, + VirtualMachine.Type vm_type, Long domainId, String hostTag) { this(name, cpu, ramSize, @@ -133,9 +139,9 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.hostTag = hostTag; } - public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, boolean limitResourceUse, - boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, Long domainId, - String hostTag, String deploymentPlanner) { + public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, + boolean limitResourceUse, boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, + VirtualMachine.Type vm_type, Long domainId, String hostTag, String deploymentPlanner) { this(name, cpu, ramSize, @@ -239,18 +245,22 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.hostTag = hostTag; } + @Override public String getHostTag() { return hostTag; } + @Override public String getSystemVmType() { return vm_type; } + @Override public void setSortKey(int key) { sortKey = key; } + @Override public int getSortKey() { return sortKey; } @@ -285,6 +295,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.details = details; } + @Override public boolean isDynamic() { return cpu == null || speed == null || ramSize == null; } diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java index d2c50f26206..10d661687e1 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java @@ -17,7 +17,6 @@ package com.cloud.service.dao; import java.util.List; -import java.util.Map; import com.cloud.service.ServiceOfferingVO; import com.cloud.utils.db.GenericDao; diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java index b7fe9b67b12..f1f97fc79f5 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java @@ -25,9 +25,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.EntityExistsException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.dao.UserVmDetailsDao; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -37,6 +34,8 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.dao.UserVmDetailsDao; @Component @Local(value = {ServiceOfferingDao.class}) @@ -188,6 +187,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase details) { + public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, + boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, + HypervisorType hyperType, Map details) { this(id, generateUniqueName(id, accountId, name), name, @@ -188,9 +188,9 @@ public class VMTemplateVO implements VirtualMachineTemplate { uuid = UUID.randomUUID().toString(); } - public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, boolean requiresHvm, - int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, HypervisorType hyperType, String templateTag, - Map details, boolean sshKeyEnabled, boolean isDynamicallyScalable) { + public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, + boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, + HypervisorType hyperType, String templateTag, Map details, boolean sshKeyEnabled, boolean isDynamicallyScalable) { this(id, name, format, @@ -216,16 +216,18 @@ public class VMTemplateVO implements VirtualMachineTemplate { state = State.Active; } - public static VMTemplateVO createPreHostIso(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type, String url, - Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, - HypervisorType hyperType) { - VMTemplateVO template = new VMTemplateVO(id, uniqueName, name, format, isPublic, featured, type, url, created, requiresHvm, bits, accountId, cksum, displayText, - enablePassword, guestOSId, bootable, hyperType); + public static VMTemplateVO createPreHostIso(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type, + String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, + boolean bootable, HypervisorType hyperType) { + VMTemplateVO template = + new VMTemplateVO(id, uniqueName, name, format, isPublic, featured, type, url, created, requiresHvm, bits, accountId, cksum, displayText, enablePassword, + guestOSId, bootable, hyperType); return template; } public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type, String url, Date created, - boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, HypervisorType hyperType) { + boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, + HypervisorType hyperType) { this.id = id; this.name = name; publicTemplate = isPublic; @@ -249,19 +251,36 @@ public class VMTemplateVO implements VirtualMachineTemplate { } // Has an extra attribute - isExtractable - public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, - Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, - HypervisorType hyperType, Map details) { - this(id, uniqueName, name, format, isPublic, featured, type, url, created, requiresHvm, bits, accountId, cksum, displayText, enablePassword, guestOSId, bootable, hyperType); + public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, + String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, + boolean bootable, HypervisorType hyperType, Map details) { + this(id, + uniqueName, + name, + format, + isPublic, + featured, + type, + url, + created, + requiresHvm, + bits, + accountId, + cksum, + displayText, + enablePassword, + guestOSId, + bootable, + hyperType); extractable = isExtractable; uuid = UUID.randomUUID().toString(); this.details = details; state = State.Active; } - public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, - Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, - HypervisorType hyperType, String templateTag, Map details) { + public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, + String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, + boolean bootable, HypervisorType hyperType, String templateTag, Map details) { this(id, uniqueName, name, diff --git a/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java b/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java index dd8fb5c0a2b..2f4c882a593 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java @@ -27,9 +27,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "template_zone_ref") @@ -65,6 +66,7 @@ public class VMTemplateZoneVO implements InternalIdentity { this.lastUpdated = lastUpdated; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java index 513dbfaccab..56a9a9285cd 100755 --- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeHostVO.java @@ -113,6 +113,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { @Enumerated(EnumType.STRING) ObjectInDataStoreStateMachine.State state; + @Override public String getInstallPath() { return installPath; } @@ -153,6 +154,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { this.downloadState = downloadState; } + @Override public long getId() { return id; } @@ -169,6 +171,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { lastUpdated = date; } + @Override public void setInstallPath(String installPath) { this.installPath = installPath; } @@ -192,8 +195,8 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { this.state = ObjectInDataStoreStateMachine.State.Allocated; } - public VolumeHostVO(long hostId, long volumeId, long zoneId, Date lastUpdated, int downloadPercent, Status downloadState, String localDownloadPath, String errorString, - String jobId, String installPath, String downloadUrl, String checksum, ImageFormat format) { + public VolumeHostVO(long hostId, long volumeId, long zoneId, Date lastUpdated, int downloadPercent, Status downloadState, String localDownloadPath, + String errorString, String jobId, String installPath, String downloadUrl, String checksum, ImageFormat format) { // super(); this.hostId = hostId; this.volumeId = volumeId; @@ -238,6 +241,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { return jobId; } + @Override public boolean equals(Object obj) { if (obj instanceof VolumeHostVO) { VolumeHostVO other = (VolumeHostVO)obj; @@ -246,6 +250,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { return false; } + @Override public int hashCode() { Long tid = new Long(volumeId); Long hid = new Long(hostId); @@ -296,6 +301,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore { return -1; } + @Override public String toString() { return new StringBuilder("VolumeHost[").append(id).append("-").append(volumeId).append("-").append(hostId).append(installPath).append("]").toString(); } diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java index 0882af5ade4..944847f9298 100755 --- a/engine/schema/src/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeVO.java @@ -178,8 +178,8 @@ public class VolumeVO implements Volume { this.uuid = UUID.randomUUID().toString(); } - public VolumeVO(String name, long dcId, Long podId, long accountId, long domainId, Long instanceId, String folder, String path, long size, Long minIops, Long maxIops, - String iScsiName, Volume.Type vType) { + public VolumeVO(String name, long dcId, Long podId, long accountId, long domainId, Long instanceId, String folder, String path, long size, Long minIops, + Long maxIops, String iScsiName, Volume.Type vType) { this.name = name; this.accountId = accountId; this.domainId = domainId; @@ -555,6 +555,7 @@ public class VolumeVO implements Volume { this.displayVolume = displayVolume; } + @Override public Storage.ImageFormat getFormat() { return format; } @@ -567,6 +568,7 @@ public class VolumeVO implements Volume { this.vmSnapshotChainSize = vmSnapshotChainSize; } + @Override public Long getVmSnapshotChainSize() { return this.vmSnapshotChainSize; } @@ -585,10 +587,12 @@ public class VolumeVO implements Volume { this.state = state; } + @Override public void setHypervisorSnapshotReserve(Integer hypervisorSnapshotReserve) { this.hypervisorSnapshotReserve = hypervisorSnapshotReserve; } + @Override public Integer getHypervisorSnapshotReserve() { return hypervisorSnapshotReserve; } diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index e4301e61def..3a5c3856523 100644 --- a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -28,9 +28,9 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.storage.LaunchPermissionVO; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.Storage.ImageFormat; +import com.cloud.storage.Storage.TemplateType; +import com.cloud.storage.VMTemplateVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; @@ -44,10 +44,12 @@ public class LaunchPermissionDaoImpl extends GenericDaoBase TemplateAndAccountSearch; private final SearchBuilder TemplateIdSearch; @@ -139,8 +141,9 @@ public class LaunchPermissionDaoImpl extends GenericDaoBase, StateDao { List listByVolumeId(long volumeId); diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java index b35a6041515..f15319849c7 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -56,9 +56,11 @@ import com.cloud.vm.dao.VMInstanceDao; public class SnapshotDaoImpl extends GenericDaoBase implements SnapshotDao { public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName()); // TODO: we should remove these direct sqls - private static final String GET_LAST_SNAPSHOT = "SELECT snapshots.id FROM snapshot_store_ref, snapshots where snapshots.id = snapshot_store_ref.snapshot_id AND snapshosts.volume_id = ? AND snapshot_store_ref.role = ? ORDER BY created DESC"; + private static final String GET_LAST_SNAPSHOT = + "SELECT snapshots.id FROM snapshot_store_ref, snapshots where snapshots.id = snapshot_store_ref.snapshot_id AND snapshosts.volume_id = ? AND snapshot_store_ref.role = ? ORDER BY created DESC"; private static final String UPDATE_SNAPSHOT_VERSION = "UPDATE snapshots SET version = ? WHERE volume_id = ? AND version = ?"; - private static final String GET_SECHOST_ID = "SELECT store_id FROM snapshots, snapshot_store_ref where snapshots.id = snapshot_store_ref.snapshot_id AND volume_id = ? AND backup_snap_id IS NOT NULL AND sechost_id IS NOT NULL LIMIT 1"; + private static final String GET_SECHOST_ID = + "SELECT store_id FROM snapshots, snapshot_store_ref where snapshots.id = snapshot_store_ref.snapshot_id AND volume_id = ? AND backup_snap_id IS NOT NULL AND sechost_id IS NOT NULL LIMIT 1"; private static final String UPDATE_SECHOST_ID = "UPDATE snapshots SET sechost_id = ? WHERE data_center_id = ?"; private SearchBuilder VolumeIdSearch; @@ -324,7 +326,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements public boolean updateState(State currentState, Event event, State nextState, SnapshotVO snapshot, Object data) { TransactionLegacy txn = TransactionLegacy.currentTxn(); txn.start(); - SnapshotVO snapshotVO = (SnapshotVO)snapshot; + SnapshotVO snapshotVO = snapshot; snapshotVO.setState(nextState); super.update(snapshotVO.getId(), snapshotVO); txn.commit(); diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java index b216de6ed6a..43bb5b3d4d5 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsDao.java @@ -18,8 +18,9 @@ */ package com.cloud.storage.dao; -import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.resourcedetail.ResourceDetailsDao; +import com.cloud.utils.db.GenericDao; + public interface SnapshotDetailsDao extends GenericDao, ResourceDetailsDao { } diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java index fa73ce38a46..9bc4b4c4726 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java @@ -18,9 +18,14 @@ */ package com.cloud.storage.dao; -import org.apache.cloudstack.api.ResourceDetail; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; -import javax.persistence.*; +import org.apache.cloudstack.api.ResourceDetail; @Entity @Table(name = "snapshot_details") diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index 178605d377d..e42eaf4b21a 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -47,11 +47,10 @@ public class StoragePoolHostDaoImpl extends GenericDaoBase { diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java index 73783c0e8cf..191fc4ccfb1 100755 --- a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java @@ -17,14 +17,15 @@ package com.cloud.storage.dao; import java.util.List; + import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.storage.UploadVO; -import com.cloud.storage.Upload.Status; import com.cloud.storage.Upload.Mode; +import com.cloud.storage.Upload.Status; +import com.cloud.storage.UploadVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -37,10 +38,11 @@ public class UploadDaoImpl extends GenericDaoBase implements Upl protected final SearchBuilder typeHostAndUploadStatusSearch; protected final SearchBuilder typeModeAndStatusSearch; - protected static final String UPDATE_UPLOAD_INFO = "UPDATE upload SET upload_state = ?, upload_pct= ?, last_updated = ? " + ", upload_error_str = ?, upload_job_id = ? " - + "WHERE host_id = ? and type_id = ? and type = ?"; + protected static final String UPDATE_UPLOAD_INFO = "UPDATE upload SET upload_state = ?, upload_pct= ?, last_updated = ? " + + ", upload_error_str = ?, upload_job_id = ? " + "WHERE host_id = ? and type_id = ? and type = ?"; - protected static final String UPLOADS_STATE_DC = "SELECT * FROM upload t, host h where t.host_id = h.id and h.data_center_id=? " + " and t.type_id=? and t.upload_state = ?"; + protected static final String UPLOADS_STATE_DC = "SELECT * FROM upload t, host h where t.host_id = h.id and h.data_center_id=? " + + " and t.type_id=? and t.upload_state = ?"; public UploadDaoImpl() { typeUploadStatusSearch = createSearchBuilder(); diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java index 58dc2ed0096..2b815d8e312 100755 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java @@ -19,13 +19,9 @@ package com.cloud.storage.dao; import java.util.List; import java.util.Map; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateEvent; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState; - import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.VMTemplateVO; import com.cloud.utils.db.GenericDao; -import com.cloud.utils.fsm.StateDao; /* * Data Access Object for vm_templates table diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 950838aa11d..9a22466c99e 100755 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -28,11 +28,12 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; + import com.cloud.dc.dao.DataCenterDao; import com.cloud.domain.dao.DomainDao; import com.cloud.host.Host; @@ -80,11 +81,11 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem TemplateDataStoreDao _templateDataStoreDao; private static final String SELECT_S3_CANDIDATE_TEMPLATES = "SELECT t.id, t.unique_name, t.name, t.public, t.featured, " - + "t.type, t.hvm, t.bits, t.url, t.format, t.created, t.account_id, t.checksum, t.display_text, " - + "t.enable_password, t.guest_os_id, t.bootable, t.prepopulate, t.cross_zones, t.hypervisor_type " - + "FROM vm_template t JOIN template_host_ref r ON t.id=r.template_id JOIN host h ON h.id=r.host_id " - + "WHERE t.hypervisor_type IN (SELECT hypervisor_type FROM host) AND r.download_state = 'DOWNLOADED' AND " - + "r.template_id NOT IN (SELECT template_id FROM template_s3_ref) AND r.destroyed = 0 AND t.type <> 'PERHOST'"; + + "t.type, t.hvm, t.bits, t.url, t.format, t.created, t.account_id, t.checksum, t.display_text, " + + "t.enable_password, t.guest_os_id, t.bootable, t.prepopulate, t.cross_zones, t.hypervisor_type " + + "FROM vm_template t JOIN template_host_ref r ON t.id=r.template_id JOIN host h ON h.id=r.host_id " + + "WHERE t.hypervisor_type IN (SELECT hypervisor_type FROM host) AND r.download_state = 'DOWNLOADED' AND " + + "r.template_id NOT IN (SELECT template_id FROM template_s3_ref) AND r.destroyed = 0 AND t.type <> 'PERHOST'"; protected SearchBuilder TemplateNameSearch; protected SearchBuilder UniqueNameSearch; @@ -214,8 +215,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem @Override public List listPrivateTemplatesByHost(Long hostId) { - String sql = "select * from template_host_ref as thr INNER JOIN vm_template as t ON t.id=thr.template_id " - + "where thr.host_id=? and t.public=0 and t.featured=0 and t.type='USER' and t.removed is NULL"; + String sql = + "select * from template_host_ref as thr INNER JOIN vm_template as t ON t.id=thr.template_id " + + "where thr.host_id=? and t.public=0 and t.featured=0 and t.type='USER' and t.removed is NULL"; List l = new ArrayList(); @@ -342,8 +344,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem hostHyperSearch2.and("removed", hostHyperSearch2.entity().getRemoved(), SearchCriteria.Op.NULL); hostHyperSearch2.groupBy(hostHyperSearch2.entity().getHypervisorType()); - readySystemTemplateSearch.join("tmplHyper", hostHyperSearch2, hostHyperSearch2.entity().getHypervisorType(), readySystemTemplateSearch.entity().getHypervisorType(), - JoinBuilder.JoinType.INNER); + readySystemTemplateSearch.join("tmplHyper", hostHyperSearch2, hostHyperSearch2.entity().getHypervisorType(), readySystemTemplateSearch.entity() + .getHypervisorType(), JoinBuilder.JoinType.INNER); hostHyperSearch2.done(); readySystemTemplateSearch.done(); diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index 327f8549b35..c1619be8661 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -18,9 +18,10 @@ package com.cloud.storage.dao; import javax.ejb.Local; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; + import com.cloud.storage.VMTemplateDetailVO; @Component diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java index cfaac414e22..6cd614d0efc 100755 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java @@ -29,11 +29,12 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.host.Host; import com.cloud.host.HostVO; @@ -67,15 +68,15 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase LOCAL_SECONDARY_STORAGE_SEARCH; protected static final String UPDATE_TEMPLATE_HOST_REF = "UPDATE template_host_ref SET download_state = ?, download_pct= ?, last_updated = ? " - + ", error_str = ?, local_path = ?, job_id = ? " + "WHERE host_id = ? and type_id = ?"; + + ", error_str = ?, local_path = ?, job_id = ? " + "WHERE host_id = ? and type_id = ?"; protected static final String DOWNLOADS_STATE_DC = "SELECT t.id, t.host_id, t.template_id, t.created, t.last_updated, t.job_id, " - + "t.download_pct, t.size, t.physical_size, t.download_state, t.error_str, t.local_path, " - + "t.install_path, t.url, t.destroyed, t.is_copy FROM template_host_ref t, host h " - + "where t.host_id = h.id and h.data_center_id=? " + " and t.template_id=? and t.download_state = ?"; + + "t.download_pct, t.size, t.physical_size, t.download_state, t.error_str, t.local_path, " + + "t.install_path, t.url, t.destroyed, t.is_copy FROM template_host_ref t, host h " + "where t.host_id = h.id and h.data_center_id=? " + + " and t.template_id=? and t.download_state = ?"; protected static final String DOWNLOADS_STATE_DC_POD = "SELECT * FROM template_host_ref t, host h where t.host_id = h.id and h.data_center_id=? and h.pod_id=? " - + " and t.template_id=? and t.download_state=?"; + + " and t.template_id=? and t.download_state=?"; protected static final String DOWNLOADS_STATE = "SELECT * FROM template_host_ref t " + " where t.template_id=? and t.download_state=?"; diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java index c2fd9be440d..12a0921be56 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java @@ -25,11 +25,12 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.storage.VMTemplateStoragePoolVO; import com.cloud.storage.VMTemplateStorageResourceAssoc; @@ -55,16 +56,18 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase updateStateSearch; protected static final String UPDATE_TEMPLATE_HOST_REF = "UPDATE template_spool_ref SET download_state = ?, download_pct= ?, last_updated = ? " - + ", error_str = ?, local_path = ?, job_id = ? " + "WHERE pool_id = ? and template_id = ?"; + + ", error_str = ?, local_path = ?, job_id = ? " + "WHERE pool_id = ? and template_id = ?"; protected static final String DOWNLOADS_STATE_DC = "SELECT * FROM template_spool_ref t, storage_pool p where t.pool_id = p.id and p.data_center_id=? " - + " and t.template_id=? and t.download_state = ?"; + + " and t.template_id=? and t.download_state = ?"; - protected static final String DOWNLOADS_STATE_DC_POD = "SELECT * FROM template_spool_ref tp, storage_pool_host_ref ph, host h where tp.pool_id = ph.pool_id and ph.host_id = h.id and h.data_center_id=? and h.pod_id=? " - + " and tp.template_id=? and tp.download_state=?"; + protected static final String DOWNLOADS_STATE_DC_POD = + "SELECT * FROM template_spool_ref tp, storage_pool_host_ref ph, host h where tp.pool_id = ph.pool_id and ph.host_id = h.id and h.data_center_id=? and h.pod_id=? " + + " and tp.template_id=? and tp.download_state=?"; - protected static final String HOST_TEMPLATE_SEARCH = "SELECT * FROM template_spool_ref tp, storage_pool_host_ref ph, host h where tp.pool_id = ph.pool_id and ph.host_id = h.id and h.id=? " - + " and tp.template_id=? "; + protected static final String HOST_TEMPLATE_SEARCH = + "SELECT * FROM template_spool_ref tp, storage_pool_host_ref ph, host h where tp.pool_id = ph.pool_id and ph.host_id = h.id and h.id=? " + + " and tp.template_id=? "; public VMTemplatePoolDaoImpl() { PoolSearch = createSearchBuilder(); diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java index f9aa98ae706..c64a253b81c 100755 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -73,14 +73,17 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol // need to account for zone-wide primary storage where storage_pool has // null-value pod and cluster, where hypervisor information is stored in // storage_pool - protected static final String SELECT_HYPERTYPE_FROM_CLUSTER_VOLUME = "SELECT c.hypervisor_type from volumes v, storage_pool s, cluster c where v.pool_id = s.id and s.cluster_id = c.id and v.id = ?"; + protected static final String SELECT_HYPERTYPE_FROM_CLUSTER_VOLUME = + "SELECT c.hypervisor_type from volumes v, storage_pool s, cluster c where v.pool_id = s.id and s.cluster_id = c.id and v.id = ?"; protected static final String SELECT_HYPERTYPE_FROM_ZONE_VOLUME = "SELECT s.hypervisor from volumes v, storage_pool s where v.pool_id = s.id and v.id = ?"; protected static final String SELECT_POOLSCOPE = "SELECT s.scope from storage_pool s, volumes v where s.id = v.pool_id and v.id = ?"; - private static final String ORDER_POOLS_NUMBER_OF_VOLUMES_FOR_ACCOUNT = "SELECT pool.id, SUM(IF(vol.state='Ready' AND vol.account_id = ?, 1, 0)) FROM `cloud`.`storage_pool` pool LEFT JOIN `cloud`.`volumes` vol ON pool.id = vol.pool_id WHERE pool.data_center_id = ? " - + " AND pool.pod_id = ? AND pool.cluster_id = ? " + " GROUP BY pool.id ORDER BY 2 ASC "; - private static final String ORDER_ZONE_WIDE_POOLS_NUMBER_OF_VOLUMES_FOR_ACCOUNT = "SELECT pool.id, SUM(IF(vol.state='Ready' AND vol.account_id = ?, 1, 0)) FROM `cloud`.`storage_pool` pool LEFT JOIN `cloud`.`volumes` vol ON pool.id = vol.pool_id WHERE pool.data_center_id = ? " - + " AND pool.scope = 'ZONE' AND pool.status='Up' " + " GROUP BY pool.id ORDER BY 2 ASC "; + private static final String ORDER_POOLS_NUMBER_OF_VOLUMES_FOR_ACCOUNT = + "SELECT pool.id, SUM(IF(vol.state='Ready' AND vol.account_id = ?, 1, 0)) FROM `cloud`.`storage_pool` pool LEFT JOIN `cloud`.`volumes` vol ON pool.id = vol.pool_id WHERE pool.data_center_id = ? " + + " AND pool.pod_id = ? AND pool.cluster_id = ? " + " GROUP BY pool.id ORDER BY 2 ASC "; + private static final String ORDER_ZONE_WIDE_POOLS_NUMBER_OF_VOLUMES_FOR_ACCOUNT = + "SELECT pool.id, SUM(IF(vol.state='Ready' AND vol.account_id = ?, 1, 0)) FROM `cloud`.`storage_pool` pool LEFT JOIN `cloud`.`volumes` vol ON pool.id = vol.pool_id WHERE pool.data_center_id = ? " + + " AND pool.scope = 'ZONE' AND pool.status='Up' " + " GROUP BY pool.id ORDER BY 2 ASC "; @Override public List findDetachedByAccount(long accountId) { diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java index 9be48612cdd..d045b9b4b29 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java @@ -18,9 +18,10 @@ package com.cloud.storage.dao; import javax.ejb.Local; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; + import com.cloud.storage.VolumeDetailVO; @Component diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java b/engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java index ec991f4b9fc..ccb276b47f9 100755 --- a/engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeHostDao.java @@ -25,7 +25,8 @@ import com.cloud.storage.VolumeHostVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.fsm.StateDao; -public interface VolumeHostDao extends GenericDao, StateDao { +public interface VolumeHostDao extends GenericDao, + StateDao { VolumeHostVO findByHostVolume(long hostId, long volumeId); diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java index 5f50e7fd974..2820061bac1 100755 --- a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java @@ -21,11 +21,12 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.storage.VolumeHostVO; import com.cloud.utils.db.GenericDaoBase; diff --git a/engine/schema/src/com/cloud/tags/ResourceTagVO.java b/engine/schema/src/com/cloud/tags/ResourceTagVO.java index c5ecca8c33b..ca790bd18f3 100644 --- a/engine/schema/src/com/cloud/tags/ResourceTagVO.java +++ b/engine/schema/src/com/cloud/tags/ResourceTagVO.java @@ -27,9 +27,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.server.ResourceTag; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "resource_tags") diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java index 8610eb00bb3..91ef318873e 100755 --- a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java @@ -46,11 +46,11 @@ public class DatabaseCreator { protected static void printHelp(String cmd) { System.out.println("\nDatabaseCreator creates the database schema by removing the \n" + "previous schema, creating the schema, and running \n" - + "through the database updaters."); + + "through the database updaters."); System.out.println("Usage: " + cmd + " [options] [db.properties file] [schema.sql files] [database upgrade class]\nOptions:" + - "\n --database=a,b comma separate databases to initialize, use the db name in db.properties defined as db.xyz.host, xyz should be passed" + - "\n --rootpassword=password, by default it will try with an empty password" + "\n --dry or -d, this would not run any process, just does a dry run" + - "\n --verbose or -v to print running sql commands, by default it won't print them" + "\n --help or -h for help"); + "\n --database=a,b comma separate databases to initialize, use the db name in db.properties defined as db.xyz.host, xyz should be passed" + + "\n --rootpassword=password, by default it will try with an empty password" + "\n --dry or -d, this would not run any process, just does a dry run" + + "\n --verbose or -v to print running sql commands, by default it won't print them" + "\n --help or -h for help"); } private static boolean fileExists(String file) { diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index 7bb0de1f7ea..c1120bd217f 100755 --- a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -67,8 +67,8 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg if (!has) { throw new CloudRuntimeException( "Local storage with Id " + - poolId + - " shows there are multiple hosts connect to it, but 'select id, status, removed, private_ip_address from host where id in (select host_id from storage_pool_host_ref where pool_id=?)' returns nothing"); + poolId + + " shows there are multiple hosts connect to it, but 'select id, status, removed, private_ip_address from host where id in (select host_id from storage_pool_host_ref where pool_id=?)' returns nothing"); } else { return buf.toString(); } @@ -81,16 +81,19 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg Connection conn; try { conn = txn.getConnection(); - PreparedStatement pstmt = conn.prepareStatement("SELECT pool_id FROM host INNER JOIN storage_pool_host_ref INNER JOIN storage_pool WHERE storage_pool.id = storage_pool_host_ref.pool_id and storage_pool.pool_type='LVM' AND host.id=storage_pool_host_ref.host_id AND host.removed IS NULL group by pool_id having count(*) > 1"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT pool_id FROM host INNER JOIN storage_pool_host_ref INNER JOIN storage_pool WHERE storage_pool.id = storage_pool_host_ref.pool_id and storage_pool.pool_type='LVM' AND host.id=storage_pool_host_ref.host_id AND host.removed IS NULL group by pool_id having count(*) > 1"); ResultSet rs = pstmt.executeQuery(); boolean noDuplicate = true; StringBuffer helpInfo = new StringBuffer(); - String note = "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact CloudStack support team for solution. Below are detialed info, please attach all of them to CloudStack support. Thank you\n"; + String note = + "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact CloudStack support team for solution. Below are detialed info, please attach all of them to CloudStack support. Thank you\n"; helpInfo.append(note); while (rs.next()) { long poolId = rs.getLong(1); - pstmt = conn.prepareStatement("select id, status, removed, private_ip_address from host where id in (select host_id from storage_pool_host_ref where pool_id=?)"); + pstmt = + conn.prepareStatement("select id, status, removed, private_ip_address from host where id in (select host_id from storage_pool_host_ref where pool_id=?)"); pstmt.setLong(1, poolId); ResultSet dhrs = pstmt.executeQuery(); String help = formatDuplicateHostToReadText(poolId, dhrs); diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index e8bb8c45fab..7100d5c6142 100755 --- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -89,80 +89,81 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { public DatabaseUpgradeChecker() { _dao = new VersionDaoImpl(); - _upgradeMap.put("2.1.7", new DbUpgrade[] {new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), - new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), - new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + _upgradeMap.put("2.1.7", new DbUpgrade[] {new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), + new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.1.8", new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), - new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.1.9", new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), - new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.1", new DbUpgrade[] {new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), - new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), - new Upgrade420to421(), new Upgrade421to430()}); + _upgradeMap.put("2.2.1", new DbUpgrade[] {new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), + new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.2", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), - new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), - new Upgrade421to430()}); + _upgradeMap.put("2.2.2", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), + new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), + new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.3", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), - new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), - new Upgrade421to430()}); + _upgradeMap.put("2.2.3", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), + new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), + new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.4", new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.5", new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), - new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.6", new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), - new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.7", new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), - new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.8", new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), - new Upgrade420to421(), new Upgrade421to430()}); + _upgradeMap.put("2.2.8", new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.9", new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), - new Upgrade421to430()}); + _upgradeMap.put("2.2.9", new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), + new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); - _upgradeMap.put("2.2.10", new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + _upgradeMap.put("2.2.10", new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), + new Upgrade421to430()}); - _upgradeMap.put("2.2.11", new DbUpgrade[] {new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + _upgradeMap.put("2.2.11", new DbUpgrade[] {new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), + new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.12", new DbUpgrade[] {new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.13", new DbUpgrade[] {new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), - new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.14", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), - new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("3.0.0", new DbUpgrade[] {new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), - new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("3.0.1", new DbUpgrade[] {new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), - new Upgrade421to430()}); + new Upgrade421to430()}); _upgradeMap.put("3.0.2", new DbUpgrade[] {new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); @@ -182,23 +183,25 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { //CP Upgrades _upgradeMap.put("3.0.3", new DbUpgrade[] {new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), - new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("3.0.4", new DbUpgrade[] {new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), - new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("3.0.5", new DbUpgrade[] {new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), - new Upgrade421to430()}); + new Upgrade421to430()}); _upgradeMap.put("3.0.6", new DbUpgrade[] {new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("3.0.7", new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); _upgradeMap.put("2.2.15", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), - new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), + new Upgrade421to430()}); _upgradeMap.put("2.2.16", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), - new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430()}); + new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), + new Upgrade421to430()}); } protected void runScript(Connection conn, File file) { @@ -231,10 +234,10 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { } if (Version.compare(trimmedCurrentVersion, upgrades[upgrades.length - 1].getUpgradedVersion()) != 0) { - s_logger.error("The end upgrade version is actually at " + upgrades[upgrades.length - 1].getUpgradedVersion() + " but our management server code version is at " + - currentVersion); + s_logger.error("The end upgrade version is actually at " + upgrades[upgrades.length - 1].getUpgradedVersion() + + " but our management server code version is at " + currentVersion); throw new CloudRuntimeException("The end upgrade version is actually at " + upgrades[upgrades.length - 1].getUpgradedVersion() + - " but our management server code version is at " + currentVersion); + " but our management server code version is at " + currentVersion); } boolean supportsRollingUpgrade = true; @@ -254,7 +257,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { for (DbUpgrade upgrade : upgrades) { s_logger.debug("Running upgrade " + upgrade.getClass().getSimpleName() + " to upgrade from " + upgrade.getUpgradableVersionRange()[0] + "-" + - upgrade.getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion()); + upgrade.getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion()); TransactionLegacy txn = TransactionLegacy.open("Upgrade"); txn.start(); try { @@ -330,7 +333,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { if (version != null) { for (DbUpgrade upgrade : versionUpgrades) { s_logger.info("Cleanup upgrade " + upgrade.getClass().getSimpleName() + " to upgrade from " + upgrade.getUpgradableVersionRange()[0] + "-" + - upgrade.getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion()); + upgrade.getUpgradableVersionRange()[1] + " to " + upgrade.getUpgradedVersion()); txn.start(); diff --git a/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java index f78a9853644..4a5566b81a4 100755 --- a/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java +++ b/engine/schema/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java @@ -40,72 +40,75 @@ import com.cloud.upgrade.dao.Upgrade30to301; import com.cloud.upgrade.dao.Upgrade40to41; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; - import com.cloud.utils.component.SystemIntegrityChecker; @Local(value = {SystemIntegrityChecker.class}) public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker { public PremiumDatabaseUpgradeChecker() { _upgradeMap.put("2.1.7", new DbUpgrade[] {new Upgrade217to218(), new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), - new Upgrade222to224Premium(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade222to224Premium(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.1.8", new DbUpgrade[] {new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), - new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.1.9", new DbUpgrade[] {new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), - new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.1", new DbUpgrade[] {new Upgrade221to222Premium(), new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), - new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41()}); _upgradeMap.put("2.2.2", new DbUpgrade[] {new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), - new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41()}); _upgradeMap.put("2.2.3", new DbUpgrade[] {new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), - new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41()}); - _upgradeMap.put("2.2.4", new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), - new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + _upgradeMap.put("2.2.4", new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), + new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), + new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); - _upgradeMap.put("2.2.5", new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), - new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41()}); + _upgradeMap.put("2.2.5", new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), + new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.6", new DbUpgrade[] {new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), - new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.7", new DbUpgrade[] {new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), - new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41()}); - _upgradeMap.put("2.2.8", new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + _upgradeMap.put("2.2.8", new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), + new Upgrade40to41()}); _upgradeMap.put("2.2.9", new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.10", new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); - _upgradeMap.put("2.2.11", new DbUpgrade[] {new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); + _upgradeMap.put("2.2.11", new DbUpgrade[] {new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), + new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.12", new DbUpgrade[] {new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40(), new Upgrade40to41()}); + new Upgrade302to40(), new Upgrade40to41()}); _upgradeMap.put("2.2.13", new DbUpgrade[] {new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), - new Upgrade40to41()}); + new Upgrade40to41()}); _upgradeMap.put("2.2.14", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41()}); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java index 13fe90c70b8..5aa4b5f341d 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java @@ -74,8 +74,9 @@ public class Upgrade218to22 implements DbUpgrade { protected long insertNetworkOffering(Connection conn, String name, String displayText, String trafficType, boolean systemOnly, boolean defaultNetworkOffering, String availability, boolean dns_service, boolean gateway_service, boolean firewall_service, boolean lb_service, boolean userdata_service, boolean vpn_service, boolean dhcp_service) { - String insertSql = "INSERT INTO network_offerings (name, display_text, nw_rate, mc_rate, concurrent_connections, traffic_type, tags, system_only, specify_vlan, service_offering_id, created, removed, `default`, availability, dns_service, gateway_service, firewall_service, lb_service, userdata_service, vpn_service, dhcp_service) " - + "VALUES (?, ?, NULL, NULL, NULL, ?, NULL, ?, 0, NULL, now(), NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertSql = + "INSERT INTO network_offerings (name, display_text, nw_rate, mc_rate, concurrent_connections, traffic_type, tags, system_only, specify_vlan, service_offering_id, created, removed, `default`, availability, dns_service, gateway_service, firewall_service, lb_service, userdata_service, vpn_service, dhcp_service) " + + "VALUES (?, ?, NULL, NULL, NULL, ?, NULL, ?, 0, NULL, now(), NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; try { PreparedStatement pstmt = conn.prepareStatement(insertSql, Statement.RETURN_GENERATED_KEYS); int i = 1; @@ -127,7 +128,8 @@ public class Upgrade218to22 implements DbUpgrade { } // update instance_group_vm_map - pstmt = conn.prepareStatement("SELECT g.id, v.id from vm_instance v, instance_group g where g.name=v.group and g.account_id=v.account_id and v.group is not null"); + pstmt = + conn.prepareStatement("SELECT g.id, v.id from vm_instance v, instance_group g where g.name=v.group and g.account_id=v.account_id and v.group is not null"); rs = pstmt.executeQuery(); ArrayList groupVmMaps = new ArrayList(); while (rs.next()) { @@ -168,10 +170,11 @@ public class Upgrade218to22 implements DbUpgrade { protected long insertNic(Connection conn, long networkId, long instanceId, boolean running, String macAddress, String ipAddress, String netmask, String strategy, String gateway, String vnet, String guru, boolean defNic, int deviceId, String mode, String reservationId) throws SQLException { - PreparedStatement pstmt = conn.prepareStatement( - "INSERT INTO nics (instance_id, network_id, mac_address, ip4_address, netmask, strategy, ip_type, broadcast_uri, mode, reserver_name, reservation_id, device_id, update_time, isolation_uri, ip6_address, default_nic, created, removed, state, gateway) " + PreparedStatement pstmt = + conn.prepareStatement( + "INSERT INTO nics (instance_id, network_id, mac_address, ip4_address, netmask, strategy, ip_type, broadcast_uri, mode, reserver_name, reservation_id, device_id, update_time, isolation_uri, ip6_address, default_nic, created, removed, state, gateway) " + "VALUES (?, ?, ?, ?, ?, ?, 'Ip4', ?, ?, ?, ?, ?, now(), ?, NULL, ?, now(), NULL, ?, ?)", - Statement.RETURN_GENERATED_KEYS); + Statement.RETURN_GENERATED_KEYS); int i = 1; String isolationUri = null; @@ -214,7 +217,8 @@ public class Upgrade218to22 implements DbUpgrade { protected void upgradeDomR(Connection conn, long dcId, long domrId, Long publicNetworkId, long guestNetworkId, long controlNetworkId, String zoneType, String vnet) throws SQLException { s_logger.debug("Upgrading domR" + domrId); - PreparedStatement pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, domain_router.public_mac_address, domain_router.public_ip_address, domain_router.public_netmask, domain_router.guest_mac_address, domain_router.guest_ip_address, domain_router.guest_netmask, domain_router.vnet, domain_router.gateway FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed is NULL AND vm_instance.id=?"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, domain_router.public_mac_address, domain_router.public_ip_address, domain_router.public_netmask, domain_router.guest_mac_address, domain_router.guest_ip_address, domain_router.guest_netmask, domain_router.vnet, domain_router.gateway FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed is NULL AND vm_instance.id=?"); pstmt.setLong(1, domrId); ResultSet rs = pstmt.executeQuery(); @@ -248,8 +252,9 @@ public class Upgrade218to22 implements DbUpgrade { } // Control nic is the same for all types of networks - long controlNicId = insertNic(conn, controlNetworkId, domrId, running, privateMac, privateIp, privateNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 1, - "Static", privateIp != null ? (domrId + privateIp) : null); + long controlNicId = + insertNic(conn, controlNetworkId, domrId, running, privateMac, privateIp, privateNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 1, + "Static", privateIp != null ? (domrId + privateIp) : null); if (privateIp != null) { pstmt = conn.prepareStatement("UPDATE op_dc_link_local_ip_address_alloc SET instance_id=? WHERE ip_address=? AND data_center_id=?"); pstmt.setLong(1, controlNicId); @@ -263,7 +268,8 @@ public class Upgrade218to22 implements DbUpgrade { insertNic(conn, guestNetworkId, domrId, running, guestMac, guestIp, guestNetmask, "Create", gateway, vnet, "DirectPodBasedNetworkGuru", true, 0, "Dhcp", null); } else if (publicIp != null) { // update virtual domR - insertNic(conn, publicNetworkId, domrId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", null); + insertNic(conn, publicNetworkId, domrId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", + null); insertNic(conn, guestNetworkId, domrId, running, guestMac, guestIp, guestNetmask, "Start", null, vnet, "ExternalGuestNetworkGuru", false, 0, "Dhcp", null); } else { // update direct domR - dhcp case @@ -272,9 +278,11 @@ public class Upgrade218to22 implements DbUpgrade { } - protected void upgradeSsvm(Connection conn, long dataCenterId, long publicNetworkId, long managementNetworkId, long controlNetworkId, String zoneType) throws SQLException { + protected void upgradeSsvm(Connection conn, long dataCenterId, long publicNetworkId, long managementNetworkId, long controlNetworkId, String zoneType) + throws SQLException { s_logger.debug("Upgrading ssvm in " + dataCenterId); - PreparedStatement pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, secondary_storage_vm.public_mac_address, secondary_storage_vm.public_ip_address, secondary_storage_vm.public_netmask, secondary_storage_vm.guest_mac_address, secondary_storage_vm.guest_ip_address, secondary_storage_vm.guest_netmask, secondary_storage_vm.gateway, vm_instance.type FROM vm_instance INNER JOIN secondary_storage_vm ON vm_instance.id=secondary_storage_vm.id WHERE vm_instance.removed is NULL AND vm_instance.data_center_id=? AND vm_instance.type='SecondaryStorageVm'"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, secondary_storage_vm.public_mac_address, secondary_storage_vm.public_ip_address, secondary_storage_vm.public_netmask, secondary_storage_vm.guest_mac_address, secondary_storage_vm.guest_ip_address, secondary_storage_vm.guest_netmask, secondary_storage_vm.gateway, vm_instance.type FROM vm_instance INNER JOIN secondary_storage_vm ON vm_instance.id=secondary_storage_vm.id WHERE vm_instance.removed is NULL AND vm_instance.data_center_id=? AND vm_instance.type='SecondaryStorageVm'"); pstmt.setLong(1, dataCenterId); ResultSet rs = pstmt.executeQuery(); @@ -300,7 +308,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("SELECT host_pod_ref.gateway from host_pod_ref INNER JOIN vm_instance ON vm_instance.pod_id=host_pod_ref.id WHERE vm_instance.removed is NULL AND vm_instance.data_center_id=? AND vm_instance.type='SecondaryStorageVm'"); + pstmt = + conn.prepareStatement("SELECT host_pod_ref.gateway from host_pod_ref INNER JOIN vm_instance ON vm_instance.pod_id=host_pod_ref.id WHERE vm_instance.removed is NULL AND vm_instance.data_center_id=? AND vm_instance.type='SecondaryStorageVm'"); pstmt.setLong(1, dataCenterId); rs = pstmt.executeQuery(); @@ -326,14 +335,17 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.close(); if (zoneType.equalsIgnoreCase("Basic")) { - insertNic(conn, publicNetworkId, ssvmId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "DirectPodBasedNetworkGuru", true, 2, "Dhcp", null); + insertNic(conn, publicNetworkId, ssvmId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "DirectPodBasedNetworkGuru", true, 2, + "Dhcp", null); } else { - insertNic(conn, publicNetworkId, ssvmId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", null); + insertNic(conn, publicNetworkId, ssvmId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", + null); } - long controlNicId = insertNic(conn, controlNetworkId, ssvmId, running, guestMac, guestIp, guestNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 0, - "Static", guestIp != null ? (ssvmId + guestIp) : null); + long controlNicId = + insertNic(conn, controlNetworkId, ssvmId, running, guestMac, guestIp, guestNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 0, "Static", + guestIp != null ? (ssvmId + guestIp) : null); if (guestIp != null) { pstmt = conn.prepareStatement("UPDATE op_dc_link_local_ip_address_alloc SET instance_id=? WHERE ip_address=? AND data_center_id=?"); pstmt.setLong(1, controlNicId); @@ -343,8 +355,9 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.close(); } - long mgmtNicId = insertNic(conn, managementNetworkId, ssvmId, running, privateMac, privateIp, privateNetmask, "Start", podGateway, null, "PodBasedNetworkGuru", false, 1, - "Static", null); + long mgmtNicId = + insertNic(conn, managementNetworkId, ssvmId, running, privateMac, privateIp, privateNetmask, "Start", podGateway, null, "PodBasedNetworkGuru", false, 1, + "Static", null); if (privateIp != null) { pstmt = conn.prepareStatement("UPDATE op_dc_ip_address_alloc SET instance_id=? WHERE ip_address=? AND data_center_id=?"); pstmt.setLong(1, mgmtNicId); @@ -358,7 +371,8 @@ public class Upgrade218to22 implements DbUpgrade { protected void upgradeConsoleProxy(Connection conn, long dcId, long cpId, long publicNetworkId, long managementNetworkId, long controlNetworkId, String zoneType) throws SQLException { s_logger.debug("Upgrading cp" + cpId); - PreparedStatement pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, console_proxy.public_mac_address, console_proxy.public_ip_address, console_proxy.public_netmask, console_proxy.guest_mac_address, console_proxy.guest_ip_address, console_proxy.guest_netmask, console_proxy.gateway, vm_instance.type FROM vm_instance INNER JOIN console_proxy ON vm_instance.id=console_proxy.id WHERE vm_instance.removed is NULL AND vm_instance.id=?"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.state, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, console_proxy.public_mac_address, console_proxy.public_ip_address, console_proxy.public_netmask, console_proxy.guest_mac_address, console_proxy.guest_ip_address, console_proxy.guest_netmask, console_proxy.gateway, vm_instance.type FROM vm_instance INNER JOIN console_proxy ON vm_instance.id=console_proxy.id WHERE vm_instance.removed is NULL AND vm_instance.id=?"); pstmt.setLong(1, cpId); ResultSet rs = pstmt.executeQuery(); @@ -383,7 +397,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("SELECT host_pod_ref.gateway from host_pod_ref INNER JOIN vm_instance ON vm_instance.pod_id=host_pod_ref.id WHERE vm_instance.id=?"); + pstmt = + conn.prepareStatement("SELECT host_pod_ref.gateway from host_pod_ref INNER JOIN vm_instance ON vm_instance.pod_id=host_pod_ref.id WHERE vm_instance.id=?"); pstmt.setLong(1, cpId); rs = pstmt.executeQuery(); @@ -408,13 +423,16 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.close(); if (zoneType.equalsIgnoreCase("Basic")) { - insertNic(conn, publicNetworkId, cpId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "DirectPodBasedNetworkGuru", true, 2, "Dhcp", null); + insertNic(conn, publicNetworkId, cpId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "DirectPodBasedNetworkGuru", true, 2, + "Dhcp", null); } else { - insertNic(conn, publicNetworkId, cpId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", null); + insertNic(conn, publicNetworkId, cpId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", + null); } - long controlNicId = insertNic(conn, controlNetworkId, cpId, running, guestMac, guestIp, guestNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 0, - "Static", guestIp != null ? (cpId + guestIp) : null); + long controlNicId = + insertNic(conn, controlNetworkId, cpId, running, guestMac, guestIp, guestNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 0, "Static", + guestIp != null ? (cpId + guestIp) : null); if (guestIp != null) { pstmt = conn.prepareStatement("UPDATE op_dc_link_local_ip_address_alloc SET instance_id=? WHERE ip_address=? AND data_center_id=?"); pstmt.setLong(1, controlNicId); @@ -423,8 +441,9 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.executeUpdate(); pstmt.close(); } - long mgmtNicId = insertNic(conn, managementNetworkId, cpId, running, privateMac, privateIp, privateNetmask, "Start", podGateway, null, "PodBasedNetworkGuru", false, 1, - "Static", privateIp != null ? (cpId + privateIp) : null); + long mgmtNicId = + insertNic(conn, managementNetworkId, cpId, running, privateMac, privateIp, privateNetmask, "Start", podGateway, null, "PodBasedNetworkGuru", false, 1, + "Static", privateIp != null ? (cpId + privateIp) : null); if (privateIp != null) { pstmt = conn.prepareStatement("UPDATE op_dc_ip_address_alloc SET instance_id=? WHERE ip_address=? AND data_center_id=?"); pstmt.setLong(1, mgmtNicId); @@ -435,8 +454,10 @@ public class Upgrade218to22 implements DbUpgrade { } } - protected void upgradeUserVms(Connection conn, long domainRouterId, long networkId, String gateway, String vnet, String guruName, String strategy) throws SQLException { - PreparedStatement pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, vm_instance.state, vm_instance.type FROM vm_instance INNER JOIN user_vm ON vm_instance.id=user_vm.id WHERE user_vm.domain_router_id=? and vm_instance.removed IS NULL"); + protected void upgradeUserVms(Connection conn, long domainRouterId, long networkId, String gateway, String vnet, String guruName, String strategy) + throws SQLException { + PreparedStatement pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.private_mac_address, vm_instance.private_ip_address, vm_instance.private_netmask, vm_instance.state, vm_instance.type FROM vm_instance INNER JOIN user_vm ON vm_instance.id=user_vm.id WHERE user_vm.domain_router_id=? and vm_instance.removed IS NULL"); pstmt.setLong(1, domainRouterId); ResultSet rs = pstmt.executeQuery(); List vms = new ArrayList(); @@ -508,8 +529,9 @@ public class Upgrade218to22 implements DbUpgrade { String guestType, boolean shared, String networkDomain, boolean isDefault, String reservationId) { String getNextNetworkSequenceSql = "SELECT value from sequence where name='networks_seq'"; String advanceNetworkSequenceSql = "UPDATE sequence set value=value+1 where name='networks_seq'"; - String insertNetworkSql = "INSERT INTO networks(id, name, display_text, traffic_type, broadcast_domain_type, gateway, cidr, mode, network_offering_id, data_center_id, guru_name, state, domain_id, account_id, dns1, dns2, guest_type, shared, is_default, created, network_domain, related, reservation_id, broadcast_uri) " - + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, now(), ?, ?, ?, ?)"; + String insertNetworkSql = + "INSERT INTO networks(id, name, display_text, traffic_type, broadcast_domain_type, gateway, cidr, mode, network_offering_id, data_center_id, guru_name, state, domain_id, account_id, dns1, dns2, guest_type, shared, is_default, created, network_domain, related, reservation_id, broadcast_uri) " + + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, now(), ?, ?, ?, ?)"; try { PreparedStatement pstmt = conn.prepareStatement(getNextNetworkSequenceSql); ResultSet rs = pstmt.executeQuery(); @@ -612,13 +634,15 @@ public class Upgrade218to22 implements DbUpgrade { protected void upgradeDirectUserIpAddress(Connection conn, long dcId, long networkId, String vlanType) throws SQLException { s_logger.debug("Upgrading user ip address for data center " + dcId + " network " + networkId + " vlan type " + vlanType); - PreparedStatement pstmt = conn.prepareStatement("UPDATE user_ip_address INNER JOIN vlan ON user_ip_address.vlan_db_id=vlan.id SET user_ip_address.source_network_id=vlan.network_id WHERE user_ip_address.data_center_id=? AND vlan.vlan_type=?"); + PreparedStatement pstmt = + conn.prepareStatement("UPDATE user_ip_address INNER JOIN vlan ON user_ip_address.vlan_db_id=vlan.id SET user_ip_address.source_network_id=vlan.network_id WHERE user_ip_address.data_center_id=? AND vlan.vlan_type=?"); pstmt.setLong(1, dcId); pstmt.setString(2, vlanType); pstmt.executeUpdate(); pstmt.close(); - pstmt = conn.prepareStatement("SELECT user_ip_address.id, user_ip_address.public_ip_address, user_ip_address.account_id, user_ip_address.allocated FROM user_ip_address INNER JOIN vlan ON vlan.id=user_ip_address.vlan_db_id WHERE user_ip_address.data_center_id = ? AND vlan.vlan_type=?"); + pstmt = + conn.prepareStatement("SELECT user_ip_address.id, user_ip_address.public_ip_address, user_ip_address.account_id, user_ip_address.allocated FROM user_ip_address INNER JOIN vlan ON vlan.id=user_ip_address.vlan_db_id WHERE user_ip_address.data_center_id = ? AND vlan.vlan_type=?"); pstmt.setLong(1, dcId); pstmt.setString(2, vlanType); ResultSet rs = pstmt.executeQuery(); @@ -663,7 +687,8 @@ public class Upgrade218to22 implements DbUpgrade { protected void upgradePublicUserIpAddress(Connection conn, long dcId, long networkId, String vlanType) throws SQLException { s_logger.debug("Upgrading user ip address for data center " + dcId + " network " + networkId + " vlan type " + vlanType); - PreparedStatement pstmt = conn.prepareStatement("UPDATE user_ip_address INNER JOIN vlan ON user_ip_address.vlan_db_id=vlan.id SET source_network_id=? WHERE user_ip_address.data_center_id=? AND vlan.vlan_type=?"); + PreparedStatement pstmt = + conn.prepareStatement("UPDATE user_ip_address INNER JOIN vlan ON user_ip_address.vlan_db_id=vlan.id SET source_network_id=? WHERE user_ip_address.data_center_id=? AND vlan.vlan_type=?"); pstmt.setLong(1, networkId); pstmt.setLong(2, dcId); pstmt.setString(3, vlanType); @@ -677,7 +702,8 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.executeUpdate(); pstmt.close(); - pstmt = conn.prepareStatement("SELECT user_ip_address.id, user_ip_address.public_ip_address, user_ip_address.account_id, user_ip_address.allocated FROM user_ip_address INNER JOIN vlan ON vlan.id=user_ip_address.vlan_db_id WHERE user_ip_address.data_center_id = ? AND vlan.vlan_type='VirtualNetwork'"); + pstmt = + conn.prepareStatement("SELECT user_ip_address.id, user_ip_address.public_ip_address, user_ip_address.account_id, user_ip_address.allocated FROM user_ip_address INNER JOIN vlan ON vlan.id=user_ip_address.vlan_db_id WHERE user_ip_address.data_center_id = ? AND vlan.vlan_type='VirtualNetwork'"); pstmt.setLong(1, dcId); ResultSet rs = pstmt.executeQuery(); ArrayList allocatedIps = new ArrayList(); @@ -743,7 +769,8 @@ public class Upgrade218to22 implements DbUpgrade { _basicZone = !rs.next() || Boolean.parseBoolean(rs.getString(1)); rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("UPDATE data_center SET networktype=?, dns_provider=?, gateway_provider=?, firewall_provider=?, dhcp_provider=?, lb_provider=?, vpn_provider=?, userdata_provider=?"); + pstmt = + conn.prepareStatement("UPDATE data_center SET networktype=?, dns_provider=?, gateway_provider=?, firewall_provider=?, dhcp_provider=?, lb_provider=?, vpn_provider=?, userdata_provider=?"); if (_basicZone) { pstmt.setString(1, "Basic"); pstmt.setString(2, "DhcpServer"); @@ -832,16 +859,20 @@ public class Upgrade218to22 implements DbUpgrade { if (_basicZone) { for (Object[] dc : dcs) { Long dcId = (Long)dc[0]; - long mgmtNetworkId = insertNetwork(conn, "ManagementNetwork" + dcId, "Management Network created for Zone " + dcId, "Management", "Native", null, null, null, - "Static", managementNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); - long storageNetworkId = insertNetwork(conn, "StorageNetwork" + dcId, "Storage Network created for Zone " + dcId, "Storage", "Native", null, null, null, - "Static", storageNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); - long controlNetworkId = insertNetwork(conn, "ControlNetwork" + dcId, "Control Network created for Zone " + dcId, "Control", "LinkLocal", null, - NetUtils.getLinkLocalGateway(), NetUtils.getLinkLocalCIDR(), "Static", controlNetworkOfferingId, dcId, "ControlNetworkGuru", "Setup", 1, 1, null, null, - null, true, null, false, null); + long mgmtNetworkId = + insertNetwork(conn, "ManagementNetwork" + dcId, "Management Network created for Zone " + dcId, "Management", "Native", null, null, null, + "Static", managementNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); + long storageNetworkId = + insertNetwork(conn, "StorageNetwork" + dcId, "Storage Network created for Zone " + dcId, "Storage", "Native", null, null, null, "Static", + storageNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); + long controlNetworkId = + insertNetwork(conn, "ControlNetwork" + dcId, "Control Network created for Zone " + dcId, "Control", "LinkLocal", null, + NetUtils.getLinkLocalGateway(), NetUtils.getLinkLocalCIDR(), "Static", controlNetworkOfferingId, dcId, "ControlNetworkGuru", "Setup", 1, 1, + null, null, null, true, null, false, null); upgradeManagementIpAddress(conn, dcId); - long basicDefaultDirectNetworkId = insertNetwork(conn, "BasicZoneDirectNetwork" + dcId, "Basic Zone Direct Network created for Zone " + dcId, "Guest", - "Native", null, null, null, "Dhcp", 5, dcId, "DirectPodBasedNetworkGuru", "Setup", 1, 1, null, null, "Direct", true, null, true, null); + long basicDefaultDirectNetworkId = + insertNetwork(conn, "BasicZoneDirectNetwork" + dcId, "Basic Zone Direct Network created for Zone " + dcId, "Guest", "Native", null, null, null, + "Dhcp", 5, dcId, "DirectPodBasedNetworkGuru", "Setup", 1, 1, null, null, "Direct", true, null, true, null); pstmt = conn.prepareStatement("SELECT id FROM vlan WHERE vlan_type='DirectAttached' AND data_center_id=?"); pstmt.setLong(1, dcId); @@ -860,7 +891,8 @@ public class Upgrade218to22 implements DbUpgrade { // update Dhcp servers information in domain_router and vm_instance tables; all domRs belong to the same // network - pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.domain_id, vm_instance.account_id, domain_router.gateway, domain_router.guest_ip_address, domain_router.domain, domain_router.dns1, domain_router.dns2, domain_router.vnet FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=?"); + pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.domain_id, vm_instance.account_id, domain_router.gateway, domain_router.guest_ip_address, domain_router.domain, domain_router.dns1, domain_router.dns2, domain_router.vnet FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=?"); pstmt.setLong(1, dcId); rs = pstmt.executeQuery(); ArrayList routers = new ArrayList(); @@ -898,17 +930,21 @@ public class Upgrade218to22 implements DbUpgrade { } else { for (Object[] dc : dcs) { Long dcId = (Long)dc[0]; - long mgmtNetworkId = insertNetwork(conn, "ManagementNetwork" + dcId, "Management Network created for Zone " + dcId, "Management", "Native", null, null, null, - "Static", managementNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); + long mgmtNetworkId = + insertNetwork(conn, "ManagementNetwork" + dcId, "Management Network created for Zone " + dcId, "Management", "Native", null, null, null, + "Static", managementNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); insertNetwork(conn, "StorageNetwork" + dcId, "Storage Network created for Zone " + dcId, "Storage", "Native", null, null, null, "Static", storageNetworkOfferingId, dcId, "PodBasedNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); - long controlNetworkId = insertNetwork(conn, "ControlNetwork" + dcId, "Control Network created for Zone " + dcId, "Control", "Native", null, null, null, - "Static", controlNetworkOfferingId, dcId, "ControlNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); + long controlNetworkId = + insertNetwork(conn, "ControlNetwork" + dcId, "Control Network created for Zone " + dcId, "Control", "Native", null, null, null, "Static", + controlNetworkOfferingId, dcId, "ControlNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); upgradeManagementIpAddress(conn, dcId); - long publicNetworkId = insertNetwork(conn, "PublicNetwork" + dcId, "Public Network Created for Zone " + dcId, "Public", "Vlan", null, null, null, "Static", - publicNetworkOfferingId, dcId, "PublicNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); + long publicNetworkId = + insertNetwork(conn, "PublicNetwork" + dcId, "Public Network Created for Zone " + dcId, "Public", "Vlan", null, null, null, "Static", + publicNetworkOfferingId, dcId, "PublicNetworkGuru", "Setup", 1, 1, null, null, null, true, null, false, null); - pstmt = conn.prepareStatement("SELECT vm_instance.id, vm_instance.domain_id, vm_instance.account_id, domain_router.guest_ip_address, domain_router.domain, domain_router.dns1, domain_router.dns2, domain_router.vnet FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=? and domain_router.role='DHCP_FIREWALL_LB_PASSWD_USERDATA'"); + pstmt = + conn.prepareStatement("SELECT vm_instance.id, vm_instance.domain_id, vm_instance.account_id, domain_router.guest_ip_address, domain_router.domain, domain_router.dns1, domain_router.dns2, domain_router.vnet FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=? and domain_router.role='DHCP_FIREWALL_LB_PASSWD_USERDATA'"); pstmt.setLong(1, dcId); rs = pstmt.executeQuery(); ArrayList routers = new ArrayList(); @@ -941,9 +977,10 @@ public class Upgrade218to22 implements DbUpgrade { vlan = "vlan://" + vnet; } - long virtualNetworkId = insertNetwork(conn, "VirtualNetwork" + router[0], "Virtual Network for " + router[0], "Guest", "Vlan", vlan, (String)router[3], - (String)dc[1], "Dhcp", 6, dcId, "ExternalGuestNetworkGuru", state, (Long)router[1], (Long)router[2], (String)router[5], (String)router[6], "Virtual", - false, (String)router[4], true, reservationId); + long virtualNetworkId = + insertNetwork(conn, "VirtualNetwork" + router[0], "Virtual Network for " + router[0], "Guest", "Vlan", vlan, (String)router[3], + (String)dc[1], "Dhcp", 6, dcId, "ExternalGuestNetworkGuru", state, (Long)router[1], (Long)router[2], (String)router[5], + (String)router[6], "Virtual", false, (String)router[4], true, reservationId); pstmt = conn.prepareStatement("UPDATE domain_router SET network_id = ? wHERE id = ? "); pstmt.setLong(1, virtualNetworkId); pstmt.setLong(2, (Long)router[0]); @@ -988,8 +1025,9 @@ public class Upgrade218to22 implements DbUpgrade { } if (vlanNetworkMap.get(tag) == null) { - long directNetworkId = insertNetwork(conn, "DirectNetwork" + vlanId, "Direct network created for " + vlanId, "Guest", "Vlan", "vlan://" + tag, gateway, - cidr, "Dhcp", 7, dcId, "DirectNetworkGuru", "Setup", domainId, accountId, null, null, "Direct", isShared, (String)dc[2], true, null); + long directNetworkId = + insertNetwork(conn, "DirectNetwork" + vlanId, "Direct network created for " + vlanId, "Guest", "Vlan", "vlan://" + tag, gateway, cidr, + "Dhcp", 7, dcId, "DirectNetworkGuru", "Setup", domainId, accountId, null, null, "Direct", isShared, (String)dc[2], true, null); vlanNetworkMap.put(tag, directNetworkId); } @@ -1005,7 +1043,8 @@ public class Upgrade218to22 implements DbUpgrade { } // Create DHCP domRs - Direct networks - pstmt = conn.prepareStatement("SELECT vm_instance.id, domain_router.guest_ip_address FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=? and domain_router.role='DHCP_USERDATA'"); + pstmt = + conn.prepareStatement("SELECT vm_instance.id, domain_router.guest_ip_address FROM vm_instance INNER JOIN domain_router ON vm_instance.id=domain_router.id WHERE vm_instance.removed IS NULL AND vm_instance.type='DomainRouter' AND vm_instance.data_center_id=? and domain_router.role='DHCP_USERDATA'"); pstmt.setLong(1, dcId); rs = pstmt.executeQuery(); ArrayList dhcpServers = new ArrayList(); @@ -1022,7 +1061,8 @@ public class Upgrade218to22 implements DbUpgrade { Long routerId = (Long)dhcpServer[0]; String directIp = (String)dhcpServer[1]; - pstmt = conn.prepareStatement("SELECT u.source_network_id, v.vlan_id from user_ip_address u, vlan v where u.public_ip_address=? and v.id=u.vlan_db_id"); + pstmt = + conn.prepareStatement("SELECT u.source_network_id, v.vlan_id from user_ip_address u, vlan v where u.public_ip_address=? and v.id=u.vlan_db_id"); pstmt.setString(1, directIp); rs = pstmt.executeQuery(); if (!rs.next()) { @@ -1125,9 +1165,11 @@ public class Upgrade218to22 implements DbUpgrade { ResultSet nonRemovedVms = pstmt.executeQuery(); if (nonRemovedVms.next()) { - s_logger.warn("Failed to find domR for for account id=" + accountId + " in zone id=" + dataCenterId + "; will try to locate domR based on user_vm info"); + s_logger.warn("Failed to find domR for for account id=" + accountId + " in zone id=" + dataCenterId + + "; will try to locate domR based on user_vm info"); //try to get domR information from the user_vm belonging to the account - pstmt = conn.prepareStatement("SELECT u.domain_router_id from user_vm u, vm_instance v where u.account_id=? AND v.data_center_id=? AND v.removed IS NULL AND u.domain_router_id is NOT NULL"); + pstmt = + conn.prepareStatement("SELECT u.domain_router_id from user_vm u, vm_instance v where u.account_id=? AND v.data_center_id=? AND v.removed IS NULL AND u.domain_router_id is NOT NULL"); pstmt.setLong(1, accountId); pstmt.setLong(2, dataCenterId); ResultSet userVmSet = pstmt.executeQuery(); @@ -1161,7 +1203,8 @@ public class Upgrade218to22 implements DbUpgrade { public void upgradePortForwardingRules(Connection conn) { try { - PreparedStatement pstmt = conn.prepareStatement("SELECT id, public_ip_address, public_port, private_ip_address, private_port, protocol FROM ip_forwarding WHERE forwarding=1"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT id, public_ip_address, public_port, private_ip_address, private_port, protocol FROM ip_forwarding WHERE forwarding=1"); ResultSet rs = pstmt.executeQuery(); ArrayList rules = new ArrayList(); while (rs.next()) { @@ -1220,7 +1263,8 @@ public class Upgrade218to22 implements DbUpgrade { s_logger.debug("Instance id is " + instanceId); // update firewall_rules table s_logger.trace("Updating firewall_rules table as a part of PF rules upgrade..."); - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'PortForwarding', ?, ?, ?, ?, 0, now())"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'PortForwarding', ?, ?, ?, ?, 0, now())"); pstmt.setLong(1, id); pstmt.setInt(2, ipAddressId); pstmt.setInt(3, Integer.valueOf(sourcePort.trim())); @@ -1302,7 +1346,7 @@ public class Upgrade218to22 implements DbUpgrade { if (!rs.next()) { s_logger.warn("Unable to find public IP address " + publicIp + "; skipping lb rule id=" + originalLbId + - " from update. Cleaning it up from load_balancer_vm_map and load_balancer table"); + " from update. Cleaning it up from load_balancer_vm_map and load_balancer table"); pstmt = conn.prepareStatement("DELETE from load_balancer_vm_map where load_balancer_id=?"); pstmt.setLong(1, originalLbId); pstmt.executeUpdate(); @@ -1324,7 +1368,8 @@ public class Upgrade218to22 implements DbUpgrade { // update firewall_rules table s_logger.trace("Updating firewall_rules table as a part of LB rules upgrade..."); - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'LoadBalancing', ?, ?, ?, ?, 0, now())"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (id, ip_address_id, start_port, end_port, state, protocol, purpose, account_id, domain_id, network_id, xid, is_static_nat, created) VALUES (?, ?, ?, ?, 'Active', ?, 'LoadBalancing', ?, ?, ?, ?, 0, now())"); pstmt.setLong(1, newLbId); pstmt.setInt(2, ipAddressId); pstmt.setInt(3, Integer.valueOf(sourcePort)); @@ -1382,7 +1427,8 @@ public class Upgrade218to22 implements DbUpgrade { private void upgradeHostMemoryCapacityInfo(Connection conn) { try { // count user_vm memory info (M Bytes) - PreparedStatement pstmt = conn.prepareStatement("select h.id, sum(s.ram_size) from host h, vm_instance v, service_offering s where h.type='Routing' and v.state='Running' and v.`type`='User' and v.host_id=h.id and v.service_offering_id = s.id group by h.id"); + PreparedStatement pstmt = + conn.prepareStatement("select h.id, sum(s.ram_size) from host h, vm_instance v, service_offering s where h.type='Routing' and v.state='Running' and v.`type`='User' and v.host_id=h.id and v.service_offering_id = s.id group by h.id"); ResultSet rs = pstmt.executeQuery(); Map hostUsedMemoryInfo = new HashMap(); @@ -1396,7 +1442,8 @@ public class Upgrade218to22 implements DbUpgrade { int domrRamSize = NumbersUtil.parseInt(getConfigValue(conn, "router.ram.size"), 128); // VpcVirtualNetworkApplianceManager.DEFAULT_ROUTER_VM_RAMSIZE); int ssvmRamSize = NumbersUtil.parseInt(getConfigValue(conn, "secstorage.vm.ram.size"), 256); // SecondaryStorageVmManager.DEFAULT_SS_VM_RAMSIZE); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='ConsoleProxy' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='ConsoleProxy' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { if (hostUsedMemoryInfo.get(rs.getLong(1)) != null) { @@ -1409,7 +1456,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='DomainRouter' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='DomainRouter' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { if (hostUsedMemoryInfo.get(rs.getLong(1)) != null) { @@ -1422,7 +1470,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='SecondaryStorageVm' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='SecondaryStorageVm' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { if (hostUsedMemoryInfo.get(rs.getLong(1)) != null) { @@ -1494,7 +1543,8 @@ public class Upgrade218to22 implements DbUpgrade { if (rs_domain_count.next()) { Long domainCount = rs_domain_count.getLong(1); domainCount = domainCount + accountCount; - PreparedStatement update_domain_count_pstmt = conn.prepareStatement("UPDATE resource_count set count=? where domain_id=? and type ='" + resourceType + "'"); + PreparedStatement update_domain_count_pstmt = + conn.prepareStatement("UPDATE resource_count set count=? where domain_id=? and type ='" + resourceType + "'"); update_domain_count_pstmt.setLong(1, domainCount); update_domain_count_pstmt.setLong(2, domainId); update_domain_count_pstmt.executeUpdate(); @@ -1537,7 +1587,8 @@ public class Upgrade218to22 implements DbUpgrade { private void upgradeHostCpuCapacityInfo(Connection conn) { try { // count user_vm memory info (M Bytes) - PreparedStatement pstmt = conn.prepareStatement("select h.id, sum(s.speed*s.cpu) from host h, vm_instance v, service_offering s where h.type='Routing' and v.state='Running' and v.`type`='User' and v.host_id=h.id and v.service_offering_id = s.id group by h.id"); + PreparedStatement pstmt = + conn.prepareStatement("select h.id, sum(s.speed*s.cpu) from host h, vm_instance v, service_offering s where h.type='Routing' and v.state='Running' and v.`type`='User' and v.host_id=h.id and v.service_offering_id = s.id group by h.id"); ResultSet rs = pstmt.executeQuery(); Map hostUsedCpuInfo = new HashMap(); @@ -1551,7 +1602,8 @@ public class Upgrade218to22 implements DbUpgrade { int domrCpuMhz = NumbersUtil.parseInt(getConfigValue(conn, "router.cpu.mhz"), 500); // VpcVirtualNetworkApplianceManager.DEFAULT_ROUTER_CPU_MHZ); int ssvmCpuMhz = NumbersUtil.parseInt(getConfigValue(conn, "secstorage.vm.cpu.mhz"), 500); // SecondaryStorageVmManager.DEFAULT_SS_VM_CPUMHZ); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='ConsoleProxy' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='ConsoleProxy' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { @@ -1565,7 +1617,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='DomainRouter' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='DomainRouter' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { if (hostUsedCpuInfo.get(rs.getLong(1)) != null) { @@ -1578,7 +1631,8 @@ public class Upgrade218to22 implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='SecondaryStorageVm' and v.host_id=h.id group by h.id"); + pstmt = + conn.prepareStatement("select h.id, count(v.id) from host h, vm_instance v where h.type='Routing' and v.state='Running' and v.`type`='SecondaryStorageVm' and v.host_id=h.id group by h.id"); rs = pstmt.executeQuery(); while (rs.next()) { if (hostUsedCpuInfo.get(rs.getLong(1)) != null) { @@ -1635,7 +1689,8 @@ public class Upgrade218to22 implements DbUpgrade { // get last processed event Id Long lastProcessedEvent = getMostRecentEvent(conn); // Events not yet processed - String sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.id > ? and vmevt.state = 'Completed' "; + String sql = + "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.id > ? and vmevt.state = 'Completed' "; if (lastProcessedEvent == null) { s_logger.trace("no events are processed earlier, copying all events"); sql = "SELECT type, description, user_id, account_id, created, level, parameters FROM cloud.event vmevt WHERE vmevt.state = 'Completed' "; @@ -1713,8 +1768,9 @@ public class Upgrade218to22 implements DbUpgrade { } // update firewall_rules table PreparedStatement pstmt = null; - pstmt = conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id, usage_event.resource_name," - + " usage_event.offering_id, usage_event.template_id, usage_event.size) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); + pstmt = + conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id, usage_event.resource_name," + + " usage_event.offering_id, usage_event.template_id, usage_event.size) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); pstmt.setString(1, usageEvent.getType()); pstmt.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), usageEvent.getCreateDate())); pstmt.setLong(3, usageEvent.getAccountId()); @@ -2198,7 +2254,8 @@ public class Upgrade218to22 implements DbUpgrade { pstmt.close(); // add indexes - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account_id` FOREIGN KEY `fk_security_group__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account_id` FOREIGN KEY `fk_security_group__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); @@ -2248,8 +2305,9 @@ public class Upgrade218to22 implements DbUpgrade { */ private void createPortForwardingEvents(Connection conn) { try { - PreparedStatement pstmt = conn.prepareStatement("SELECT fw.account_id, ip.data_center_id, fw.id FROM firewall_rules fw, user_ip_address ip where purpose = 'PortForwarding' and " - + "fw.state = 'Active' and ip.id = fw.ip_address_id"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT fw.account_id, ip.data_center_id, fw.id FROM firewall_rules fw, user_ip_address ip where purpose = 'PortForwarding' and " + + "fw.state = 'Active' and ip.id = fw.ip_address_id"); s_logger.debug("Creating Port Forwarding usage events"); ResultSet rs = pstmt.executeQuery(); Date now = new Date(); @@ -2258,8 +2316,9 @@ public class Upgrade218to22 implements DbUpgrade { long zoneId = rs.getLong(2); long ruleId = rs.getLong(3); PreparedStatement pstmt1 = null; - pstmt1 = conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id)" - + " VALUES (?, ?, ?, ?, ?)"); + pstmt1 = + conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id)" + + " VALUES (?, ?, ?, ?, ?)"); pstmt1.setString(1, EventTypes.EVENT_NET_RULE_ADD); pstmt1.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), now)); pstmt1.setLong(3, accountId); @@ -2284,8 +2343,9 @@ public class Upgrade218to22 implements DbUpgrade { */ private void createLoadBalancerEvents(Connection conn) { try { - PreparedStatement pstmt = conn.prepareStatement("SELECT fw.account_id, ip.data_center_id, fw.id FROM firewall_rules fw, user_ip_address ip where purpose = 'LoadBalancing' and " - + "fw.state = 'Active' and ip.id = fw.ip_address_id"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT fw.account_id, ip.data_center_id, fw.id FROM firewall_rules fw, user_ip_address ip where purpose = 'LoadBalancing' and " + + "fw.state = 'Active' and ip.id = fw.ip_address_id"); s_logger.debug("Creating load balancer usage events"); ResultSet rs = pstmt.executeQuery(); Date now = new Date(); @@ -2294,8 +2354,9 @@ public class Upgrade218to22 implements DbUpgrade { long zoneId = rs.getLong(2); long ruleId = rs.getLong(3); PreparedStatement pstmt1 = null; - pstmt1 = conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id)" - + " VALUES (?, ?, ?, ?, ?)"); + pstmt1 = + conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id)" + + " VALUES (?, ?, ?, ?, ?)"); pstmt1.setString(1, EventTypes.EVENT_LOAD_BALANCER_CREATE); pstmt1.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), now)); pstmt1.setLong(3, accountId); @@ -2320,8 +2381,9 @@ public class Upgrade218to22 implements DbUpgrade { */ private void createNetworkOfferingEvents(Connection conn) { try { - PreparedStatement pstmt = conn.prepareStatement("SELECT vm.account_id, vm.data_center_id, ni.instance_id, vm.name, nw.network_offering_id, nw.is_default FROM nics ni, " - + "networks nw, vm_instance vm where vm.type = 'User' and ni.removed is null and ni.instance_id = vm.id and ni.network_id = nw.id;"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT vm.account_id, vm.data_center_id, ni.instance_id, vm.name, nw.network_offering_id, nw.is_default FROM nics ni, " + + "networks nw, vm_instance vm where vm.type = 'User' and ni.removed is null and ni.instance_id = vm.id and ni.network_id = nw.id;"); s_logger.debug("Creating network offering usage events"); ResultSet rs = pstmt.executeQuery(); Date now = new Date(); @@ -2333,8 +2395,9 @@ public class Upgrade218to22 implements DbUpgrade { long nw_offering_id = rs.getLong(5); long isDefault = rs.getLong(6); PreparedStatement pstmt1 = null; - pstmt1 = conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id, usage_event.resource_name, " - + "usage_event.offering_id, usage_event.size)" + " VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); + pstmt1 = + conn.prepareStatement("INSERT INTO usage_event (usage_event.type, usage_event.created, usage_event.account_id, usage_event.zone_id, usage_event.resource_id, usage_event.resource_name, " + + "usage_event.offering_id, usage_event.size)" + " VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); pstmt1.setString(1, EventTypes.EVENT_NETWORK_OFFERING_ASSIGN); pstmt1.setString(2, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), now)); pstmt1.setLong(3, accountId); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java index 2ecb8de5a3d..edf453c96ec 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22Premium.java @@ -60,16 +60,17 @@ public class Upgrade218to22Premium extends Upgrade218to22 { try { // update device_id information - PreparedStatement pstmt = conn.prepareStatement("update cloud_usage.user_statistics uus set device_id = " - + "(select device_id from cloud.user_statistics us where uus.id = us.id)"); + PreparedStatement pstmt = + conn.prepareStatement("update cloud_usage.user_statistics uus set device_id = " + "(select device_id from cloud.user_statistics us where uus.id = us.id)"); pstmt.executeUpdate(); pstmt.close(); s_logger.debug("Upgraded cloud_usage user_statistics with deviceId"); // update host_id information in usage_network - PreparedStatement pstmt1 = conn.prepareStatement("update cloud_usage.usage_network un set host_id = " - + "(select device_id from cloud_usage.user_statistics us where us.account_id = un.account_id and us.data_center_id = un.zone_id)"); + PreparedStatement pstmt1 = + conn.prepareStatement("update cloud_usage.usage_network un set host_id = " + + "(select device_id from cloud_usage.user_statistics us where us.account_id = un.account_id and us.data_center_id = un.zone_id)"); pstmt1.executeUpdate(); pstmt1.close(); @@ -84,8 +85,9 @@ public class Upgrade218to22Premium extends Upgrade218to22 { try { // update id information - PreparedStatement pstmt = conn.prepareStatement("update cloud_usage.usage_ip_address uip set id = " - + "(select id from cloud.user_ip_address ip where uip.public_ip_address = ip.public_ip_address and ip.data_center_id = uip.zone_id)"); + PreparedStatement pstmt = + conn.prepareStatement("update cloud_usage.usage_ip_address uip set id = " + + "(select id from cloud.user_ip_address ip where uip.public_ip_address = ip.public_ip_address and ip.data_center_id = uip.zone_id)"); pstmt.executeUpdate(); pstmt.close(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java index 4bb62eb03d3..4a2ba17a2ac 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2211to2212.java @@ -26,8 +26,6 @@ import java.util.List; import org.apache.log4j.Logger; -import com.cloud.configuration.Resource; -import com.cloud.configuration.Resource.ResourceType; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java index ebf61d35979..df93519371a 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2212to2213.java @@ -80,7 +80,8 @@ public class Upgrade2212to2213 implements DbUpgrade { } try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`networks` ADD CONSTRAINT `fk_networks__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`networks` ADD CONSTRAINT `fk_networks__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); } catch (SQLException e) { throw new CloudRuntimeException("Unable to reinsert data center key for the network", e); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java index 27f97c3a430..ce415630cb8 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java @@ -154,7 +154,8 @@ public class Upgrade2213to2214 implements DbUpgrade { keys.add("u_op_vm_ruleset_log__instance_id"); DbUpgradeUtils.dropKeysIfExist(conn, "cloud.op_vm_ruleset_log", keys, false); try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`op_vm_ruleset_log` ADD CONSTRAINT `u_op_vm_ruleset_log__instance_id` UNIQUE (`instance_id`)"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`op_vm_ruleset_log` ADD CONSTRAINT `u_op_vm_ruleset_log__instance_id` UNIQUE (`instance_id`)"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -190,7 +191,8 @@ public class Upgrade2213to2214 implements DbUpgrade { try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__account_id` FOREIGN KEY `fk_ssh_keypairs__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__account_id` FOREIGN KEY `fk_ssh_keypairs__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -199,7 +201,8 @@ public class Upgrade2213to2214 implements DbUpgrade { try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__domain_id` FOREIGN KEY `fk_ssh_keypairs__domain_id` (`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__domain_id` FOREIGN KEY `fk_ssh_keypairs__domain_id` (`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -226,7 +229,8 @@ public class Upgrade2213to2214 implements DbUpgrade { DbUpgradeUtils.dropKeysIfExist(conn, "cloud.storage_pool_details", keys, true); DbUpgradeUtils.dropKeysIfExist(conn, "cloud.storage_pool_details", keys, false); try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`storage_pool_details` ADD CONSTRAINT `fk_storage_pool_details__pool_id` FOREIGN KEY `fk_storage_pool_details__pool_id`(`pool_id`) REFERENCES `storage_pool`(`id`) ON DELETE CASCADE"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`storage_pool_details` ADD CONSTRAINT `fk_storage_pool_details__pool_id` FOREIGN KEY `fk_storage_pool_details__pool_id`(`pool_id`) REFERENCES `storage_pool`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -240,7 +244,8 @@ public class Upgrade2213to2214 implements DbUpgrade { DbUpgradeUtils.dropKeysIfExist(conn, "cloud.security_group", keys, true); DbUpgradeUtils.dropKeysIfExist(conn, "cloud.security_group", keys, false); try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group__account_id` FOREIGN KEY `fk_security_group__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group__account_id` FOREIGN KEY `fk_security_group__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -264,13 +269,17 @@ public class Upgrade2213to2214 implements DbUpgrade { DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_instance", keys, true); DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_instance", keys, false); try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__host_id` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`)"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__host_id` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`)"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__last_host_id` FOREIGN KEY (`last_host_id`) REFERENCES `host` (`id`)"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__last_host_id` FOREIGN KEY (`last_host_id`) REFERENCES `host` (`id`)"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY (`account_id`) REFERENCES `account` (`id`)"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY (`account_id`) REFERENCES `account` (`id`)"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__service_offering_id` FOREIGN KEY (`service_offering_id`) REFERENCES `service_offering` (`id`)"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__service_offering_id` FOREIGN KEY (`service_offering_id`) REFERENCES `service_offering` (`id`)"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -291,11 +300,14 @@ public class Upgrade2213to2214 implements DbUpgrade { DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_ip_address", keys, true); DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_ip_address", keys, false); try { - PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)"); + PreparedStatement pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java index 847d1e3d228..26d7a4319d7 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -172,7 +172,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { } //check if there are multiple guest networks configured using network_tags - PreparedStatement pstmt2 = conn.prepareStatement("SELECT distinct tag FROM `cloud`.`network_tags` t JOIN `cloud`.`networks` n ON t.network_id = n.id WHERE n.data_center_id = ? and n.removed IS NULL"); + PreparedStatement pstmt2 = + conn.prepareStatement("SELECT distinct tag FROM `cloud`.`network_tags` t JOIN `cloud`.`networks` n ON t.network_id = n.id WHERE n.data_center_id = ? and n.removed IS NULL"); pstmt2.setLong(1, zoneId); ResultSet rsTags = pstmt2.executeQuery(); if (rsTags.next()) { @@ -181,25 +182,27 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { if (vnet != null) { //check if any vnet is allocated and guest networks are using vnets. - PreparedStatement pstmt4 = conn.prepareStatement("SELECT v.* FROM `cloud`.`op_dc_vnet_alloc` v JOIN `cloud`.`networks` n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.removed IS NULL"); + 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"); 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 = \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 = \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); @@ -210,7 +213,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { pstmt4.close(); //Clean up any vnets that have no live networks/nics - pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); + pstmt4 = + conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); pstmt4.setLong(1, zoneId); rsVNet = pstmt4.executeQuery(); while (rsVNet.next()) { @@ -225,8 +229,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { Long nic_id = rsNic.getLong(1); Long instance_id = rsNic.getLong(2); if (rsNic.next()) { - throw new CloudRuntimeException("Cannot upgrade. Please cleanup the guest vnet: " + vnetValue + " , it is being used by nic_id: " + nic_id + - " , instance_id: " + instance_id); + throw new CloudRuntimeException("Cannot upgrade. Please cleanup the guest vnet: " + vnetValue + " , it is being used by nic_id: " + + nic_id + " , instance_id: " + instance_id); } //free this vnet @@ -329,8 +333,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { // add physicalNetworkId to guest networks for this zone s_logger.debug("Adding PhysicalNetwork to networks"); - String updateNet = "UPDATE `cloud`.`networks` SET physical_network_id = " + physicalNetworkId + " WHERE data_center_id = " + zoneId + - " AND traffic_type = 'Guest'"; + String updateNet = + "UPDATE `cloud`.`networks` SET physical_network_id = " + physicalNetworkId + " WHERE data_center_id = " + zoneId + " AND traffic_type = 'Guest'"; pstmtUpdate = conn.prepareStatement(updateNet); pstmtUpdate.executeUpdate(); pstmtUpdate.close(); @@ -605,8 +609,9 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt = null; ResultSet rs = null; try { - pstmt = conn.prepareStatement("select id, dns_service, gateway_service, firewall_service, lb_service, userdata_service," - + " vpn_service, dhcp_service, unique_name from `cloud`.`network_offerings` where traffic_type='Guest'"); + pstmt = + conn.prepareStatement("select id, dns_service, gateway_service, firewall_service, lb_service, userdata_service," + + " vpn_service, dhcp_service, unique_name from `cloud`.`network_offerings` where traffic_type='Guest'"); rs = pstmt.executeQuery(); while (rs.next()) { boolean sharedSourceNat = false; @@ -678,8 +683,9 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { } for (String service : services.keySet()) { - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`," - + " `service`, `provider`, `created`) values (?,?,?, now())"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`," + + " `service`, `provider`, `created`) values (?,?,?, now())"); pstmt.setLong(1, id); pstmt.setString(2, service); pstmt.setString(3, services.get(service)); @@ -800,7 +806,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt = null; try { s_logger.debug("Updating domain_router table"); - pstmt = conn.prepareStatement("UPDATE domain_router, virtual_router_providers vrp LEFT JOIN (physical_network_service_providers pnsp INNER JOIN physical_network pntwk INNER JOIN vm_instance vm INNER JOIN domain_router vr) ON (vrp.nsp_id = pnsp.id AND pnsp.physical_network_id = pntwk.id AND pntwk.data_center_id = vm.data_center_id AND vm.id=vr.id) SET vr.element_id=vrp.id;"); + pstmt = + conn.prepareStatement("UPDATE domain_router, virtual_router_providers vrp LEFT JOIN (physical_network_service_providers pnsp INNER JOIN physical_network pntwk INNER JOIN vm_instance vm INNER JOIN domain_router vr) ON (vrp.nsp_id = pnsp.id AND pnsp.physical_network_id = pntwk.id AND pntwk.data_center_id = vm.data_center_id AND vm.id=vr.id) SET vr.element_id=vrp.id;"); pstmt.executeUpdate(); } catch (SQLException e) { throw new CloudRuntimeException("Unable to update router table. ", e); @@ -821,7 +828,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { ResultSet rs1 = null; try { // get all networks that need to be updated to the redundant network offerings - pstmt = conn.prepareStatement("select ni.network_id, n.network_offering_id from `cloud`.`nics` ni, `cloud`.`networks` n where ni.instance_id in (select id from `cloud`.`domain_router` where is_redundant_router=1) and n.id=ni.network_id and n.traffic_type='Guest'"); + pstmt = + conn.prepareStatement("select ni.network_id, n.network_offering_id from `cloud`.`nics` ni, `cloud`.`networks` n where ni.instance_id in (select id from `cloud`.`domain_router` where is_redundant_router=1) and n.id=ni.network_id and n.traffic_type='Guest'"); rs = pstmt.executeQuery(); pstmt = conn.prepareStatement("select count(*) from `cloud`.`network_offerings`"); rs1 = pstmt.executeQuery(); @@ -911,13 +919,17 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt = null; try { s_logger.debug("Updating op_host_capacity table, column capacity_state"); - pstmt = conn.prepareStatement("UPDATE op_host_capacity, host SET op_host_capacity.capacity_state='Disabled' where host.id=op_host_capacity.host_id and op_host_capacity.capacity_type in (0,1) and host.resource_state='Disabled';"); + pstmt = + conn.prepareStatement("UPDATE op_host_capacity, host SET op_host_capacity.capacity_state='Disabled' where host.id=op_host_capacity.host_id and op_host_capacity.capacity_type in (0,1) and host.resource_state='Disabled';"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("UPDATE op_host_capacity, cluster SET op_host_capacity.capacity_state='Disabled' where cluster.id=op_host_capacity.cluster_id and cluster.allocation_state='Disabled';"); + pstmt = + conn.prepareStatement("UPDATE op_host_capacity, cluster SET op_host_capacity.capacity_state='Disabled' where cluster.id=op_host_capacity.cluster_id and cluster.allocation_state='Disabled';"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("UPDATE op_host_capacity, host_pod_ref SET op_host_capacity.capacity_state='Disabled' where host_pod_ref.id=op_host_capacity.pod_id and host_pod_ref.allocation_state='Disabled';"); + pstmt = + conn.prepareStatement("UPDATE op_host_capacity, host_pod_ref SET op_host_capacity.capacity_state='Disabled' where host_pod_ref.id=op_host_capacity.pod_id and host_pod_ref.allocation_state='Disabled';"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("UPDATE op_host_capacity, data_center SET op_host_capacity.capacity_state='Disabled' where data_center.id=op_host_capacity.data_center_id and data_center.allocation_state='Disabled';"); + pstmt = + conn.prepareStatement("UPDATE op_host_capacity, data_center SET op_host_capacity.capacity_state='Disabled' where data_center.id=op_host_capacity.data_center_id and data_center.allocation_state='Disabled';"); pstmt.executeUpdate(); } catch (SQLException e) { throw new CloudRuntimeException("Unable to update op_host_capacity table. ", e); @@ -1089,7 +1101,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { //Get zones to upgrade List zoneIds = new ArrayList(); try { - pstmt = conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); + pstmt = + conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); rs = pstmt.executeQuery(); while (rs.next()) { zoneIds.add(rs.getLong(1)); @@ -1139,7 +1152,9 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { pstmt.setLong(4, networkOfferingId); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`network_offerings` SELECT * from " + "`cloud`.`network_offerings2` WHERE id=" + newNetworkOfferingId); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`network_offerings` SELECT * from " + "`cloud`.`network_offerings2` WHERE id=" + + newNetworkOfferingId); pstmt.executeUpdate(); pstmt = conn.prepareStatement("UPDATE `cloud`.`networks` SET network_offering_id=? where id=?"); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java index 244d3ac0194..dbd48c879e8 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224.java @@ -68,7 +68,8 @@ public class Upgrade222to224 implements DbUpgrade { } pstmt.close(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`networks` ADD CONSTRAINT `fk_networks__related` FOREIGN KEY(`related`) REFERENCES `networks`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`networks` ADD CONSTRAINT `fk_networks__related` FOREIGN KEY(`related`) REFERENCES `networks`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } @@ -159,7 +160,8 @@ public class Upgrade222to224 implements DbUpgrade { // fixes bug 9597 private void fixRecreatableVolumesProblem(Connection conn) throws SQLException { - PreparedStatement pstmt = conn.prepareStatement("UPDATE volumes as v SET recreatable=(SELECT recreatable FROM disk_offering d WHERE d.id = v.disk_offering_id) WHERE disk_offering_id != 0"); + PreparedStatement pstmt = + conn.prepareStatement("UPDATE volumes as v SET recreatable=(SELECT recreatable FROM disk_offering d WHERE d.id = v.disk_offering_id) WHERE disk_offering_id != 0"); pstmt.execute(); pstmt.close(); @@ -254,7 +256,8 @@ public class Upgrade222to224 implements DbUpgrade { private void updateUserStatsWithNetwork(Connection conn) { try { - PreparedStatement pstmt = conn.prepareStatement("SELECT id, device_id FROM user_statistics WHERE network_id=0 or network_id is NULL and public_ip_address is NULL"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT id, device_id FROM user_statistics WHERE network_id=0 or network_id is NULL and public_ip_address is NULL"); ResultSet rs = pstmt.executeQuery(); while (rs.next()) { @@ -297,8 +300,9 @@ public class Upgrade222to224 implements DbUpgrade { s_logger.debug("Upgraded user_statistics with networkId for DomainRouter device type"); // update network_id information for ExternalFirewall and ExternalLoadBalancer device types - PreparedStatement pstmt1 = conn.prepareStatement("update user_statistics us, user_ip_address uip set us.network_id = uip.network_id where us.public_ip_address = uip.public_ip_address " - + "and us.device_type in ('ExternalFirewall' , 'ExternalLoadBalancer')"); + PreparedStatement pstmt1 = + conn.prepareStatement("update user_statistics us, user_ip_address uip set us.network_id = uip.network_id where us.public_ip_address = uip.public_ip_address " + + "and us.device_type in ('ExternalFirewall' , 'ExternalLoadBalancer')"); pstmt1.executeUpdate(); pstmt1.close(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java index d93441b9a0b..921c5e652bd 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade222to224Premium.java @@ -63,16 +63,17 @@ public class Upgrade222to224Premium extends Upgrade222to224 { try { // update network_id information - PreparedStatement pstmt = conn.prepareStatement("update cloud_usage.user_statistics uus, cloud.user_statistics us set uus.network_id = " - + "us.network_id where uus.id = us.id"); + PreparedStatement pstmt = + conn.prepareStatement("update cloud_usage.user_statistics uus, cloud.user_statistics us set uus.network_id = " + "us.network_id where uus.id = us.id"); pstmt.executeUpdate(); pstmt.close(); s_logger.debug("Upgraded cloud_usage user_statistics with networkId"); // update network_id information in usage_network - PreparedStatement pstmt1 = conn.prepareStatement("update cloud_usage.usage_network un, cloud_usage.user_statistics us set un.network_id = " - + "us.network_id where us.account_id = un.account_id and us.data_center_id = un.zone_id and us.device_id = un.host_id"); + PreparedStatement pstmt1 = + conn.prepareStatement("update cloud_usage.usage_network un, cloud_usage.user_statistics us set un.network_id = " + + "us.network_id where us.account_id = un.account_id and us.data_center_id = un.zone_id and us.device_id = un.host_id"); pstmt1.executeUpdate(); pstmt1.close(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java index bb77aca6e03..7b06d7f6b2b 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade224to225.java @@ -102,12 +102,14 @@ public class Upgrade224to225 implements DbUpgrade { pstmt.setLong(1, accountId); ResultSet rs1 = pstmt.executeQuery(); if (!rs1.next()) { - throw new CloudRuntimeException("Unable to create default security group for account id=" + accountId + ": unable to get accountName/domainId info"); + throw new CloudRuntimeException("Unable to create default security group for account id=" + accountId + + ": unable to get accountName/domainId info"); } String accountName = rs1.getString(1); Long domainId = rs1.getLong(2); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`security_group` (name, description, account_name, account_id, domain_id) VALUES ('default', 'Default Security Group', ?, ?, ?)"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`security_group` (name, description, account_name, account_id, domain_id) VALUES ('default', 'Default Security Group', ?, ?, ?)"); pstmt.setString(1, accountName); pstmt.setLong(2, accountId); pstmt.setLong(3, domainId); @@ -312,7 +314,8 @@ public class Upgrade224to225 implements DbUpgrade { for (String key : keyToTableMap.keySet()) { String tableName = keyToTableMap.get(key); - pstmt = conn.prepareStatement("SELECT * FROM information_schema.table_constraints a JOIN information_schema.key_column_usage b ON a.table_schema = b.table_schema AND a.constraint_name = b.constraint_name WHERE a.table_schema=database() AND a.constraint_type='FOREIGN KEY' and a.constraint_name=?"); + pstmt = + conn.prepareStatement("SELECT * FROM information_schema.table_constraints a JOIN information_schema.key_column_usage b ON a.table_schema = b.table_schema AND a.constraint_name = b.constraint_name WHERE a.table_schema=database() AND a.constraint_type='FOREIGN KEY' and a.constraint_name=?"); pstmt.setString(1, key); ResultSet rs = pstmt.executeQuery(); if (rs.next()) { @@ -338,7 +341,8 @@ public class Upgrade224to225 implements DbUpgrade { ResultSet rs = pstmt.executeQuery(); if (!rs.next()) { s_logger.debug("Adding missing ovs tunnel account"); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ovs_tunnel_account` (`from`, `to`, `account`, `key`, `port_name`, `state`) VALUES (0, 0, 0, 0, 'lock', 'SUCCESS')"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`ovs_tunnel_account` (`from`, `to`, `account`, `key`, `port_name`, `state`) VALUES (0, 0, 0, 0, 'lock', 'SUCCESS')"); pstmt.executeUpdate(); } } catch (SQLException e) { diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java index 0e9e705f543..fd75857aade 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade227to228.java @@ -95,7 +95,8 @@ public class Upgrade227to228 implements DbUpgrade { private void updateDomainLevelNetworks(Connection conn) { s_logger.debug("Updating domain level specific networks..."); try { - PreparedStatement pstmt = conn.prepareStatement("SELECT n.id FROM networks n, network_offerings o WHERE n.shared=1 AND o.system_only=0 AND o.id=n.network_offering_id"); + PreparedStatement pstmt = + conn.prepareStatement("SELECT n.id FROM networks n, network_offerings o WHERE n.shared=1 AND o.system_only=0 AND o.id=n.network_offering_id"); ResultSet rs = pstmt.executeQuery(); ArrayList networks = new ArrayList(); while (rs.next()) { @@ -132,7 +133,8 @@ public class Upgrade227to228 implements DbUpgrade { private void updateVolumeUsageRecords(Connection conn) { try { s_logger.debug("Inserting missing usage_event records for destroyed volumes..."); - PreparedStatement pstmt = conn.prepareStatement("select id, account_id, data_center_id, name from volumes where state='Destroy' and id in (select resource_id from usage_event where type='volume.create') and id not in (select resource_id from usage_event where type='volume.delete')"); + PreparedStatement pstmt = + conn.prepareStatement("select id, account_id, data_center_id, name from volumes where state='Destroy' and id in (select resource_id from usage_event where type='volume.create') and id not in (select resource_id from usage_event where type='volume.delete')"); ResultSet rs = pstmt.executeQuery(); while (rs.next()) { long volumeId = rs.getLong(1); @@ -140,7 +142,8 @@ public class Upgrade227to228 implements DbUpgrade { long zoneId = rs.getLong(3); String volumeName = rs.getString(4); - pstmt = conn.prepareStatement("insert into usage_event (type, account_id, created, zone_id, resource_name, resource_id) values ('VOLUME.DELETE', ?, now(), ?, ?, ?)"); + pstmt = + conn.prepareStatement("insert into usage_event (type, account_id, created, zone_id, resource_name, resource_id) values ('VOLUME.DELETE', ?, now(), ?, ?, ?)"); pstmt.setLong(1, accountId); pstmt.setLong(2, zoneId); pstmt.setString(3, volumeName); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java index 880e4650b5c..a7757c1981a 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade228to229.java @@ -62,13 +62,15 @@ public class Upgrade228to229 implements DbUpgrade { PreparedStatement pstmt; try { /*fk_cluster__data_center_id has been wrongly added in previous upgrade(not sure which one), 228to229 upgrade drops it and re-add again*/ - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__removed`(`removed`)"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`network_tags` ADD CONSTRAINT `fk_network_tags__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`network_tags` ADD CONSTRAINT `fk_network_tags__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java index c854ec53ddb..2eca446652e 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade229to2210.java @@ -72,7 +72,8 @@ public class Upgrade229to2210 implements DbUpgrade { ResultSet rs = null; long currentSnapshotId = 0; try { - pstmt = conn.prepareStatement("select id, prev_snap_id from snapshots where sechost_id is NULL and prev_snap_id is not NULL and status=\"BackedUp\" and removed is NULL order by id"); + pstmt = + conn.prepareStatement("select id, prev_snap_id from snapshots where sechost_id is NULL and prev_snap_id is not NULL and status=\"BackedUp\" and removed is NULL order by id"); rs = pstmt.executeQuery(); while (rs.next()) { long id = rs.getLong(1); @@ -111,7 +112,8 @@ public class Upgrade229to2210 implements DbUpgrade { long currentRuleId = 0; try { // Host and Primary storage capacity types - pstmt = conn.prepareStatement("select id, ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id from firewall_rules where state != 'Revoke'"); + pstmt = + conn.prepareStatement("select id, ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id from firewall_rules where state != 'Revoke'"); rs = pstmt.executeQuery(); while (rs.next()) { long id = rs.getLong(1); @@ -125,7 +127,8 @@ public class Upgrade229to2210 implements DbUpgrade { currentRuleId = id; Long firewallRuleId = null; - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id, purpose, state, xid, created, related) VALUES (?, ?, ?, ?, ?, ?, ?, 'Firewall', 'Active', ?, now(), ?)"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id, purpose, state, xid, created, related) VALUES (?, ?, ?, ?, ?, ?, ?, 'Firewall', 'Active', ?, now(), ?)"); pstmt.setLong(1, ipId); pstmt.setInt(2, startPort); @@ -141,7 +144,8 @@ public class Upgrade229to2210 implements DbUpgrade { pstmt.executeUpdate(); //get new FirewallRule update - pstmt = conn.prepareStatement("SELECT id from firewall_rules where purpose='Firewall' and start_port=? and end_port=? and protocol=? and ip_address_id=? and network_id=? and related=?"); + pstmt = + conn.prepareStatement("SELECT id from firewall_rules where purpose='Firewall' and start_port=? and end_port=? and protocol=? and ip_address_id=? and network_id=? and related=?"); pstmt.setInt(1, startPort); pstmt.setInt(2, endPort); pstmt.setString(3, protocol); @@ -154,8 +158,8 @@ public class Upgrade229to2210 implements DbUpgrade { if (rs1.next()) { firewallRuleId = rs1.getLong(1); } else { - throw new CloudRuntimeException("Unable to find just inserted firewall rule for ptocol " + protocol + ", start_port " + startPort + " and end_port " + endPort + - " and ip address id=" + ipId); + throw new CloudRuntimeException("Unable to find just inserted firewall rule for ptocol " + protocol + ", start_port " + startPort + " and end_port " + + endPort + " and ip address id=" + ipId); } pstmt = conn.prepareStatement("select id from firewall_rules_cidrs where firewall_rule_id=?"); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java index b341c477d73..0da787774b5 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade301to302.java @@ -96,16 +96,18 @@ public class Upgrade301to302 implements DbUpgrade { ResultSet rs1 = null; try { - pstmt = conn.prepareStatement("select n.id, map.id from `cloud`.`network_offerings` n, `cloud`.`ntwk_offering_service_map` map " - + "where n.id=map.network_offering_id and map.service='Lb' and map.provider='VirtualRouter';"); + pstmt = + conn.prepareStatement("select n.id, map.id from `cloud`.`network_offerings` n, `cloud`.`ntwk_offering_service_map` map " + + "where n.id=map.network_offering_id and map.service='Lb' and map.provider='VirtualRouter';"); rs = pstmt.executeQuery(); while (rs.next()) { long ntwkOffId = rs.getLong(1); long mapId = rs.getLong(2); //check if the network offering has source nat service enabled - pstmt = conn.prepareStatement("select n.id from `cloud`.`network_offerings` n, `cloud`.`ntwk_offering_service_map`" - + " map where n.id=map.network_offering_id and map.service='SourceNat' AND n.id=?"); + pstmt = + conn.prepareStatement("select n.id from `cloud`.`network_offerings` n, `cloud`.`ntwk_offering_service_map`" + + " map where n.id=map.network_offering_id and map.service='SourceNat' AND n.id=?"); pstmt.setLong(1, ntwkOffId); rs1 = pstmt.executeQuery(); if (rs1.next()) { @@ -113,8 +115,9 @@ public class Upgrade301to302 implements DbUpgrade { } //delete the service only when there are no lb rules for the network(s) using this network offering - pstmt = conn.prepareStatement("select * from `cloud`.`firewall_rules` f, `cloud`.`networks` n, `cloud`.`network_offerings`" - + " off where f.purpose='LB' and f.network_id=n.id and n.network_offering_id=off.id and off.id=?"); + pstmt = + conn.prepareStatement("select * from `cloud`.`firewall_rules` f, `cloud`.`networks` n, `cloud`.`network_offerings`" + + " off where f.purpose='LB' and f.network_id=n.id and n.network_offering_id=off.id and off.id=?"); pstmt.setLong(1, ntwkOffId); rs1 = pstmt.executeQuery(); if (rs1.next()) { @@ -128,8 +131,9 @@ public class Upgrade301to302 implements DbUpgrade { s_logger.debug("Deleted lb service for network offering id=" + ntwkOffId + " as it doesn't have source nat service enabled"); //delete lb service for the network - pstmt = conn.prepareStatement("SELECT map.id, n.id FROM `cloud`.`ntwk_service_map` map, networks n WHERE n.network_offering_id=? " - + "AND map.network_id=n.id AND map.service='Lb'"); + pstmt = + conn.prepareStatement("SELECT map.id, n.id FROM `cloud`.`ntwk_service_map` map, networks n WHERE n.network_offering_id=? " + + "AND map.network_id=n.id AND map.service='Lb'"); pstmt.setLong(1, ntwkOffId); rs1 = pstmt.executeQuery(); while (rs1.next()) { @@ -175,7 +179,8 @@ public class Upgrade301to302 implements DbUpgrade { DbUpgradeUtils.dropKeysIfExist(conn, "cloud.vm_instance", keys, false); PreparedStatement pstmt = null; try { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__last_host_id` FOREIGN KEY (`last_host_id`) REFERENCES `host` (`id`)"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__last_host_id` FOREIGN KEY (`last_host_id`) REFERENCES `host` (`id`)"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java index ebe2f99932e..7cc8bc74c91 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to303.java @@ -29,6 +29,7 @@ import java.sql.SQLException; import java.util.UUID; import org.apache.log4j.Logger; + // import com.cloud.dc.DataCenter.NetworkType; import com.cloud.utils.crypt.DBEncryptionUtil; @@ -90,8 +91,9 @@ public class Upgrade302to303 implements DbUpgrade { pNetworksResults = pNetworkStmt.executeQuery(); while (pNetworksResults.next()) { long physicalNetworkId = pNetworksResults.getLong(1); - PreparedStatement fetchF5NspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'F5BigIp'"); + PreparedStatement fetchF5NspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'F5BigIp'"); ResultSet rsF5NSP = fetchF5NspStmt.executeQuery(); boolean hasF5Nsp = rsF5NSP.next(); fetchF5NspStmt.close(); @@ -110,8 +112,9 @@ public class Upgrade302to303 implements DbUpgrade { } } - PreparedStatement fetchSRXNspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'JuniperSRX'"); + PreparedStatement fetchSRXNspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'JuniperSRX'"); ResultSet rsSRXNSP = fetchSRXNspStmt.executeQuery(); boolean hasSrxNsp = rsSRXNSP.next(); fetchSRXNspStmt.close(); @@ -154,8 +157,9 @@ public class Upgrade302to303 implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding F5 Big IP load balancer with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertF5 = "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, is_inline, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertF5 = + "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, is_inline, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertF5); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -185,8 +189,9 @@ public class Upgrade302to303 implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding SRX firewall device with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertSrx = "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertSrx = + "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertSrx); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -215,10 +220,11 @@ public class Upgrade302to303 implements DbUpgrade { try { // add physical network service provider - F5BigIp s_logger.debug("Adding PhysicalNetworkServiceProvider F5BigIp" + " in to physical network" + physicalNetworkId); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -243,10 +249,11 @@ public class Upgrade302to303 implements DbUpgrade { try { // add physical network service provider - JuniperSRX s_logger.debug("Adding PhysicalNetworkServiceProvider JuniperSRX"); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -272,7 +279,8 @@ public class Upgrade302to303 implements DbUpgrade { PreparedStatement pstmt = null; ResultSet rs = null; try { - pstmt = conn.prepareStatement("select name, value from `cloud`.`configuration` where name in ('router.ram.size', 'secondary.storage.vm', 'security.hash.key') and category <> 'Hidden'"); + pstmt = + conn.prepareStatement("select name, value from `cloud`.`configuration` where name in ('router.ram.size', 'secondary.storage.vm', 'security.hash.key') and category <> 'Hidden'"); rs = pstmt.executeQuery(); while (rs.next()) { String name = rs.getString(1); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java index 6f292a036f8..ec75be33477 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java @@ -29,10 +29,10 @@ import java.util.UUID; import org.apache.log4j.Logger; +import com.cloud.dc.DataCenter.NetworkType; import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; -import com.cloud.dc.DataCenter.NetworkType; public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { final static Logger s_logger = Logger.getLogger(Upgrade302to40.class); @@ -111,7 +111,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { //mismatch, correct the nsp_id in VR PreparedStatement pstmt1 = null; ResultSet rs1 = null; - pstmt1 = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` where physical_network_id = ? AND provider_name = ? AND removed IS NULL"); + pstmt1 = + conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` where physical_network_id = ? AND provider_name = ? AND removed IS NULL"); pstmt1.setLong(1, physicalNetworkId); pstmt1.setString(2, "VirtualRouter"); rs1 = pstmt1.executeQuery(); @@ -209,7 +210,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { //check if any networks were untagged and remaining to be mapped to a physical network - pstmt = conn.prepareStatement("SELECT count(n.id) FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); + pstmt = + conn.prepareStatement("SELECT count(n.id) FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); if (rs.next()) { @@ -222,7 +224,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { //make sure that no physical network with this traffic label already exists. if yes, error out. if (xenGuestLabel != null) { - PreparedStatement pstmt5 = conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' AND pn.data_center_id = ? AND pntt.xen_network_label = ?"); + PreparedStatement pstmt5 = + conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' AND pn.data_center_id = ? AND pntt.xen_network_label = ?"); pstmt5.setLong(1, zoneId); pstmt5.setString(2, xenGuestLabel); ResultSet rsSameLabel = pstmt5.executeQuery(); @@ -231,10 +234,10 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { Long sameLabelcount = rsSameLabel.getLong(1); if (sameLabelcount > 0) { s_logger.error("There are untagged networks for which we need to add a physical network with Xen traffic label = 'xen.guest.network.device' config value, which is: " + - xenGuestLabel); + xenGuestLabel); s_logger.error("However already there are " + sameLabelcount + " physical networks setup with same traffic label, cannot upgrade"); throw new CloudRuntimeException("Cannot upgrade this setup since a physical network with same traffic label: " + xenGuestLabel + - " already exists, Please check logs and contact Support."); + " already exists, Please check logs and contact Support."); } } } @@ -245,7 +248,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { addDefaultVRProvider(conn, physicalNetworkId, zoneId); addDefaultSGProvider(conn, physicalNetworkId, zoneId, networkType, true); - PreparedStatement pstmt3 = conn.prepareStatement("SELECT n.id FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); + PreparedStatement pstmt3 = + conn.prepareStatement("SELECT n.id FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); pstmt3.setLong(1, zoneId); ResultSet rsNet = pstmt3.executeQuery(); s_logger.debug("Adding PhysicalNetwork to VLAN"); @@ -264,7 +268,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { boolean multiplePhysicalNetworks = false; - pstmt = conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' and pn.data_center_id = ?"); + pstmt = + conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' and pn.data_center_id = ?"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); if (rs.next()) { @@ -280,7 +285,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { if (multiplePhysicalNetworks) { //check if guest vnet is wrongly configured by earlier upgrade. If yes error out //check if any vnet is allocated and guest networks are using vnet But the physical network id does not match on the vnet and guest network. - PreparedStatement pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id, v.physical_network_id as vpid, n.id, n.physical_network_id as npid 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 AND v.physical_network_id != n.physical_network_id"); + PreparedStatement pstmt4 = + conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id, v.physical_network_id as vpid, n.id, n.physical_network_id as npid 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 AND v.physical_network_id != n.physical_network_id"); pstmt4.setLong(1, zoneId); ResultSet rsVNet = pstmt4.executeQuery(); if (rsVNet.next()) { @@ -288,22 +294,23 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { String networkId = rsVNet.getString(5); String vpid = rsVNet.getString(4); String npid = rsVNet.getString(6); - 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); + 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 = \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 = \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( @@ -314,7 +321,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { pstmt4.close(); //Clean up any vnets that have no live networks/nics - pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); + pstmt4 = + conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); pstmt4.setLong(1, zoneId); rsVNet = pstmt4.executeQuery(); while (rsVNet.next()) { @@ -330,7 +338,7 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { Long instance_id = rsNic.getLong(2); if (rsNic.next()) { throw new CloudRuntimeException("Cannot upgrade. Please cleanup the guest vnet: " + vnetValue + " , it is being used by nic_id: " + nic_id + - " , instance_id: " + instance_id); + " , instance_id: " + instance_id); } //free this vnet @@ -345,7 +353,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { //add tags to the physical networks if not present and clone offerings - pstmt = conn.prepareStatement("SELECT pn.id as pid , ptag.tag as tag FROM `cloud`.`physical_network` pn LEFT JOIN `cloud`.`physical_network_tags` ptag ON pn.id = ptag.physical_network_id where pn.data_center_id = ?"); + pstmt = + conn.prepareStatement("SELECT pn.id as pid , ptag.tag as tag FROM `cloud`.`physical_network` pn LEFT JOIN `cloud`.`physical_network_tags` ptag ON pn.id = ptag.physical_network_id where pn.data_center_id = ?"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); while (rs.next()) { @@ -367,7 +376,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt2 = null; ResultSet rs2 = null; - pstmt2 = conn.prepareStatement("SELECT distinct network_offering_id FROM `cloud`.`networks` where traffic_type= 'Guest' and physical_network_id = ? and removed is null"); + pstmt2 = + conn.prepareStatement("SELECT distinct network_offering_id FROM `cloud`.`networks` where traffic_type= 'Guest' and physical_network_id = ? and removed is null"); pstmt2.setLong(1, physicalNetworkId); rs2 = pstmt2.executeQuery(); @@ -478,7 +488,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { while (rs.next()) { String service = rs.getString(1); String provider = rs.getString(2); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`, `service`, `provider`, `created`) values (?,?,?, now())"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`, `service`, `provider`, `created`) values (?,?,?, now())"); pstmt.setLong(1, newNetworkOfferingId); pstmt.setString(2, service); pstmt.setString(3, provider); @@ -487,8 +498,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("UPDATE `cloud`.`networks` SET network_offering_id=? where physical_network_id=? and traffic_type ='Guest' and network_offering_id=" + - networkOfferingId); + pstmt = + conn.prepareStatement("UPDATE `cloud`.`networks` SET network_offering_id=? where physical_network_id=? and traffic_type ='Guest' and network_offering_id=" + + networkOfferingId); pstmt.setLong(1, newNetworkOfferingId); pstmt.setLong(2, physicalNetworkId); pstmt.executeUpdate(); @@ -524,7 +536,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { s_logger.debug("Unique key already exists on host_details - not adding new one"); } else { //add the key - PreparedStatement pstmtUpdate = conn.prepareStatement("ALTER IGNORE TABLE `cloud`.`host_details` ADD CONSTRAINT UNIQUE KEY `uk_host_id_name` (`host_id`, `name`)"); + PreparedStatement pstmtUpdate = + conn.prepareStatement("ALTER IGNORE TABLE `cloud`.`host_details` ADD CONSTRAINT UNIQUE KEY `uk_host_id_name` (`host_id`, `name`)"); pstmtUpdate.executeUpdate(); s_logger.debug("Unique key did not exist on host_details - added new one"); pstmtUpdate.close(); @@ -557,18 +570,21 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { Long pNtwkId = rs.getLong(1); //insert provider - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " - + "(`physical_network_id`, `provider_name`, `state`, `vpn_service_provided`, `dhcp_service_provided`, " - + "`dns_service_provided`, `gateway_service_provided`, `firewall_service_provided`, `source_nat_service_provided`," - + " `load_balance_service_provided`, `static_nat_service_provided`, `port_forwarding_service_provided`," - + " `user_data_service_provided`, `security_group_service_provided`) " - + "VALUES (?, 'VpcVirtualRouter', 'Enabled', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " + + "(`physical_network_id`, `provider_name`, `state`, `vpn_service_provided`, `dhcp_service_provided`, " + + "`dns_service_provided`, `gateway_service_provided`, `firewall_service_provided`, `source_nat_service_provided`," + + " `load_balance_service_provided`, `static_nat_service_provided`, `port_forwarding_service_provided`," + + " `user_data_service_provided`, `security_group_service_provided`) " + + "VALUES (?, 'VpcVirtualRouter', 'Enabled', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)"); pstmt.setLong(1, pNtwkId); pstmt.executeUpdate(); //get provider id - pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` " + "WHERE physical_network_id=? and provider_name='VpcVirtualRouter'"); + pstmt = + conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` " + + "WHERE physical_network_id=? and provider_name='VpcVirtualRouter'"); pstmt.setLong(1, pNtwkId); ResultSet rs1 = pstmt.executeQuery(); rs1.next(); @@ -665,9 +681,10 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { //insert the keys anew try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD " - + "CONSTRAINT `fk_ssh_keypair__account_id` FOREIGN KEY `fk_ssh_keypair__account_id` (`account_id`)" - + " REFERENCES `account` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD " + + "CONSTRAINT `fk_ssh_keypair__account_id` FOREIGN KEY `fk_ssh_keypair__account_id` (`account_id`)" + + " REFERENCES `account` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -676,8 +693,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT" - + " `fk_ssh_keypair__domain_id` FOREIGN KEY `fk_ssh_keypair__domain_id` (`domain_id`) " + "REFERENCES `domain` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT" + + " `fk_ssh_keypair__domain_id` FOREIGN KEY `fk_ssh_keypair__domain_id` (`domain_id`) " + "REFERENCES `domain` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -706,8 +724,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { pNetworksResults = pNetworkStmt.executeQuery(); while (pNetworksResults.next()) { long physicalNetworkId = pNetworksResults.getLong(1); - PreparedStatement fetchF5NspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'F5BigIp'"); + PreparedStatement fetchF5NspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'F5BigIp'"); ResultSet rsF5NSP = fetchF5NspStmt.executeQuery(); boolean hasF5Nsp = rsF5NSP.next(); fetchF5NspStmt.close(); @@ -726,8 +745,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { } } - PreparedStatement fetchSRXNspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'JuniperSRX'"); + PreparedStatement fetchSRXNspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'JuniperSRX'"); ResultSet rsSRXNSP = fetchSRXNspStmt.executeQuery(); boolean hasSrxNsp = rsSRXNSP.next(); fetchSRXNspStmt.close(); @@ -770,8 +790,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding F5 Big IP load balancer with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertF5 = "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, is_inline, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertF5 = + "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, is_inline, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertF5); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -801,8 +822,9 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding SRX firewall device with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertSrx = "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertSrx = + "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertSrx); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -831,10 +853,11 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { try { // add physical network service provider - F5BigIp s_logger.debug("Adding PhysicalNetworkServiceProvider F5BigIp" + " in to physical network" + physicalNetworkId); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -859,10 +882,11 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { try { // add physical network service provider - JuniperSRX s_logger.debug("Adding PhysicalNetworkServiceProvider JuniperSRX"); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -898,7 +922,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { long srxDevivceId, srxHostId; try { - pstmt = conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); + pstmt = + conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); rs = pstmt.executeQuery(); while (rs.next()) { zoneIds.add(rs.getLong(1)); @@ -941,7 +966,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { if (rs.first()) { f5DeviceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + " found in external_load_balancer_device"); + throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + + " found in external_load_balancer_device"); } // find the SRX device id in the zone @@ -959,11 +985,13 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { if (rs.first()) { srxDevivceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + " found in external_firewall_devices"); + throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + + " found in external_firewall_devices"); } // check if network any uses F5 or SRX devices in the zone - pstmt = conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); + pstmt = + conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); pstmt.setLong(1, zoneId); pstmt.setLong(2, networkOfferingId); rs = pstmt.executeQuery(); @@ -972,7 +1000,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { networkId = rs.getLong(1); // add mapping for the network in network_external_lb_device_map - String insertLbMapping = "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertLbMapping = + "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertLbMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -981,7 +1010,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { s_logger.debug("Successfully added entry in network_external_lb_device_map for network " + networkId + " and F5 device ID " + f5DeviceId); // add mapping for the network in network_external_firewall_device_map - String insertFwMapping = "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertFwMapping = + "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertFwMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -1000,7 +1030,7 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { long hostId = rs.getLong(1); String camlCaseName = rs.getString(2); if (!(camlCaseName.equalsIgnoreCase("numRetries") || camlCaseName.equalsIgnoreCase("publicZone") || camlCaseName.equalsIgnoreCase("privateZone") || - camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { + camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { continue; } String lowerCaseName = camlCaseName.toLowerCase(); @@ -1034,7 +1064,8 @@ public class Upgrade302to40 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt = null; ResultSet rs = null; try { - pstmt = conn.prepareStatement("select name, value from `cloud`.`configuration` where name in ('router.ram.size', 'secondary.storage.vm', 'security.hash.key') and category <> 'Hidden'"); + pstmt = + conn.prepareStatement("select name, value from `cloud`.`configuration` where name in ('router.ram.size', 'secondary.storage.vm', 'security.hash.key') and category <> 'Hidden'"); rs = pstmt.executeQuery(); while (rs.next()) { String name = rs.getString(1); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java index 93877b809cf..1e9c652a9df 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade303to304.java @@ -82,7 +82,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { //mismatch, correct the nsp_id in VR PreparedStatement pstmt1 = null; ResultSet rs1 = null; - pstmt1 = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` where physical_network_id = ? AND provider_name = ? AND removed IS NULL"); + pstmt1 = + conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` where physical_network_id = ? AND provider_name = ? AND removed IS NULL"); pstmt1.setLong(1, physicalNetworkId); pstmt1.setString(2, "VirtualRouter"); rs1 = pstmt1.executeQuery(); @@ -180,7 +181,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { //check if any networks were untagged and remaining to be mapped to a physical network - pstmt = conn.prepareStatement("SELECT count(n.id) FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); + pstmt = + conn.prepareStatement("SELECT count(n.id) FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); if (rs.next()) { @@ -193,7 +195,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { //make sure that no physical network with this traffic label already exists. if yes, error out. if (xenGuestLabel != null) { - PreparedStatement pstmt5 = conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' AND pn.data_center_id = ? AND pntt.xen_network_label = ?"); + PreparedStatement pstmt5 = + conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' AND pn.data_center_id = ? AND pntt.xen_network_label = ?"); pstmt5.setLong(1, zoneId); pstmt5.setString(2, xenGuestLabel); ResultSet rsSameLabel = pstmt5.executeQuery(); @@ -202,10 +205,10 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { Long sameLabelcount = rsSameLabel.getLong(1); if (sameLabelcount > 0) { s_logger.error("There are untagged networks for which we need to add a physical network with Xen traffic label = 'xen.guest.network.device' config value, which is: " + - xenGuestLabel); + xenGuestLabel); s_logger.error("However already there are " + sameLabelcount + " physical networks setup with same traffic label, cannot upgrade"); throw new CloudRuntimeException("Cannot upgrade this setup since a physical network with same traffic label: " + xenGuestLabel + - " already exists, Please check logs and contact Support."); + " already exists, Please check logs and contact Support."); } } } @@ -216,7 +219,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { addDefaultVRProvider(conn, physicalNetworkId, zoneId); addDefaultSGProvider(conn, physicalNetworkId, zoneId, networkType, true); - PreparedStatement pstmt3 = conn.prepareStatement("SELECT n.id FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); + PreparedStatement pstmt3 = + conn.prepareStatement("SELECT n.id FROM networks n WHERE n.physical_network_id IS NULL AND n.traffic_type = 'Guest' and n.data_center_id = ? and n.removed is null"); pstmt3.setLong(1, zoneId); ResultSet rsNet = pstmt3.executeQuery(); s_logger.debug("Adding PhysicalNetwork to VLAN"); @@ -235,7 +239,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { boolean multiplePhysicalNetworks = false; - pstmt = conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' and pn.data_center_id = ?"); + pstmt = + conn.prepareStatement("SELECT count(*) FROM `cloud`.`physical_network_traffic_types` pntt JOIN `cloud`.`physical_network` pn ON pntt.physical_network_id = pn.id WHERE pntt.traffic_type ='Guest' and pn.data_center_id = ?"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); if (rs.next()) { @@ -251,7 +256,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { if (multiplePhysicalNetworks) { //check if guest vnet is wrongly configured by earlier upgrade. If yes error out //check if any vnet is allocated and guest networks are using vnet But the physical network id does not match on the vnet and guest network. - PreparedStatement pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id, v.physical_network_id as vpid, n.id, n.physical_network_id as npid 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 AND v.physical_network_id != n.physical_network_id"); + PreparedStatement pstmt4 = + conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id, v.physical_network_id as vpid, n.id, n.physical_network_id as npid 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 AND v.physical_network_id != n.physical_network_id"); pstmt4.setLong(1, zoneId); ResultSet rsVNet = pstmt4.executeQuery(); if (rsVNet.next()) { @@ -259,22 +265,23 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { String networkId = rsVNet.getString(5); String vpid = rsVNet.getString(4); String npid = rsVNet.getString(6); - 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); + 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 = \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 = \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( @@ -285,7 +292,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { pstmt4.close(); //Clean up any vnets that have no live networks/nics - pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); + pstmt4 = + conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL"); pstmt4.setLong(1, zoneId); rsVNet = pstmt4.executeQuery(); while (rsVNet.next()) { @@ -301,7 +309,7 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { Long instance_id = rsNic.getLong(2); if (rsNic.next()) { throw new CloudRuntimeException("Cannot upgrade. Please cleanup the guest vnet: " + vnetValue + " , it is being used by nic_id: " + nic_id + - " , instance_id: " + instance_id); + " , instance_id: " + instance_id); } //free this vnet @@ -316,7 +324,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { //add tags to the physical networks if not present and clone offerings - pstmt = conn.prepareStatement("SELECT pn.id as pid , ptag.tag as tag FROM `cloud`.`physical_network` pn LEFT JOIN `cloud`.`physical_network_tags` ptag ON pn.id = ptag.physical_network_id where pn.data_center_id = ?"); + pstmt = + conn.prepareStatement("SELECT pn.id as pid , ptag.tag as tag FROM `cloud`.`physical_network` pn LEFT JOIN `cloud`.`physical_network_tags` ptag ON pn.id = ptag.physical_network_id where pn.data_center_id = ?"); pstmt.setLong(1, zoneId); rs = pstmt.executeQuery(); while (rs.next()) { @@ -338,7 +347,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { PreparedStatement pstmt2 = null; ResultSet rs2 = null; - pstmt2 = conn.prepareStatement("SELECT distinct network_offering_id FROM `cloud`.`networks` where traffic_type= 'Guest' and physical_network_id = ? and removed is null"); + pstmt2 = + conn.prepareStatement("SELECT distinct network_offering_id FROM `cloud`.`networks` where traffic_type= 'Guest' and physical_network_id = ? and removed is null"); pstmt2.setLong(1, physicalNetworkId); rs2 = pstmt2.executeQuery(); @@ -449,7 +459,8 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { while (rs.next()) { String service = rs.getString(1); String provider = rs.getString(2); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`, `service`, `provider`, `created`) values (?,?,?, now())"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` (`network_offering_id`, `service`, `provider`, `created`) values (?,?,?, now())"); pstmt.setLong(1, newNetworkOfferingId); pstmt.setString(2, service); pstmt.setString(3, provider); @@ -458,8 +469,9 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { rs.close(); pstmt.close(); - pstmt = conn.prepareStatement("UPDATE `cloud`.`networks` SET network_offering_id=? where physical_network_id=? and traffic_type ='Guest' and network_offering_id=" + - networkOfferingId); + pstmt = + conn.prepareStatement("UPDATE `cloud`.`networks` SET network_offering_id=? where physical_network_id=? and traffic_type ='Guest' and network_offering_id=" + + networkOfferingId); pstmt.setLong(1, newNetworkOfferingId); pstmt.setLong(2, physicalNetworkId); pstmt.executeUpdate(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java index 2d79f036659..2472716d3fa 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import com.cloud.utils.crypt.DBEncryptionUtil; import org.apache.log4j.Logger; +import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; @@ -142,18 +142,21 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { Long pNtwkId = rs.getLong(1); //insert provider - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " - + "(`physical_network_id`, `provider_name`, `state`, `vpn_service_provided`, `dhcp_service_provided`, " - + "`dns_service_provided`, `gateway_service_provided`, `firewall_service_provided`, `source_nat_service_provided`," - + " `load_balance_service_provided`, `static_nat_service_provided`, `port_forwarding_service_provided`," - + " `user_data_service_provided`, `security_group_service_provided`) " - + "VALUES (?, 'VpcVirtualRouter', 'Enabled', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " + + "(`physical_network_id`, `provider_name`, `state`, `vpn_service_provided`, `dhcp_service_provided`, " + + "`dns_service_provided`, `gateway_service_provided`, `firewall_service_provided`, `source_nat_service_provided`," + + " `load_balance_service_provided`, `static_nat_service_provided`, `port_forwarding_service_provided`," + + " `user_data_service_provided`, `security_group_service_provided`) " + + "VALUES (?, 'VpcVirtualRouter', 'Enabled', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)"); pstmt.setLong(1, pNtwkId); pstmt.executeUpdate(); //get provider id - pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` " + "WHERE physical_network_id=? and provider_name='VpcVirtualRouter'"); + pstmt = + conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers` " + + "WHERE physical_network_id=? and provider_name='VpcVirtualRouter'"); pstmt.setLong(1, pNtwkId); ResultSet rs1 = pstmt.executeQuery(); rs1.next(); @@ -242,7 +245,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { s_logger.debug("Unique key already exists on host_details - not adding new one"); } else { //add the key - PreparedStatement pstmtUpdate = conn.prepareStatement("ALTER IGNORE TABLE `cloud`.`host_details` ADD CONSTRAINT UNIQUE KEY `uk_host_id_name` (`host_id`, `name`)"); + PreparedStatement pstmtUpdate = + conn.prepareStatement("ALTER IGNORE TABLE `cloud`.`host_details` ADD CONSTRAINT UNIQUE KEY `uk_host_id_name` (`host_id`, `name`)"); pstmtUpdate.executeUpdate(); s_logger.debug("Unique key did not exist on host_details - added new one"); pstmtUpdate.close(); @@ -281,7 +285,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { long srxDevivceId, srxHostId; try { - pstmt = conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); + pstmt = + conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); rs = pstmt.executeQuery(); while (rs.next()) { zoneIds.add(rs.getLong(1)); @@ -324,7 +329,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { if (rs.first()) { f5DeviceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + " found in external_load_balancer_device"); + throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + + " found in external_load_balancer_device"); } // find the SRX device id in the zone @@ -342,11 +348,13 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { if (rs.first()) { srxDevivceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + " found in external_firewall_devices"); + throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + + " found in external_firewall_devices"); } // check if network any uses F5 or SRX devices in the zone - pstmt = conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); + pstmt = + conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); pstmt.setLong(1, zoneId); pstmt.setLong(2, networkOfferingId); rs = pstmt.executeQuery(); @@ -355,7 +363,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { networkId = rs.getLong(1); // add mapping for the network in network_external_lb_device_map - String insertLbMapping = "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertLbMapping = + "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertLbMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -364,7 +373,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { s_logger.debug("Successfully added entry in network_external_lb_device_map for network " + networkId + " and F5 device ID " + f5DeviceId); // add mapping for the network in network_external_firewall_device_map - String insertFwMapping = "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertFwMapping = + "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertFwMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -383,7 +393,7 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { long hostId = rs.getLong(1); String camlCaseName = rs.getString(2); if (!(camlCaseName.equalsIgnoreCase("numRetries") || camlCaseName.equalsIgnoreCase("publicZone") || camlCaseName.equalsIgnoreCase("privateZone") || - camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { + camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { continue; } String lowerCaseName = camlCaseName.toLowerCase(); @@ -431,9 +441,10 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { //insert the keys anew try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD " - + "CONSTRAINT `fk_ssh_keypairs__account_id` FOREIGN KEY `fk_ssh_keypairs__account_id` (`account_id`)" - + " REFERENCES `account` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD " + + "CONSTRAINT `fk_ssh_keypairs__account_id` FOREIGN KEY `fk_ssh_keypairs__account_id` (`account_id`)" + + " REFERENCES `account` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { @@ -442,9 +453,9 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade { try { PreparedStatement pstmt; - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT" - + " `fk_ssh_keypairs__domain_id` FOREIGN KEY `fk_ssh_keypairs__domain_id` (`domain_id`) " - + "REFERENCES `domain` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT" + + " `fk_ssh_keypairs__domain_id` FOREIGN KEY `fk_ssh_keypairs__domain_id` (`domain_id`) " + "REFERENCES `domain` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); } catch (SQLException e) { diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java index 9d597067d60..9eb4fc46aab 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade305to306.java @@ -168,7 +168,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade { ResultSet rsNw = null; try { // update the existing ingress rules traffic type - pstmt = conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null"); + pstmt = + conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null"); s_logger.debug("Updating firewall Ingress rule traffic type: " + pstmt); pstmt.executeUpdate(); @@ -178,7 +179,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade { long netId = rs.getLong(1); //When upgraded from 2.2.14 to 3.0.6 guest_type is updated to Isolated in the 2214to30 clean up sql. clean up executes //after this. So checking for Isolated OR Virtual - pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? "); + pstmt = + conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? "); pstmt.setLong(1, netId); s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt); rsNw = pstmt.executeQuery(); @@ -189,7 +191,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade { //Add new rule for the existing networks s_logger.debug("Adding default egress firewall rule for network " + netId); - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); pstmt.setString(1, UUID.randomUUID().toString()); pstmt.setLong(2, accountId); pstmt.setLong(3, domainId); @@ -262,7 +265,8 @@ public class Upgrade305to306 extends Upgrade30xBase implements DbUpgrade { ResultSet rs = null; s_logger.debug("Updating KVM snapshots"); try { - pstmt = conn.prepareStatement("select id, backup_snap_id from `cloud`.`snapshots` where hypervisor_type='KVM' and removed is null and backup_snap_id is not null"); + pstmt = + conn.prepareStatement("select id, backup_snap_id from `cloud`.`snapshots` where hypervisor_type='KVM' and removed is null and backup_snap_id is not null"); rs = pstmt.executeQuery(); while (rs.next()) { long id = rs.getLong(1); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java index ae820a4b2d0..65712d0841b 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30to301.java @@ -81,8 +81,9 @@ public class Upgrade30to301 implements DbUpgrade { accountId = rs.getLong(1); //get networks count for the account - pstmt = conn.prepareStatement("select count(*) from `cloud`.`networks` n, `cloud`.`account_network_ref` a, `cloud`.`network_offerings` no" - + " WHERE n.acl_type='Account' and n.id=a.network_id and a.account_id=? and a.is_owner=1 and no.specify_vlan=false and no.traffic_type='Guest'"); + pstmt = + conn.prepareStatement("select count(*) from `cloud`.`networks` n, `cloud`.`account_network_ref` a, `cloud`.`network_offerings` no" + + " WHERE n.acl_type='Account' and n.id=a.network_id and a.account_id=? and a.is_owner=1 and no.specify_vlan=false and no.traffic_type='Guest'"); pstmt.setLong(1, accountId); rs1 = pstmt.executeQuery(); long count = 0; diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java index b9d924bb6ce..4a418573ea0 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java @@ -137,7 +137,8 @@ public abstract class Upgrade30xBase implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding PhysicalNetwork traffic types"); - String insertTraficType = "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, kvm_network_label, vmware_network_label, uuid) VALUES ( ?, ?, ?, ?, ?, ?)"; + String insertTraficType = + "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, kvm_network_label, vmware_network_label, uuid) VALUES ( ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertTraficType); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setString(2, trafficType); @@ -167,7 +168,8 @@ public abstract class Upgrade30xBase implements DbUpgrade { String selectSG = ""; if (is304) { - selectSG = "SELECT nm.* FROM `cloud`.`ntwk_service_map` nm JOIN `cloud`.`networks` n ON nm.network_id = n.id where n.data_center_id = ? and nm.service='SecurityGroup'"; + selectSG = + "SELECT nm.* FROM `cloud`.`ntwk_service_map` nm JOIN `cloud`.`networks` n ON nm.network_id = n.id where n.data_center_id = ? and nm.service='SecurityGroup'"; } else { selectSG = "SELECT * from `cloud`.`networks` where is_security_group_enabled=1 and data_center_id=?"; } @@ -183,10 +185,11 @@ public abstract class Upgrade30xBase implements DbUpgrade { if (isSGServiceEnabled) { s_logger.debug("Adding PhysicalNetworkServiceProvider SecurityGroupProvider to the physical network id=" + physicalNetworkId); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,0,0,0,0,1)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,0,0,0,0,1)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, physicalNetworkId); @@ -220,10 +223,11 @@ public abstract class Upgrade30xBase implements DbUpgrade { try { // add physical network service provider - VirtualRouter s_logger.debug("Adding PhysicalNetworkServiceProvider VirtualRouter"); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,1,1,1,1,1,1,1,1,1,1,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,1,1,1,1,1,1,1,1,1,1,0)"; String routerUUID = UUID.randomUUID().toString(); pstmtUpdate = conn.prepareStatement(insertPNSP); @@ -235,8 +239,9 @@ public abstract class Upgrade30xBase implements DbUpgrade { pstmtUpdate.close(); // add virtual_router_element - String fetchNSPid = "SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + - " AND provider_name = 'VirtualRouter' AND uuid = ?"; + String fetchNSPid = + "SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " AND provider_name = 'VirtualRouter' AND uuid = ?"; pstmt2 = conn.prepareStatement(fetchNSPid); pstmt2.setString(1, routerUUID); ResultSet rsNSPid = pstmt2.executeQuery(); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java index 31d4bfba5e3..38c46c646df 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade40to41.java @@ -17,20 +17,7 @@ package com.cloud.upgrade.dao; -import com.cloud.utils.PropertiesUtil; -import com.cloud.utils.crypt.EncryptionSecretKeyChecker; -import com.cloud.utils.db.DbProperties; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; - -import org.apache.log4j.Logger; -import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; -import org.jasypt.properties.EncryptableProperties; - import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -38,6 +25,12 @@ import java.sql.SQLException; import java.util.Properties; import java.util.UUID; +import org.apache.log4j.Logger; + +import com.cloud.utils.db.DbProperties; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; + public class Upgrade40to41 implements DbUpgrade { final static Logger s_logger = Logger.getLogger(Upgrade40to41.class); @@ -116,7 +109,8 @@ public class Upgrade40to41 implements DbUpgrade { ResultSet rsNw = null; try { // update the existing ingress rules traffic type - pstmt = conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null"); + pstmt = + conn.prepareStatement("update `cloud`.`firewall_rules` set traffic_type='Ingress' where purpose='Firewall' and ip_address_id is not null and traffic_type is null"); s_logger.debug("Updating firewall Ingress rule traffic type: " + pstmt); pstmt.executeUpdate(); @@ -126,7 +120,8 @@ public class Upgrade40to41 implements DbUpgrade { long netId = rs.getLong(1); //When upgraded from 2.2.14 to 3.0.6 guest_type is updated to Isolated in the 2214to30 clean up sql. clean up executes //after this. So checking for Isolated OR Virtual - pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? "); + pstmt = + conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? "); pstmt.setLong(1, netId); s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt); rsNw = pstmt.executeQuery(); @@ -137,7 +132,8 @@ public class Upgrade40to41 implements DbUpgrade { //Add new rule for the existing networks s_logger.debug("Adding default egress firewall rule for network " + netId); - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); pstmt.setString(1, UUID.randomUUID().toString()); pstmt.setLong(2, accountId); pstmt.setLong(3, domainId); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index 811f49cc0d0..57b24838ecb 100755 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -42,8 +42,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import com.cloud.deploy.DeploymentPlanner; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.vpc.NetworkACL; -import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.Pair; +import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; @@ -134,9 +134,11 @@ public class Upgrade410to420 implements DbUpgrade { numRows = rs.getInt(1); } if (numRows > 0) { - update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full clones on ESX hypervisor');"); + update = + conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full clones on ESX hypervisor');"); } else { - update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'true', 'If set to true, creates VMs as full clones on ESX hypervisor');"); + update = + conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'true', 'If set to true, creates VMs as full clones on ESX hypervisor');"); } update.executeUpdate(); } catch (SQLException e) { @@ -293,7 +295,8 @@ public class Upgrade410to420 implements DbUpgrade { ResultSet rs = null; PreparedStatement pstmt = null; try { - pstmt = conn.prepareStatement("select value from `cloud`.`configuration` where category='" + category + "' and value is not NULL and name = '" + paramName + "';"); + pstmt = + conn.prepareStatement("select value from `cloud`.`configuration` where category='" + category + "' and value is not NULL and name = '" + paramName + "';"); rs = pstmt.executeQuery(); while (rs.next()) { return rs.getString("value"); @@ -353,7 +356,8 @@ public class Upgrade410to420 implements DbUpgrade { // 'ExplicitDedication' PreparedStatement pstmt2 = null; ResultSet rs2 = null; - pstmt2 = conn.prepareStatement("SELECT affinity_group.id FROM `cloud`.`affinity_group` INNER JOIN `cloud`.`affinity_group_domain_map` ON affinity_group.id=affinity_group_domain_map.affinity_group_id WHERE affinity_group.type = 'ExplicitDedication' AND affinity_group.acl_type = 'Domain' AND (affinity_group_domain_map.domain_id = ?)"); + pstmt2 = + conn.prepareStatement("SELECT affinity_group.id FROM `cloud`.`affinity_group` INNER JOIN `cloud`.`affinity_group_domain_map` ON affinity_group.id=affinity_group_domain_map.affinity_group_id WHERE affinity_group.type = 'ExplicitDedication' AND affinity_group.acl_type = 'Domain' AND (affinity_group_domain_map.domain_id = ?)"); pstmt2.setLong(1, domainId); rs2 = pstmt2.executeQuery(); if (rs2.next()) { @@ -379,7 +383,8 @@ public class Upgrade410to420 implements DbUpgrade { String groupName = "DedicatedGrp-domain-" + domainName; s_logger.debug("Adding AffinityGroup of type " + type + " for domain id " + domainId); - String sql = "INSERT INTO `cloud`.`affinity_group` (`name`, `type`, `uuid`, `description`, `domain_id`, `account_id`, `acl_type`) VALUES (?, ?, ?, ?, 1, 1, 'Domain')"; + String sql = + "INSERT INTO `cloud`.`affinity_group` (`name`, `type`, `uuid`, `description`, `domain_id`, `account_id`, `acl_type`) VALUES (?, ?, ?, ?, 1, 1, 'Domain')"; pstmtUpdate = conn.prepareStatement(sql); pstmtUpdate.setString(1, groupName); pstmtUpdate.setString(2, type); @@ -494,14 +499,17 @@ public class Upgrade410to420 implements DbUpgrade { PreparedStatement pstmt = null; try { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); pstmt.close(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); s_logger.debug("Added foreign keys for table baremetal_dhcp_devices"); @@ -510,13 +518,16 @@ public class Upgrade410to420 implements DbUpgrade { } try { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); pstmt.close(); s_logger.debug("Added foreign keys for table baremetal_pxe_devices"); @@ -586,7 +597,8 @@ public class Upgrade410to420 implements DbUpgrade { pstmt2.setString(1, "VOLUME"); rs2 = pstmt2.executeQuery(); - pstmt3 = conn.prepareStatement("INSERT IGNORE INTO volume_store_ref (volume_id, store_id, zone_id, created, state, download_url, download_url_created, install_path) VALUES (?,?,?,?,?,?,?,?)"); + pstmt3 = + conn.prepareStatement("INSERT IGNORE INTO volume_store_ref (volume_id, store_id, zone_id, created, state, download_url, download_url_created, install_path) VALUES (?,?,?,?,?,?,?,?)"); //insert into template_store_ref while (rs2.next()) { pstmt3.setLong(1, rs2.getLong("type_id")); @@ -708,7 +720,8 @@ public class Upgrade410to420 implements DbUpgrade { rs.close(); pstmt.close(); // Mark the old system templates as removed - pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null"); + pstmt = + conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null"); pstmt.setString(1, hypervisorAndTemplateName.getKey().toString()); pstmt.executeUpdate(); pstmt.close(); @@ -734,9 +747,10 @@ public class Upgrade410to420 implements DbUpgrade { // throw new CloudRuntimeException("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms"); } else { s_logger.warn("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey() + - " hypervisor is not used, so not failing upgrade"); + " hypervisor is not used, so not failing upgrade"); // Update the latest template URLs for corresponding hypervisor - pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1"); + pstmt = + conn.prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1"); pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey())); pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey())); pstmt.setString(3, hypervisorAndTemplateName.getKey().toString()); @@ -977,7 +991,8 @@ public class Upgrade410to420 implements DbUpgrade { try { // update the existing vmware traffic labels - pstmt = conn.prepareStatement("select name,value from `cloud`.`configuration` where category='Hidden' and value is not NULL and name REGEXP 'vmware*.vswitch';"); + pstmt = + conn.prepareStatement("select name,value from `cloud`.`configuration` where category='Hidden' and value is not NULL and name REGEXP 'vmware*.vswitch';"); rsParams = pstmt.executeQuery(); while (rsParams.next()) { trafficTypeVswitchParam = rsParams.getString("name"); @@ -990,12 +1005,14 @@ public class Upgrade410to420 implements DbUpgrade { } else if (trafficTypeVswitchParam.equals("vmware.guest.vswitch")) { trafficType = "Guest"; } - pstmt = conn.prepareStatement("select physical_network_id, traffic_type, vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type='" + - trafficType + "';"); + pstmt = + conn.prepareStatement("select physical_network_id, traffic_type, vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type='" + + trafficType + "';"); rsLabel = pstmt.executeQuery(); newLabel = getNewLabel(rsLabel, trafficTypeVswitchParamValue); - pstmt = conn.prepareStatement("update physical_network_traffic_types set vmware_network_label = " + newLabel + " where traffic_type = '" + trafficType + - "' and vmware_network_label is not NULL;"); + pstmt = + conn.prepareStatement("update physical_network_traffic_types set vmware_network_label = " + newLabel + " where traffic_type = '" + trafficType + + "' and vmware_network_label is not NULL;"); s_logger.debug("Updating vmware label for " + trafficType + " traffic. Update SQL statement is " + pstmt); pstmt.executeUpdate(); } @@ -1112,7 +1129,8 @@ public class Upgrade410to420 implements DbUpgrade { } guid = dcName + "@" + vc; - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vmware_data_center` (uuid, name, guid, vcenter_host, username, password) values(?, ?, ?, ?, ?, ?)"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`vmware_data_center` (uuid, name, guid, vcenter_host, username, password) values(?, ?, ?, ?, ?, ?)"); pstmt.setString(1, UUID.randomUUID().toString()); pstmt.setString(2, dcName); pstmt.setString(3, guid); @@ -1194,7 +1212,8 @@ public class Upgrade410to420 implements DbUpgrade { ResultSet rs = null; try { - pstmt = conn.prepareStatement("SELECT network_id, gateway, ip4_address FROM `cloud`.`nics` WHERE reserver_name IN ('DirectNetworkGuru','DirectPodBasedNetworkGuru') and vm_type='DomainRouter' AND removed IS null"); + pstmt = + conn.prepareStatement("SELECT network_id, gateway, ip4_address FROM `cloud`.`nics` WHERE reserver_name IN ('DirectNetworkGuru','DirectPodBasedNetworkGuru') and vm_type='DomainRouter' AND removed IS null"); rs = pstmt.executeQuery(); while (rs.next()) { Long networkId = rs.getLong(1); @@ -1202,7 +1221,8 @@ public class Upgrade410to420 implements DbUpgrade { String ip = rs.getString(3); String uuid = UUID.randomUUID().toString(); //Insert placeholder nic for each Domain router nic in Shared network - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`nics` (uuid, ip4_address, gateway, network_id, state, strategy, vm_type, default_nic, created) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder', 'DomainRouter', 0, now())"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`nics` (uuid, ip4_address, gateway, network_id, state, strategy, vm_type, default_nic, created) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder', 'DomainRouter', 0, now())"); pstmt.setString(1, uuid); pstmt.setString(2, ip); pstmt.setString(3, gateway); @@ -1270,7 +1290,8 @@ public class Upgrade410to420 implements DbUpgrade { while (rs.next()) { long netId = rs.getLong(1); //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(); @@ -1281,7 +1302,8 @@ public class Upgrade410to420 implements DbUpgrade { //Add new rule for the existing networks s_logger.debug("Adding default egress firewall rule for network " + netId); - pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); + pstmt = + conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); pstmt.setString(1, UUID.randomUUID().toString()); pstmt.setLong(2, accountId); pstmt.setLong(3, domainId); @@ -1368,7 +1390,8 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating network ACLs for network: " + networkId); Long vpcId = rs.getLong(2); String tierUuid = rs.getString(3); - pstmt = conn.prepareStatement("SELECT id, uuid, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type FROM `cloud`.`firewall_rules` where network_id = ? and purpose = 'NetworkACL'"); + pstmt = + conn.prepareStatement("SELECT id, uuid, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type FROM `cloud`.`firewall_rules` where network_id = ? and purpose = 'NetworkACL'"); pstmt.setLong(1, networkId); rsAcls = pstmt.executeQuery(); boolean hasAcls = false; @@ -1411,7 +1434,8 @@ public class Upgrade410to420 implements DbUpgrade { String aclItemUuid = rsAcls.getString(2); //Move acl to network_acl_item table s_logger.debug("Moving firewall rule: " + aclItemUuid); - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`network_acl_item` (uuid, acl_id, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type, cidr, number, action) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`network_acl_item` (uuid, acl_id, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type, cidr, number, action) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"); //uuid pstmt.setString(1, aclItemUuid); //aclId @@ -1554,7 +1578,8 @@ public class Upgrade410to420 implements DbUpgrade { ResultSet rs = null; try { - pstmt = conn.prepareStatement("select distinct map.vpc_offering_id from `cloud`.`vpc_offering_service_map` map, `cloud`.`vpc_offerings` off where off.id=map.vpc_offering_id AND service='Lb'"); + pstmt = + conn.prepareStatement("select distinct map.vpc_offering_id from `cloud`.`vpc_offering_service_map` map, `cloud`.`vpc_offerings` off where off.id=map.vpc_offering_id AND service='Lb'"); rs = pstmt.executeQuery(); while (rs.next()) { long id = rs.getLong(1); @@ -1593,16 +1618,17 @@ public class Upgrade410to420 implements DbUpgrade { long pNtwkId = rs.getLong(1); String uuid = UUID.randomUUID().toString(); //Add internal LB VM to the list of physical network service providers - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " - + "(uuid, physical_network_id, provider_name, state, load_balance_service_provided, destination_physical_network_id)" - + " VALUES (?, ?, 'InternalLbVm', 'Enabled', 1, 0)"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " + + "(uuid, physical_network_id, provider_name, state, load_balance_service_provided, destination_physical_network_id)" + + " VALUES (?, ?, 'InternalLbVm', 'Enabled', 1, 0)"); pstmt.setString(1, uuid); pstmt.setLong(2, pNtwkId); pstmt.executeUpdate(); //Add internal lb vm to the list of physical network elements - PreparedStatement pstmt1 = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers`" - + " WHERE physical_network_id=? AND provider_name='InternalLbVm'"); + PreparedStatement pstmt1 = + conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers`" + " WHERE physical_network_id=? AND provider_name='InternalLbVm'"); pstmt1.setLong(1, pNtwkId); ResultSet rs1 = pstmt1.executeQuery(); while (rs1.next()) { @@ -1721,7 +1747,8 @@ public class Upgrade410to420 implements DbUpgrade { ResultSet rs = null; s_logger.debug("Updating KVM snapshots"); try { - pstmt = conn.prepareStatement("select id, backup_snap_id from `cloud`.`snapshots` where hypervisor_type='KVM' and removed is null and backup_snap_id is not null"); + pstmt = + conn.prepareStatement("select id, backup_snap_id from `cloud`.`snapshots` where hypervisor_type='KVM' and removed is null and backup_snap_id is not null"); rs = pstmt.executeQuery(); while (rs.next()) { long id = rs.getLong(1); @@ -1778,8 +1805,9 @@ public class Upgrade410to420 implements DbUpgrade { pNetworksResults = pNetworkStmt.executeQuery(); while (pNetworksResults.next()) { long physicalNetworkId = pNetworksResults.getLong(1); - PreparedStatement fetchF5NspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'F5BigIp'"); + PreparedStatement fetchF5NspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'F5BigIp'"); ResultSet rsF5NSP = fetchF5NspStmt.executeQuery(); boolean hasF5Nsp = rsF5NSP.next(); fetchF5NspStmt.close(); @@ -1800,8 +1828,9 @@ public class Upgrade410to420 implements DbUpgrade { } } - PreparedStatement fetchSRXNspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + - physicalNetworkId + " and provider_name = 'JuniperSRX'"); + PreparedStatement fetchSRXNspStmt = + conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + + " and provider_name = 'JuniperSRX'"); ResultSet rsSRXNSP = fetchSRXNspStmt.executeQuery(); boolean hasSrxNsp = rsSRXNSP.next(); fetchSRXNspStmt.close(); @@ -1852,8 +1881,9 @@ public class Upgrade410to420 implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding F5 Big IP load balancer with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertF5 = "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertF5 = + "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertF5); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -1882,8 +1912,9 @@ public class Upgrade410to420 implements DbUpgrade { PreparedStatement pstmtUpdate = null; try { s_logger.debug("Adding SRX firewall device with host id " + hostId + " in to physical network" + physicalNetworkId); - String insertSrx = "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " - + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String insertSrx = + "INSERT INTO `cloud`.`external_firewall_devices` (physical_network_id, host_id, provider_name, " + + "device_name, capacity, is_dedicated, device_state, allocation_state, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?)"; pstmtUpdate = conn.prepareStatement(insertSrx); pstmtUpdate.setLong(1, physicalNetworkId); pstmtUpdate.setLong(2, hostId); @@ -1912,10 +1943,11 @@ public class Upgrade410to420 implements DbUpgrade { try { // add physical network service provider - F5BigIp s_logger.debug("Adding PhysicalNetworkServiceProvider F5BigIp" + " in to physical network" + physicalNetworkId); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,1,0,0,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -1940,10 +1972,11 @@ public class Upgrade410to420 implements DbUpgrade { try { // add physical network service provider - JuniperSRX s_logger.debug("Adding PhysicalNetworkServiceProvider JuniperSRX"); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; + String insertPNSP = + "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,1,1,1,0,1,1,0,0)"; pstmtUpdate = conn.prepareStatement(insertPNSP); pstmtUpdate.setString(1, UUID.randomUUID().toString()); @@ -1981,7 +2014,8 @@ public class Upgrade410to420 implements DbUpgrade { long srxDevivceId, srxHostId; try { - pstmt = conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); + pstmt = + conn.prepareStatement("select id from `cloud`.`data_center` where lb_provider='F5BigIp' or firewall_provider='JuniperSRX' or gateway_provider='JuniperSRX'"); rs = pstmt.executeQuery(); while (rs.next()) { zoneIds.add(rs.getLong(1)); @@ -2024,7 +2058,8 @@ public class Upgrade410to420 implements DbUpgrade { if (rs.first()) { f5DeviceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + " found in external_load_balancer_device"); + throw new CloudRuntimeException("Cannot upgrade as there is no F5 load balancer device with host ID " + f5HostId + + " found in external_load_balancer_device"); } // find the SRX device id in the zone @@ -2042,11 +2077,13 @@ public class Upgrade410to420 implements DbUpgrade { if (rs.first()) { srxDevivceId = rs.getLong(1); } else { - throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + " found in external_firewall_devices"); + throw new CloudRuntimeException("Cannot upgrade as there is no SRX firewall device found with host ID " + srxHostId + + " found in external_firewall_devices"); } // check if network any uses F5 or SRX devices in the zone - pstmt = conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); + pstmt = + conn.prepareStatement("select id from `cloud`.`networks` where guest_type='Virtual' and data_center_id=? and network_offering_id=? and removed IS NULL"); pstmt.setLong(1, zoneId); pstmt.setLong(2, networkOfferingId); rs = pstmt.executeQuery(); @@ -2055,7 +2092,8 @@ public class Upgrade410to420 implements DbUpgrade { networkId = rs.getLong(1); // add mapping for the network in network_external_lb_device_map - String insertLbMapping = "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertLbMapping = + "INSERT INTO `cloud`.`network_external_lb_device_map` (uuid, network_id, external_load_balancer_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertLbMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -2064,7 +2102,8 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Successfully added entry in network_external_lb_device_map for network " + networkId + " and F5 device ID " + f5DeviceId); // add mapping for the network in network_external_firewall_device_map - String insertFwMapping = "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; + String insertFwMapping = + "INSERT INTO `cloud`.`network_external_firewall_device_map` (uuid, network_id, external_firewall_device_id, created) VALUES ( ?, ?, ?, now())"; pstmtUpdate = conn.prepareStatement(insertFwMapping); pstmtUpdate.setString(1, UUID.randomUUID().toString()); pstmtUpdate.setLong(2, networkId); @@ -2083,7 +2122,7 @@ public class Upgrade410to420 implements DbUpgrade { long hostId = rs.getLong(1); String camlCaseName = rs.getString(2); if (!(camlCaseName.equalsIgnoreCase("numRetries") || camlCaseName.equalsIgnoreCase("publicZone") || camlCaseName.equalsIgnoreCase("privateZone") || - camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { + camlCaseName.equalsIgnoreCase("publicInterface") || camlCaseName.equalsIgnoreCase("privateInterface") || camlCaseName.equalsIgnoreCase("usageInterface"))) { continue; } String lowerCaseName = camlCaseName.toLowerCase(); @@ -2158,8 +2197,10 @@ public class Upgrade410to420 implements DbUpgrade { storeDetailInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store_details` (store_id, name, value) values(?, ?, ?)"); // migrate NFS secondary storage, for nfs, keep previous host_id as the store_id - storeInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store` (id, uuid, name, image_provider_name, protocol, url, data_center_id, scope, role, parent, total_size, created) values(?, ?, ?, 'NFS', 'nfs', ?, ?, 'ZONE', ?, ?, ?, ?)"); - nfsQuery = conn.prepareStatement("select id, uuid, url, data_center_id, parent, total_size, created from `cloud`.`host` where type = 'SecondaryStorage' and removed is null"); + storeInsert = + conn.prepareStatement("INSERT INTO `cloud`.`image_store` (id, uuid, name, image_provider_name, protocol, url, data_center_id, scope, role, parent, total_size, created) values(?, ?, ?, 'NFS', 'nfs', ?, ?, 'ZONE', ?, ?, ?, ?)"); + nfsQuery = + conn.prepareStatement("select id, uuid, url, data_center_id, parent, total_size, created from `cloud`.`host` where type = 'SecondaryStorage' and removed is null"); rs = nfsQuery.executeQuery(); while (rs.next()) { @@ -2231,7 +2272,8 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating volume_store_ref table from volume_host_ref table"); try { - volStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`volume_store_ref` (store_id, volume_id, zone_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, checksum, error_str, local_path, install_path, url, destroyed, update_count, ref_cnt, state) select host_id, volume_id, zone_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, checksum, error_str, local_path, install_path, url, destroyed, 0, 0, 'Allocated' from `cloud`.`volume_host_ref`"); + volStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`volume_store_ref` (store_id, volume_id, zone_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, checksum, error_str, local_path, install_path, url, destroyed, update_count, ref_cnt, state) select host_id, volume_id, zone_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, checksum, error_str, local_path, install_path, url, destroyed, 0, 0, 'Allocated' from `cloud`.`volume_host_ref`"); int rowCount = volStoreInsert.executeUpdate(); s_logger.debug("Insert modified " + rowCount + " rows"); @@ -2263,7 +2305,8 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating template_store_ref table from template_host_ref table"); try { - tmplStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, error_str, local_path, install_path, url, destroyed, is_copy, update_count, ref_cnt, store_role, state) select host_id, template_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, error_str, local_path, install_path, url, destroyed, is_copy, 0, 0, 'Image', 'Allocated' from `cloud`.`template_host_ref`"); + tmplStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, error_str, local_path, install_path, url, destroyed, is_copy, update_count, ref_cnt, store_role, state) select host_id, template_id, created, last_updated, job_id, download_pct, size, physical_size, download_state, error_str, local_path, install_path, url, destroyed, is_copy, 0, 0, 'Image', 'Allocated' from `cloud`.`template_host_ref`"); int rowCount = tmplStoreInsert.executeUpdate(); s_logger.debug("Insert modified " + rowCount + " rows"); @@ -2295,12 +2338,14 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating snapshot_store_ref table from snapshots table"); try { //Update all snapshots except KVM snapshots - snapshotStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) select sechost_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and sechost_id is not null and removed is null"); + snapshotStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) select sechost_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and sechost_id is not null and removed is null"); int rowCount = snapshotStoreInsert.executeUpdate(); s_logger.debug("Inserted " + rowCount + " snapshots into snapshot_store_ref"); //backsnap_id for KVM snapshots is complate path. CONCAT is not required - snapshotStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) select sechost_id, id, created, size, prev_snap_id, backup_snap_id, volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type = 'KVM' and sechost_id is not null and removed is null"); + snapshotStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) select sechost_id, id, created, size, prev_snap_id, backup_snap_id, volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type = 'KVM' and sechost_id is not null and removed is null"); rowCount = snapshotStoreInsert.executeUpdate(); s_logger.debug("Inserted " + rowCount + " KVM snapshots into snapshot_store_ref"); } catch (SQLException e) { @@ -2335,8 +2380,10 @@ public class Upgrade410to420 implements DbUpgrade { storeDetailInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store_details` (store_id, name, value) values(?, ?, ?)"); // migrate S3 to image_store - storeInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, scope, role, created) values(?, ?, 'S3', ?, 'REGION', 'Image', ?)"); - s3Query = conn.prepareStatement("select id, uuid, access_key, secret_key, end_point, bucket, https, connection_timeout, max_error_retry, socket_timeout, created from `cloud`.`s3`"); + storeInsert = + conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, scope, role, created) values(?, ?, 'S3', ?, 'REGION', 'Image', ?)"); + s3Query = + conn.prepareStatement("select id, uuid, access_key, secret_key, end_point, bucket, https, connection_timeout, max_error_retry, socket_timeout, created from `cloud`.`s3`"); rs = s3Query.executeQuery(); while (rs.next()) { @@ -2440,8 +2487,10 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating template_store_ref table from template_s3_ref table"); try { - tmplStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, download_pct, size, physical_size, download_state, local_path, install_path, update_count, ref_cnt, store_role, state) values(?, ?, ?, 100, ?, ?, 'DOWNLOADED', '?', '?', 0, 0, 'Image', 'Ready')"); - s3Query = conn.prepareStatement("select template_s3_ref.s3_id, template_s3_ref.template_id, template_s3_ref.created, template_s3_ref.size, template_s3_ref.physical_size, vm_template.account_id from `cloud`.`template_s3_ref`, `cloud`.`vm_template` where vm_template.id = template_s3_ref.template_id"); + tmplStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, download_pct, size, physical_size, download_state, local_path, install_path, update_count, ref_cnt, store_role, state) values(?, ?, ?, 100, ?, ?, 'DOWNLOADED', '?', '?', 0, 0, 'Image', 'Ready')"); + s3Query = + conn.prepareStatement("select template_s3_ref.s3_id, template_s3_ref.template_id, template_s3_ref.created, template_s3_ref.size, template_s3_ref.physical_size, vm_template.account_id from `cloud`.`template_s3_ref`, `cloud`.`vm_template` where vm_template.id = template_s3_ref.template_id"); rs = s3Query.executeQuery(); while (rs.next()) { @@ -2499,8 +2548,10 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating snapshot_store_ref table from snapshots table for s3"); try { - snapshotStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) values(?, ?, ?, ?, ?, ?, ?, 0, 0, 'Image', 'Ready')"); - s3Query = conn.prepareStatement("select s3_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and s3_id is not null and removed is null"); + snapshotStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) values(?, ?, ?, ?, ?, ?, ?, 0, 0, 'Image', 'Ready')"); + s3Query = + conn.prepareStatement("select s3_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and s3_id is not null and removed is null"); rs = s3Query.executeQuery(); while (rs.next()) { @@ -2561,7 +2612,8 @@ public class Upgrade410to420 implements DbUpgrade { storeDetailInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store_details` (store_id, name, value) values(?, ?, ?)"); // migrate SWIFT secondary storage - storeInsert = conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, url, scope, role, created) values(?, ?, 'Swift', 'http', ?, 'REGION', 'Image', ?)"); + storeInsert = + conn.prepareStatement("INSERT INTO `cloud`.`image_store` (uuid, name, image_provider_name, protocol, url, scope, role, created) values(?, ?, 'Swift', 'http', ?, 'REGION', 'Image', ?)"); swiftQuery = conn.prepareStatement("select id, uuid, url, account, username, swift.key, created from `cloud`.`swift`"); rs = swiftQuery.executeQuery(); @@ -2650,7 +2702,8 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating template_store_ref table from template_swift_ref table"); try { - tmplStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, download_pct, size, physical_size, download_state, local_path, install_path, update_count, ref_cnt, store_role, state) values(?, ?, ?, 100, ?, ?, 'DOWNLOADED', '?', '?', 0, 0, 'Image', 'Ready')"); + tmplStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`template_store_ref` (store_id, template_id, created, download_pct, size, physical_size, download_state, local_path, install_path, update_count, ref_cnt, store_role, state) values(?, ?, ?, 100, ?, ?, 'DOWNLOADED', '?', '?', 0, 0, 'Image', 'Ready')"); s3Query = conn.prepareStatement("select swift_id, template_id, created, path, size, physical_size from `cloud`.`template_swift_ref`"); rs = s3Query.executeQuery(); @@ -2708,8 +2761,10 @@ public class Upgrade410to420 implements DbUpgrade { s_logger.debug("Updating snapshot_store_ref table from snapshots table for swift"); try { - snapshotStoreInsert = conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) values(?, ?, ?, ?, ?, ?, ?, 0, 0, 'Image', 'Ready')"); - s3Query = conn.prepareStatement("select swift_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and swift_id is not null and removed is null"); + snapshotStoreInsert = + conn.prepareStatement("INSERT INTO `cloud`.`snapshot_store_ref` (store_id, snapshot_id, created, size, parent_snapshot_id, install_path, volume_id, update_count, ref_cnt, store_role, state) values(?, ?, ?, ?, ?, ?, ?, 0, 0, 'Image', 'Ready')"); + s3Query = + conn.prepareStatement("select swift_id, id, created, size, prev_snap_id, CONCAT('snapshots', '/', account_id, '/', volume_id, '/', backup_snap_id), volume_id, 0, 0, 'Image', 'Ready' from `cloud`.`snapshots` where status = 'BackedUp' and hypervisor_type <> 'KVM' and swift_id is not null and removed is null"); rs = s3Query.executeQuery(); while (rs.next()) { @@ -2755,7 +2810,8 @@ public class Upgrade410to420 implements DbUpgrade { //Now add foreign key. PreparedStatement pstmt = null; try { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`nicira_nvp_nic_map` ADD CONSTRAINT `fk_nicira_nvp_nic_map__nic` FOREIGN KEY (`nic`) REFERENCES `nics` (`uuid`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`nicira_nvp_nic_map` ADD CONSTRAINT `fk_nicira_nvp_nic_map__nic` FOREIGN KEY (`nic`) REFERENCES `nics` (`uuid`) ON DELETE CASCADE"); pstmt.executeUpdate(); s_logger.debug("Added foreign key fk_nicira_nvp_nic_map__nic to the table nicira_nvp_nic_map"); } catch (SQLException e) { @@ -2780,7 +2836,8 @@ public class Upgrade410to420 implements DbUpgrade { //Now add foreign key. PreparedStatement pstmt = null; try { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`router_network_ref` ADD CONSTRAINT `fk_router_network_ref__router_id` FOREIGN KEY (`router_id`) REFERENCES `domain_router` (`id`) ON DELETE CASCADE"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`router_network_ref` ADD CONSTRAINT `fk_router_network_ref__router_id` FOREIGN KEY (`router_id`) REFERENCES `domain_router` (`id`) ON DELETE CASCADE"); pstmt.executeUpdate(); s_logger.debug("Added foreign key fk_router_network_ref__router_id to the table router_network_ref"); } catch (SQLException e) { @@ -2840,10 +2897,12 @@ public class Upgrade410to420 implements DbUpgrade { ResultSet rs2 = null; try { try { - pstmt = conn.prepareStatement("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = 'cloud' AND TABLE_NAME = 'network_offerings' AND COLUMN_NAME = 'concurrent_connections'"); + pstmt = + conn.prepareStatement("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = 'cloud' AND TABLE_NAME = 'network_offerings' AND COLUMN_NAME = 'concurrent_connections'"); rs = pstmt.executeQuery(); if (!rs.next()) { - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)'"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)'"); pstmt.executeUpdate(); } } catch (SQLException e) { @@ -2899,7 +2958,8 @@ public class Upgrade410to420 implements DbUpgrade { if (rs.next()) { pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`volumes` DROP COLUMN `iso_id`"); pstmt.executeUpdate(); - pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`volumes` CHANGE COLUMN `iso_id1` `iso_id` bigint(20) unsigned COMMENT 'The id of the iso from which the volume was created'"); + pstmt = + conn.prepareStatement("ALTER TABLE `cloud`.`volumes` CHANGE COLUMN `iso_id1` `iso_id` bigint(20) unsigned COMMENT 'The id of the iso from which the volume was created'"); pstmt.executeUpdate(); } } catch (SQLException e) { @@ -2940,7 +3000,8 @@ public class Upgrade410to420 implements DbUpgrade { while (rs1.next()) { String service = rs1.getString(1); String provider = rs1.getString(2); - insertProviders = conn.prepareStatement("INSERT INTO `cloud`.`vpc_service_map` (`vpc_id`, `service`, `provider`, `created`) VALUES (?, ?, ?, now());"); + insertProviders = + conn.prepareStatement("INSERT INTO `cloud`.`vpc_service_map` (`vpc_id`, `service`, `provider`, `created`) VALUES (?, ?, ?, now());"); insertProviders.setLong(1, vpc_id); insertProviders.setString(2, service); insertProviders.setString(3, provider); @@ -2989,9 +3050,10 @@ public class Upgrade410to420 implements DbUpgrade { long account_id = rsAccount.getLong(1); long domain_id = rsAccount.getLong(2); // 1. update cpu,memory for all accounts - pstmt2 = conn.prepareStatement("SELECT SUM(service_offering.cpu), SUM(service_offering.ram_size)" + " FROM `cloud`.`vm_instance`, `cloud`.`service_offering`" - + " WHERE vm_instance.service_offering_id = service_offering.id AND vm_instance.account_id = ?" + " AND vm_instance.removed is NULL" - + " AND vm_instance.vm_type='User' AND state not in ('Destroyed', 'Error', 'Expunging')"); + pstmt2 = + conn.prepareStatement("SELECT SUM(service_offering.cpu), SUM(service_offering.ram_size)" + " FROM `cloud`.`vm_instance`, `cloud`.`service_offering`" + + " WHERE vm_instance.service_offering_id = service_offering.id AND vm_instance.account_id = ?" + " AND vm_instance.removed is NULL" + + " AND vm_instance.vm_type='User' AND state not in ('Destroyed', 'Error', 'Expunging')"); pstmt2.setLong(1, account_id); rsCount = pstmt2.executeQuery(); if (rsCount.next()) { @@ -3002,9 +3064,10 @@ public class Upgrade410to420 implements DbUpgrade { upgradeResourceCountforAccount(conn, account_id, domain_id, "memory", 0L); } // 2. update primary_storage for all accounts - pstmt3 = conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" - + " AND (path is not NULL OR state in ('Allocated')) AND removed is NULL" - + " AND instance_id IN (SELECT id FROM `cloud`.`vm_instance` WHERE vm_type='User')"); + pstmt3 = + conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" + + " AND (path is not NULL OR state in ('Allocated')) AND removed is NULL" + + " AND instance_id IN (SELECT id FROM `cloud`.`vm_instance` WHERE vm_type='User')"); pstmt3.setLong(1, account_id); rsCount = pstmt3.executeQuery(); if (rsCount.next()) { @@ -3016,8 +3079,9 @@ public class Upgrade410to420 implements DbUpgrade { long totalVolumesSize = 0; long totalSnapshotsSize = 0; long totalTemplatesSize = 0; - pstmt4 = conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" - + " AND path is NULL AND state not in ('Allocated') AND removed is NULL"); + pstmt4 = + conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" + + " AND path is NULL AND state not in ('Allocated') AND removed is NULL"); pstmt4.setLong(1, account_id); rsCount = pstmt4.executeQuery(); if (rsCount.next()) { @@ -3029,8 +3093,9 @@ public class Upgrade410to420 implements DbUpgrade { if (rsCount.next()) { totalSnapshotsSize = rsCount.getLong(1); } - pstmt4 = conn.prepareStatement("SELECT sum(template_store_ref.size) FROM `cloud`.`template_store_ref`,`cloud`.`vm_template` WHERE account_id = ?" - + " AND template_store_ref.template_id = vm_template.id AND download_state = 'DOWNLOADED' AND destroyed = false AND removed is NULL"); + pstmt4 = + conn.prepareStatement("SELECT sum(template_store_ref.size) FROM `cloud`.`template_store_ref`,`cloud`.`vm_template` WHERE account_id = ?" + + " AND template_store_ref.template_id = vm_template.id AND download_state = 'DOWNLOADED' AND destroyed = false AND removed is NULL"); pstmt4.setLong(1, account_id); rsCount = pstmt4.executeQuery(); if (rsCount.next()) { @@ -3051,8 +3116,9 @@ public class Upgrade410to420 implements DbUpgrade { } for (int count = 0; count < resource_types.length; count++) { String resource_type = resource_types[count]; - pstmt5 = conn.prepareStatement("select account.domain_id,sum(resource_count.count) from `cloud`.`account` left join `cloud`.`resource_count` on account.id=resource_count.account_id " - + "where resource_count.type=? group by account.domain_id;"); + pstmt5 = + conn.prepareStatement("select account.domain_id,sum(resource_count.count) from `cloud`.`account` left join `cloud`.`resource_count` on account.id=resource_count.account_id " + + "where resource_count.type=? group by account.domain_id;"); pstmt5.setString(1, resource_type); rsCount = pstmt5.executeQuery(); while (rsCount.next()) { @@ -3098,7 +3164,8 @@ public class Upgrade410to420 implements DbUpgrade { private static void upgradeResourceCountforAccount(Connection conn, Long account_id, Long domain_id, String type, Long resource_count) throws SQLException { //update or insert into resource_count table. PreparedStatement pstmt = null; - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); pstmt.setLong(1, account_id); pstmt.setString(2, type); pstmt.setLong(3, resource_count); @@ -3110,7 +3177,8 @@ public class Upgrade410to420 implements DbUpgrade { private static void upgradeResourceCountforDomain(Connection conn, Long domain_id, String type, Long resource_count) throws SQLException { //update or insert into resource_count table. PreparedStatement pstmt = null; - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); pstmt.setLong(1, domain_id); pstmt.setString(2, type); pstmt.setLong(3, resource_count); diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java index e55a5345d4e..51fb0de8f55 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java @@ -85,7 +85,8 @@ public class Upgrade420to421 implements DbUpgrade { } // Need to populate only when overprovisioning factor doesn't pre exist. s_logger.debug("Starting updating user_vm_details with cpu/memory overprovisioning factors"); - pstmt2 = conn.prepareStatement("select id from `cloud`.`vm_instance` where removed is null and id not in (select vm_id from `cloud`.`user_vm_details` where name='cpuOvercommitRatio')"); + pstmt2 = + conn.prepareStatement("select id from `cloud`.`vm_instance` where removed is null and id not in (select vm_id from `cloud`.`user_vm_details` where name='cpuOvercommitRatio')"); pstmt3 = conn.prepareStatement("INSERT IGNORE INTO cloud.user_vm_details (vm_id, name, value) VALUES (?, ?, ?)"); result2 = pstmt2.executeQuery(); while (result2.next()) { @@ -136,9 +137,10 @@ public class Upgrade420to421 implements DbUpgrade { long account_id = rsAccount.getLong(1); long domain_id = rsAccount.getLong(2); // 1. update cpu,memory for all accounts - pstmt2 = conn.prepareStatement("SELECT SUM(service_offering.cpu), SUM(service_offering.ram_size)" + " FROM `cloud`.`vm_instance`, `cloud`.`service_offering`" - + " WHERE vm_instance.service_offering_id = service_offering.id AND vm_instance.account_id = ?" + " AND vm_instance.removed is NULL" - + " AND vm_instance.vm_type='User' AND state not in ('Destroyed', 'Error', 'Expunging')"); + pstmt2 = + conn.prepareStatement("SELECT SUM(service_offering.cpu), SUM(service_offering.ram_size)" + " FROM `cloud`.`vm_instance`, `cloud`.`service_offering`" + + " WHERE vm_instance.service_offering_id = service_offering.id AND vm_instance.account_id = ?" + " AND vm_instance.removed is NULL" + + " AND vm_instance.vm_type='User' AND state not in ('Destroyed', 'Error', 'Expunging')"); pstmt2.setLong(1, account_id); rsCount = pstmt2.executeQuery(); if (rsCount.next()) { @@ -149,9 +151,10 @@ public class Upgrade420to421 implements DbUpgrade { upgradeResourceCountforAccount(conn, account_id, domain_id, "memory", 0L); } // 2. update primary_storage for all accounts - pstmt3 = conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" - + " AND (path is not NULL OR state in ('Allocated')) AND removed is NULL" - + " AND instance_id IN (SELECT id FROM `cloud`.`vm_instance` WHERE vm_type='User')"); + pstmt3 = + conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" + + " AND (path is not NULL OR state in ('Allocated')) AND removed is NULL" + + " AND instance_id IN (SELECT id FROM `cloud`.`vm_instance` WHERE vm_type='User')"); pstmt3.setLong(1, account_id); rsCount = pstmt3.executeQuery(); if (rsCount.next()) { @@ -163,8 +166,9 @@ public class Upgrade420to421 implements DbUpgrade { long totalVolumesSize = 0; long totalSnapshotsSize = 0; long totalTemplatesSize = 0; - pstmt4 = conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" - + " AND path is NULL AND state not in ('Allocated') AND removed is NULL"); + pstmt4 = + conn.prepareStatement("SELECT sum(size) FROM `cloud`.`volumes` WHERE account_id= ?" + + " AND path is NULL AND state not in ('Allocated') AND removed is NULL"); pstmt4.setLong(1, account_id); rsCount = pstmt4.executeQuery(); if (rsCount.next()) { @@ -176,8 +180,9 @@ public class Upgrade420to421 implements DbUpgrade { if (rsCount.next()) { totalSnapshotsSize = rsCount.getLong(1); } - pstmt4 = conn.prepareStatement("SELECT sum(template_store_ref.size) FROM `cloud`.`template_store_ref`,`cloud`.`vm_template` WHERE account_id = ?" - + " AND template_store_ref.template_id = vm_template.id AND download_state = 'DOWNLOADED' AND destroyed = false AND removed is NULL"); + pstmt4 = + conn.prepareStatement("SELECT sum(template_store_ref.size) FROM `cloud`.`template_store_ref`,`cloud`.`vm_template` WHERE account_id = ?" + + " AND template_store_ref.template_id = vm_template.id AND download_state = 'DOWNLOADED' AND destroyed = false AND removed is NULL"); pstmt4.setLong(1, account_id); rsCount = pstmt4.executeQuery(); if (rsCount.next()) { @@ -198,8 +203,9 @@ public class Upgrade420to421 implements DbUpgrade { } for (int count = 0; count < resource_types.length; count++) { String resource_type = resource_types[count]; - pstmt5 = conn.prepareStatement("select account.domain_id,sum(resource_count.count) from `cloud`.`account` left join `cloud`.`resource_count` on account.id=resource_count.account_id " - + "where resource_count.type=? group by account.domain_id;"); + pstmt5 = + conn.prepareStatement("select account.domain_id,sum(resource_count.count) from `cloud`.`account` left join `cloud`.`resource_count` on account.id=resource_count.account_id " + + "where resource_count.type=? group by account.domain_id;"); pstmt5.setString(1, resource_type); rsCount = pstmt5.executeQuery(); while (rsCount.next()) { @@ -245,7 +251,8 @@ public class Upgrade420to421 implements DbUpgrade { private static void upgradeResourceCountforAccount(Connection conn, Long account_id, Long domain_id, String type, Long resource_count) throws SQLException { //update or insert into resource_count table. PreparedStatement pstmt = null; - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); pstmt.setLong(1, account_id); pstmt.setString(2, type); pstmt.setLong(3, resource_count); @@ -257,7 +264,8 @@ public class Upgrade420to421 implements DbUpgrade { private static void upgradeResourceCountforDomain(Connection conn, Long domain_id, String type, Long resource_count) throws SQLException { //update or insert into resource_count table. PreparedStatement pstmt = null; - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); + pstmt = + conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?"); pstmt.setLong(1, domain_id); pstmt.setString(2, type); pstmt.setLong(3, resource_count); diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java b/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java index d35a333e319..48e4766e715 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java +++ b/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.upgrade.dao; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -31,6 +29,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "version") public class VersionVO implements InternalIdentity { @@ -63,6 +63,7 @@ public class VersionVO implements InternalIdentity { protected VersionVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java b/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java index 5df76190515..4337d00b04f 100644 --- a/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java +++ b/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java @@ -16,10 +16,7 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -27,6 +24,8 @@ import javax.persistence.Id; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "external_public_ip_statistics") @PrimaryKeyJoinColumn(name = "id") @@ -63,6 +62,7 @@ public class ExternalPublicIpStatisticsVO implements InternalIdentity { this.currentBytesSent = 0; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java b/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java index 761b6fa8680..4c26d6a9d2a 100644 --- a/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java +++ b/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -26,6 +24,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_ip_address") public class UsageIPAddressVO implements InternalIdentity { @@ -92,6 +92,7 @@ public class UsageIPAddressVO implements InternalIdentity { return zoneId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageJobVO.java b/engine/schema/src/com/cloud/usage/UsageJobVO.java index abc01ea8a7d..d00e67a1069 100644 --- a/engine/schema/src/com/cloud/usage/UsageJobVO.java +++ b/engine/schema/src/com/cloud/usage/UsageJobVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_job") public class UsageJobVO implements InternalIdentity { @@ -83,6 +83,7 @@ public class UsageJobVO implements InternalIdentity { public UsageJobVO() { } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java b/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java index 22c6ce41f94..d85d5ff4c12 100644 --- a/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java +++ b/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -26,6 +24,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_load_balancer_policy") public class UsageLoadBalancerPolicyVO implements InternalIdentity { @@ -74,6 +74,7 @@ public class UsageLoadBalancerPolicyVO implements InternalIdentity { return domainId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java b/engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java index 53f37ea009a..25218baae56 100644 --- a/engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java +++ b/engine/schema/src/com/cloud/usage/UsageNetworkOfferingVO.java @@ -60,7 +60,8 @@ public class UsageNetworkOfferingVO { protected UsageNetworkOfferingVO() { } - public UsageNetworkOfferingVO(long zoneId, long accountId, long domainId, long vmInstanceId, long networkOfferingId, long nicId, boolean isDefault, Date created, Date deleted) { + public UsageNetworkOfferingVO(long zoneId, long accountId, long domainId, long vmInstanceId, long networkOfferingId, long nicId, boolean isDefault, Date created, + Date deleted) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; diff --git a/engine/schema/src/com/cloud/usage/UsageNetworkVO.java b/engine/schema/src/com/cloud/usage/UsageNetworkVO.java index 3a2133baac3..10b86542893 100644 --- a/engine/schema/src/com/cloud/usage/UsageNetworkVO.java +++ b/engine/schema/src/com/cloud/usage/UsageNetworkVO.java @@ -58,8 +58,8 @@ public class UsageNetworkVO { protected UsageNetworkVO() { } - public UsageNetworkVO(Long accountId, long zoneId, long hostId, String hostType, Long networkId, long bytesSent, long bytesReceived, long aggBytesReceived, long aggBytesSent, - long eventTimeMillis) { + public UsageNetworkVO(Long accountId, long zoneId, long hostId, String hostType, Long networkId, long bytesSent, long bytesReceived, long aggBytesReceived, + long aggBytesSent, long eventTimeMillis) { this.accountId = accountId; this.zoneId = zoneId; this.hostId = hostId; diff --git a/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java b/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java index 0871c0050c7..b6eb05634f6 100644 --- a/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java +++ b/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -26,6 +24,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_port_forwarding") public class UsagePortForwardingRuleVO implements InternalIdentity { @@ -74,6 +74,7 @@ public class UsagePortForwardingRuleVO implements InternalIdentity { return domainId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageStorageVO.java b/engine/schema/src/com/cloud/usage/UsageStorageVO.java index 0c561f07cf9..6b1cd4e41c7 100644 --- a/engine/schema/src/com/cloud/usage/UsageStorageVO.java +++ b/engine/schema/src/com/cloud/usage/UsageStorageVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -26,6 +24,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_storage") public class UsageStorageVO implements InternalIdentity { @@ -102,6 +102,7 @@ public class UsageStorageVO implements InternalIdentity { return domainId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java index 4a7343ccce0..06a7beeecf0 100644 --- a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java @@ -62,8 +62,8 @@ public class UsageVMInstanceVO { protected UsageVMInstanceVO() { } - public UsageVMInstanceVO(int usageType, long zoneId, long accountId, long vmInstanceId, String vmName, long serviceOfferingId, long templateId, String hypervisorType, - Date startDate, Date endDate) { + public UsageVMInstanceVO(int usageType, long zoneId, long accountId, long vmInstanceId, String vmName, long serviceOfferingId, long templateId, + String hypervisorType, Date startDate, Date endDate) { this.usageType = usageType; this.zoneId = zoneId; this.accountId = accountId; diff --git a/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java b/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java index 5175e3df1bf..1266d638fe6 100644 --- a/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java @@ -115,6 +115,7 @@ public class UsageVMSnapshotVO implements InternalIdentity { return vmId; } + @Override public long getId() { return this.id; } diff --git a/engine/schema/src/com/cloud/usage/UsageVO.java b/engine/schema/src/com/cloud/usage/UsageVO.java index 14dd460bd38..67014ef4fda 100644 --- a/engine/schema/src/com/cloud/usage/UsageVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVO.java @@ -16,9 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; -import org.apache.cloudstack.usage.Usage; - import java.util.Date; import javax.persistence.Column; @@ -30,6 +27,9 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; +import org.apache.cloudstack.usage.Usage; + @Entity @Table(name = "cloud_usage") public class UsageVO implements Usage, InternalIdentity { @@ -97,8 +97,8 @@ public class UsageVO implements Usage, InternalIdentity { public UsageVO() { } - public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, Long offeringId, - Long templateId, Long usageId, Long size, Date startDate, Date endDate) { + public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, + Long offeringId, Long templateId, Long usageId, Long size, Date startDate, Date endDate) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -116,8 +116,8 @@ public class UsageVO implements Usage, InternalIdentity { this.endDate = endDate; } - public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, Long offeringId, - Long templateId, Long usageId, Long size, Long virtualSize, Date startDate, Date endDate) { + public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, + Long offeringId, Long templateId, Long usageId, Long size, Long virtualSize, Date startDate, Date endDate) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -136,8 +136,8 @@ public class UsageVO implements Usage, InternalIdentity { this.endDate = endDate; } - public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long usageId, String type, Long networkId, - Date startDate, Date endDate) { + public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long usageId, String type, + Long networkId, Date startDate, Date endDate) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -152,8 +152,8 @@ public class UsageVO implements Usage, InternalIdentity { this.endDate = endDate; } - public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, Long offeringId, - Long templateId, Long usageId, Date startDate, Date endDate, String type) { + public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long vmId, String vmName, + Long offeringId, Long templateId, Long usageId, Date startDate, Date endDate, String type) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -172,8 +172,8 @@ public class UsageVO implements Usage, InternalIdentity { } //IPAddress Usage - public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long usageId, long size, String type, - Date startDate, Date endDate) { + public UsageVO(Long zoneId, Long accountId, Long domainId, String description, String usageDisplay, int usageType, Double rawUsage, Long usageId, long size, + String type, Date startDate, Date endDate) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -268,6 +268,7 @@ public class UsageVO implements Usage, InternalIdentity { return size; } + @Override public Long getVirtualSize() { return virtualSize; } diff --git a/engine/schema/src/com/cloud/usage/UsageVmDiskVO.java b/engine/schema/src/com/cloud/usage/UsageVmDiskVO.java index 013abd6ce12..16b89755da8 100644 --- a/engine/schema/src/com/cloud/usage/UsageVmDiskVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVmDiskVO.java @@ -67,8 +67,8 @@ public class UsageVmDiskVO { protected UsageVmDiskVO() { } - public UsageVmDiskVO(Long accountId, long zoneId, Long vmId, Long volumeId, long ioRead, long ioWrite, long aggIORead, long aggIOWrite, long bytesRead, long bytesWrite, - long aggBytesRead, long aggBytesWrite, long eventTimeMillis) { + public UsageVmDiskVO(Long accountId, long zoneId, Long vmId, Long volumeId, long ioRead, long ioWrite, long aggIORead, long aggIOWrite, long bytesRead, + long bytesWrite, long aggBytesRead, long aggBytesWrite, long eventTimeMillis) { this.accountId = accountId; this.zoneId = zoneId; this.vmId = vmId; diff --git a/engine/schema/src/com/cloud/usage/UsageVolumeVO.java b/engine/schema/src/com/cloud/usage/UsageVolumeVO.java index 1801bfb2832..4b57aa0aa50 100644 --- a/engine/schema/src/com/cloud/usage/UsageVolumeVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVolumeVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.usage; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -26,6 +24,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "usage_volume") public class UsageVolumeVO implements InternalIdentity { @@ -86,6 +86,7 @@ public class UsageVolumeVO implements InternalIdentity { return domainId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java index 6577523e8b8..da770fd6926 100644 --- a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java +++ b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDao.java @@ -19,7 +19,6 @@ package com.cloud.usage.dao; import java.util.List; import com.cloud.usage.ExternalPublicIpStatisticsVO; -import com.cloud.user.UserStatisticsVO; import com.cloud.utils.db.GenericDao; public interface ExternalPublicIpStatisticsDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java index 770f03c1b3e..c7182d525a6 100644 --- a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java @@ -23,11 +23,9 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; import com.cloud.usage.ExternalPublicIpStatisticsVO; -import com.cloud.user.UserStatisticsVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.vm.dao.DomainRouterDao; @Component @Local(value = {ExternalPublicIpStatisticsDao.class}) @@ -49,11 +47,13 @@ public class ExternalPublicIpStatisticsDaoImpl extends GenericDaoBase sc = getSingleRowSc(accountId, zoneId, publicIpAddress); return lockOneRandomRow(sc, true); } + @Override public ExternalPublicIpStatisticsVO findBy(long accountId, long zoneId, String publicIpAddress) { SearchCriteria sc = getSingleRowSc(accountId, zoneId, publicIpAddress); return findOneBy(sc); @@ -67,6 +67,7 @@ public class ExternalPublicIpStatisticsDaoImpl extends GenericDaoBase listBy(long accountId, long zoneId) { SearchCriteria sc = AccountZoneSearch.create(); sc.setParameters("accountId", accountId); diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java index a1b67ad3a71..a2039ec83d5 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java @@ -49,24 +49,29 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage private static final String DELETE_ALL = "DELETE FROM cloud_usage"; private static final String DELETE_ALL_BY_ACCOUNTID = "DELETE FROM cloud_usage WHERE account_id = ?"; private static final String INSERT_ACCOUNT = "INSERT INTO cloud_usage.account (id, account_name, type, domain_id, removed, cleanup_needed) VALUES (?,?,?,?,?,?)"; - private static final String INSERT_USER_STATS = "INSERT INTO cloud_usage.user_statistics (id, data_center_id, account_id, public_ip_address, device_id, device_type, network_id, net_bytes_received," - + " net_bytes_sent, current_bytes_received, current_bytes_sent, agg_bytes_received, agg_bytes_sent) VALUES (?,?,?,?,?,?,?,?,?,?, ?, ?, ?)"; + private static final String INSERT_USER_STATS = + "INSERT INTO cloud_usage.user_statistics (id, data_center_id, account_id, public_ip_address, device_id, device_type, network_id, net_bytes_received," + + " net_bytes_sent, current_bytes_received, current_bytes_sent, agg_bytes_received, agg_bytes_sent) VALUES (?,?,?,?,?,?,?,?,?,?, ?, ?, ?)"; private static final String UPDATE_ACCOUNT = "UPDATE cloud_usage.account SET account_name=?, removed=? WHERE id=?"; - private static final String UPDATE_USER_STATS = "UPDATE cloud_usage.user_statistics SET net_bytes_received=?, net_bytes_sent=?, current_bytes_received=?, current_bytes_sent=?, agg_bytes_received=?, agg_bytes_sent=? WHERE id=?"; + private static final String UPDATE_USER_STATS = + "UPDATE cloud_usage.user_statistics SET net_bytes_received=?, net_bytes_sent=?, current_bytes_received=?, current_bytes_sent=?, agg_bytes_received=?, agg_bytes_sent=? WHERE id=?"; private static final String GET_LAST_ACCOUNT = "SELECT id FROM cloud_usage.account ORDER BY id DESC LIMIT 1"; private static final String GET_LAST_USER_STATS = "SELECT id FROM cloud_usage.user_statistics ORDER BY id DESC LIMIT 1"; private static final String GET_PUBLIC_TEMPLATES_BY_ACCOUNTID = "SELECT id FROM cloud.vm_template WHERE account_id = ? AND public = '1' AND removed IS NULL"; private static final String GET_LAST_VM_DISK_STATS = "SELECT id FROM cloud_usage.vm_disk_statistics ORDER BY id DESC LIMIT 1"; - private static final String INSERT_VM_DISK_STATS = "INSERT INTO cloud_usage.vm_disk_statistics (id, data_center_id, account_id, vm_id, volume_id, 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) " - + " VALUES (?,?,?,?,?,?,?,?,?,?, ?, ?, ?, ?,?, ?, ?)"; - 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_VM_DISK_STATS = + "INSERT INTO cloud_usage.vm_disk_statistics (id, data_center_id, account_id, vm_id, volume_id, 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) " + + " VALUES (?,?,?,?,?,?,?,?,?,?, ?, ?, ?, ?,?, ?, ?)"; + 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 (?,?,?,?,?,?,?,?,?, ?, ?, ?,?,?,?,?,?,?)"; protected final static TimeZone s_gmtTimeZone = TimeZone.getTimeZone("GMT"); diff --git a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java index 01ed8b82d95..17d5dc8e825 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java @@ -29,7 +29,6 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageIPAddressVO; -import com.cloud.user.Account; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @@ -40,21 +39,22 @@ public class UsageIPAddressDaoImpl extends GenericDaoBase= ?)))"; - protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT id, account_id, domain_id, zone_id, public_ip_address, is_source_nat, is_system, assigned, released " - + "FROM usage_ip_address " - + "WHERE domain_id = ? AND ((released IS NULL AND assigned <= ?) OR (assigned BETWEEN ? AND ?) OR " - + " (released BETWEEN ? AND ?) OR ((assigned <= ?) AND (released >= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = + "SELECT id, account_id, domain_id, zone_id, public_ip_address, is_source_nat, is_system, assigned, released " + "FROM usage_ip_address " + + "WHERE account_id = ? AND ((released IS NULL AND assigned <= ?) OR (assigned BETWEEN ? AND ?) OR " + + " (released BETWEEN ? AND ?) OR ((assigned <= ?) AND (released >= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_DOMAIN = + "SELECT id, account_id, domain_id, zone_id, public_ip_address, is_source_nat, is_system, assigned, released " + "FROM usage_ip_address " + + "WHERE domain_id = ? AND ((released IS NULL AND assigned <= ?) OR (assigned BETWEEN ? AND ?) OR " + + " (released BETWEEN ? AND ?) OR ((assigned <= ?) AND (released >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT id, account_id, domain_id, zone_id, public_ip_address, is_source_nat, is_system, assigned, released " - + "FROM usage_ip_address " + "WHERE (released IS NULL AND assigned <= ?) OR (assigned BETWEEN ? AND ?) OR " - + " (released BETWEEN ? AND ?) OR ((assigned <= ?) AND (released >= ?))"; + + "FROM usage_ip_address " + "WHERE (released IS NULL AND assigned <= ?) OR (assigned BETWEEN ? AND ?) OR " + + " (released BETWEEN ? AND ?) OR ((assigned <= ?) AND (released >= ?))"; public UsageIPAddressDaoImpl() { } + @Override public void update(UsageIPAddressVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java index cabbd2ea948..0a73dd98ced 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java @@ -38,7 +38,8 @@ import com.cloud.utils.exception.CloudRuntimeException; public class UsageJobDaoImpl extends GenericDaoBase implements UsageJobDao { private static final Logger s_logger = Logger.getLogger(UsageJobDaoImpl.class.getName()); - private static final String GET_LAST_JOB_SUCCESS_DATE_MILLIS = "SELECT end_millis FROM cloud_usage.usage_job WHERE end_millis > 0 and success = 1 ORDER BY end_millis DESC LIMIT 1"; + private static final String GET_LAST_JOB_SUCCESS_DATE_MILLIS = + "SELECT end_millis FROM cloud_usage.usage_job WHERE end_millis > 0 and success = 1 ORDER BY end_millis DESC LIMIT 1"; @Override public long getLastJobSuccessDateMillis() { diff --git a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java index db2a3fbf248..c868ac0321a 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java @@ -41,18 +41,16 @@ public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase= ?)))"; + + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT id, zone_id, account_id, domain_id, created, deleted " + "FROM usage_load_balancer_policy " - + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT id, zone_id, account_id, domain_id, created, deleted " + "FROM usage_load_balancer_policy " - + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsageLoadBalancerPolicyDaoImpl() { } + @Override public void removeBy(long accountId, long lbId) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -72,6 +70,7 @@ public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase implements UsageNetworkDao { private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); - private static final String SELECT_LATEST_STATS = "SELECT u.account_id, u.zone_id, u.host_id, u.host_type, u.network_id, u.bytes_sent, u.bytes_received, u.agg_bytes_received, u.agg_bytes_sent, u.event_time_millis " - + "FROM cloud_usage.usage_network u INNER JOIN (SELECT netusage.account_id as acct_id, netusage.zone_id as z_id, max(netusage.event_time_millis) as max_date " - + "FROM cloud_usage.usage_network netusage " - + "GROUP BY netusage.account_id, netusage.zone_id " - + ") joinnet on u.account_id = joinnet.acct_id and u.zone_id = joinnet.z_id and u.event_time_millis = joinnet.max_date"; + private static final String SELECT_LATEST_STATS = + "SELECT u.account_id, u.zone_id, u.host_id, u.host_type, u.network_id, u.bytes_sent, u.bytes_received, u.agg_bytes_received, u.agg_bytes_sent, u.event_time_millis " + + "FROM cloud_usage.usage_network u INNER JOIN (SELECT netusage.account_id as acct_id, netusage.zone_id as z_id, max(netusage.event_time_millis) as max_date " + + "FROM cloud_usage.usage_network netusage " + "GROUP BY netusage.account_id, netusage.zone_id " + + ") joinnet on u.account_id = joinnet.acct_id and u.zone_id = joinnet.z_id and u.event_time_millis = joinnet.max_date"; private static final String DELETE_OLD_STATS = "DELETE FROM cloud_usage.usage_network WHERE event_time_millis < ?"; - private static final String INSERT_USAGE_NETWORK = "INSERT INTO cloud_usage.usage_network (account_id, zone_id, host_id, host_type, network_id, bytes_sent, bytes_received, agg_bytes_received, agg_bytes_sent, event_time_millis) VALUES (?,?,?,?,?,?,?,?,?,?)"; + private static final String INSERT_USAGE_NETWORK = + "INSERT INTO cloud_usage.usage_network (account_id, zone_id, host_id, host_type, network_id, bytes_sent, bytes_received, agg_bytes_received, agg_bytes_sent, event_time_millis) VALUES (?,?,?,?,?,?,?,?,?,?)"; public UsageNetworkDaoImpl() { } @@ -69,11 +70,11 @@ public class UsageNetworkDaoImpl extends GenericDaoBase im long aggBytesSent = rs.getLong(9); long eventTimeMillis = rs.getLong(10); if (hostId != 0) { - returnMap.put(zoneId + "-" + accountId + "-Host-" + hostId, new UsageNetworkVO(accountId, zoneId, hostId, hostType, networkId, bytesSent, bytesReceived, - aggBytesReceived, aggBytesSent, eventTimeMillis)); + returnMap.put(zoneId + "-" + accountId + "-Host-" + hostId, new UsageNetworkVO(accountId, zoneId, hostId, hostType, networkId, bytesSent, + bytesReceived, aggBytesReceived, aggBytesSent, eventTimeMillis)); } else { - returnMap.put(zoneId + "-" + accountId, new UsageNetworkVO(accountId, zoneId, hostId, hostType, networkId, bytesSent, bytesReceived, aggBytesReceived, - aggBytesSent, eventTimeMillis)); + returnMap.put(zoneId + "-" + accountId, new UsageNetworkVO(accountId, zoneId, hostId, hostType, networkId, bytesSent, bytesReceived, + aggBytesReceived, aggBytesSent, eventTimeMillis)); } } return returnMap; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index 933cd0fdef8..f27fd60f755 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -38,21 +38,22 @@ import com.cloud.utils.db.TransactionLegacy; public class UsageNetworkOfferingDaoImpl extends GenericDaoBase implements UsageNetworkOfferingDao { public static final Logger s_logger = Logger.getLogger(UsageNetworkOfferingDaoImpl.class.getName()); - protected static final String UPDATE_DELETED = "UPDATE usage_network_offering SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND network_offering_id = ? and deleted IS NULL"; - protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " - + "FROM usage_network_offering " - + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; - protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " - + "FROM usage_network_offering " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; - protected static final String GET_ALL_USAGE_RECORDS = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " - + "FROM usage_network_offering " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + protected static final String UPDATE_DELETED = + "UPDATE usage_network_offering SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND network_offering_id = ? and deleted IS NULL"; + protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = + "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " + "FROM usage_network_offering " + + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_DOMAIN = + "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " + "FROM usage_network_offering " + + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + protected static final String GET_ALL_USAGE_RECORDS = + "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " + "FROM usage_network_offering " + + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsageNetworkOfferingDaoImpl() { } + @Override public void update(UsageNetworkOfferingVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java index 4075a475644..803288a7a6d 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java @@ -41,18 +41,16 @@ public class UsagePortForwardingRuleDaoImpl extends GenericDaoBase= ?)))"; + + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT id, zone_id, account_id, domain_id, created, deleted " + "FROM usage_port_forwarding " - + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT id, zone_id, account_id, domain_id, created, deleted " + "FROM usage_port_forwarding " - + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsagePortForwardingRuleDaoImpl() { } + @Override public void removeBy(long accountId, long pfId) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -72,6 +70,7 @@ public class UsagePortForwardingRuleDaoImpl extends GenericDaoBase implements UsageSecurityGroupDao { public static final Logger s_logger = Logger.getLogger(UsageSecurityGroupDaoImpl.class.getName()); - protected static final String UPDATE_DELETED = "UPDATE usage_security_group SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND security_group_id = ? and deleted IS NULL"; + protected static final String UPDATE_DELETED = + "UPDATE usage_security_group SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND security_group_id = ? and deleted IS NULL"; protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT zone_id, account_id, domain_id, vm_instance_id, security_group_id, created, deleted " - + "FROM usage_security_group " + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "FROM usage_security_group " + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT zone_id, account_id, domain_id, vm_instance_id, security_group_id, created, deleted " - + "FROM usage_security_group " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "FROM usage_security_group " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT zone_id, account_id, domain_id, vm_instance_id, security_group_id, created, deleted " - + "FROM usage_security_group " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "FROM usage_security_group " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsageSecurityGroupDaoImpl() { } + @Override public void update(UsageSecurityGroupVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java index 0f0ee52fbb7..175bb88ea18 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java @@ -42,15 +42,14 @@ public class UsageStorageDaoImpl extends GenericDaoBase im protected static final String REMOVE_BY_USERID_STORAGEID = "DELETE FROM usage_storage WHERE account_id = ? AND id = ? AND storage_type = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_storage SET deleted = ? WHERE account_id = ? AND id = ? AND storage_type = ? and deleted IS NULL"; - protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, storage_type, source_id, size, created, deleted, virtual_size " - + "FROM usage_storage " + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; - protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT id, zone_id, account_id, domain_id, storage_type, source_id, size, created, deleted, virtual_size " - + "FROM usage_storage " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = + "SELECT id, zone_id, account_id, domain_id, storage_type, source_id, size, created, deleted, virtual_size " + "FROM usage_storage " + + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_DOMAIN = + "SELECT id, zone_id, account_id, domain_id, storage_type, source_id, size, created, deleted, virtual_size " + "FROM usage_storage " + + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT id, zone_id, account_id, domain_id, storage_type, source_id, size, created, deleted, virtual_size " - + "FROM usage_storage " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "FROM usage_storage " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; private final SearchBuilder IdSearch; private final SearchBuilder IdZoneSearch; @@ -89,6 +88,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im return listBy(sc, null); } + @Override public void removeBy(long accountId, long volId, int storage_type) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -109,6 +109,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im } } + @Override public void update(UsageStorageVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java index e52ecaaf5b8..b94e12f9c5c 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java @@ -39,16 +39,17 @@ public class UsageVMInstanceDaoImpl extends GenericDaoBase= ?)))"; + protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = + "SELECT usage_type, zone_id, account_id, vm_instance_id, vm_name, service_offering_id, template_id, hypervisor_type, start_date, end_date " + + "FROM usage_vm_instance " + "WHERE account_id = ? AND ((end_date IS NULL) OR (start_date BETWEEN ? AND ?) OR " + + " (end_date BETWEEN ? AND ?) OR ((start_date <= ?) AND (end_date >= ?)))"; public UsageVMInstanceDaoImpl() { } + @Override public void update(UsageVMInstanceVO instance) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -69,6 +70,7 @@ public class UsageVMInstanceDaoImpl extends GenericDaoBase getUsageRecords(long accountId, Date startDate, Date endDate) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -123,8 +126,8 @@ public class UsageVMInstanceDaoImpl extends GenericDaoBase implements UsageVMSnapshotDao { public static final Logger s_logger = Logger.getLogger(UsageVMSnapshotDaoImpl.class.getName()); protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, vm_id, disk_offering_id, size, created, processed " - + " FROM usage_vmsnapshot" + " WHERE account_id = ? " + " AND ( (created BETWEEN ? AND ?) OR " - + " (created < ? AND processed is NULL) ) ORDER BY created asc"; + + " FROM usage_vmsnapshot" + " WHERE account_id = ? " + " AND ( (created BETWEEN ? AND ?) OR " + + " (created < ? AND processed is NULL) ) ORDER BY created asc"; protected static final String UPDATE_DELETED = "UPDATE usage_vmsnapshot SET processed = ? WHERE account_id = ? AND id = ? and vm_id = ? and created = ?"; - protected static final String PREVIOUS_QUERY = "SELECT id, zone_id, account_id, domain_id, vm_id, disk_offering_id,size, created, processed " + "FROM usage_vmsnapshot " - + "WHERE account_id = ? AND id = ? AND vm_id = ? AND created < ? AND processed IS NULL " + "ORDER BY created desc limit 1"; + protected static final String PREVIOUS_QUERY = "SELECT id, zone_id, account_id, domain_id, vm_id, disk_offering_id,size, created, processed " + + "FROM usage_vmsnapshot " + "WHERE account_id = ? AND id = ? AND vm_id = ? AND created < ? AND processed IS NULL " + "ORDER BY created desc limit 1"; + @Override public void update(UsageVMSnapshotVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -65,6 +68,7 @@ public class UsageVMSnapshotDaoImpl extends GenericDaoBase getUsageRecords(Long accountId, Long domainId, Date startDate, Date endDate) { List usageRecords = new ArrayList(); diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java index a2482ffd79a..64d3ecd7fe9 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java @@ -40,18 +40,16 @@ public class UsageVPNUserDaoImpl extends GenericDaoBase im protected static final String UPDATE_DELETED = "UPDATE usage_vpn_user SET deleted = ? WHERE account_id = ? AND user_id = ? and deleted IS NULL"; protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT zone_id, account_id, domain_id, user_id, user_name, created, deleted " + "FROM usage_vpn_user " - + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT zone_id, account_id, domain_id, user_id, user_name, created, deleted " + "FROM usage_vpn_user " - + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT zone_id, account_id, domain_id, user_id, user_name, created, deleted " + "FROM usage_vpn_user " - + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsageVPNUserDaoImpl() { } + @Override public void update(UsageVPNUserVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java index 88e07e24e69..afa730b070e 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java @@ -36,15 +36,16 @@ import com.cloud.utils.exception.CloudRuntimeException; @Local(value = {UsageVmDiskDao.class}) public class UsageVmDiskDaoImpl extends GenericDaoBase implements UsageVmDiskDao { private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); - 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 " - + ") 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 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 " + + ") 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() { } @@ -73,11 +74,11 @@ public class UsageVmDiskDaoImpl extends GenericDaoBase impl long aggBytesWrite = rs.getLong(12); long eventTimeMillis = rs.getLong(13); if (vmId != 0) { - returnMap.put(zoneId + "-" + accountId + "-Vm-" + vmId + "-Disk-" + volumeId, new UsageVmDiskVO(accountId, zoneId, vmId, volumeId, ioRead, ioWrite, aggIORead, - aggIOWrite, bytesRead, bytesWrite, aggBytesRead, aggBytesWrite, eventTimeMillis)); + returnMap.put(zoneId + "-" + accountId + "-Vm-" + vmId + "-Disk-" + volumeId, new UsageVmDiskVO(accountId, zoneId, vmId, volumeId, ioRead, ioWrite, + aggIORead, aggIOWrite, bytesRead, bytesWrite, aggBytesRead, aggBytesWrite, eventTimeMillis)); } else { - returnMap.put(zoneId + "-" + accountId, new UsageVmDiskVO(accountId, zoneId, vmId, volumeId, ioRead, ioWrite, aggIORead, aggIOWrite, bytesRead, bytesWrite, - aggBytesRead, aggBytesWrite, eventTimeMillis)); + returnMap.put(zoneId + "-" + accountId, new UsageVmDiskVO(accountId, zoneId, vmId, volumeId, ioRead, ioWrite, aggIORead, aggIOWrite, bytesRead, + bytesWrite, aggBytesRead, aggBytesWrite, eventTimeMillis)); } } return returnMap; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java index 070c1a27170..7bf058c3f4c 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java @@ -41,18 +41,18 @@ public class UsageVolumeDaoImpl extends GenericDaoBase impl protected static final String REMOVE_BY_USERID_VOLID = "DELETE FROM usage_volume WHERE account_id = ? AND id = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_volume SET deleted = ? WHERE account_id = ? AND id = ? and deleted IS NULL"; protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, disk_offering_id, template_id, size, created, deleted " - + "FROM usage_volume " + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "FROM usage_volume " + "WHERE account_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT id, zone_id, account_id, domain_id, disk_offering_id, template_id, size, created, deleted " - + "FROM usage_volume " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; + + "FROM usage_volume " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; protected static final String GET_ALL_USAGE_RECORDS = "SELECT id, zone_id, account_id, domain_id, disk_offering_id, template_id, size, created, deleted " - + "FROM usage_volume " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " - + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; + + "FROM usage_volume " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; public UsageVolumeDaoImpl() { } + @Override public void removeBy(long accountId, long volId) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; @@ -72,6 +72,7 @@ public class UsageVolumeDaoImpl extends GenericDaoBase impl } } + @Override public void update(UsageVolumeVO usage) { TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); PreparedStatement pstmt = null; diff --git a/engine/schema/src/com/cloud/user/AccountDetailVO.java b/engine/schema/src/com/cloud/user/AccountDetailVO.java index 75f14f62ae9..f4b356730ec 100755 --- a/engine/schema/src/com/cloud/user/AccountDetailVO.java +++ b/engine/schema/src/com/cloud/user/AccountDetailVO.java @@ -23,9 +23,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.Encrypt; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.Encrypt; + @Entity @Table(name = "account_details") public class AccountDetailVO implements InternalIdentity { @@ -69,6 +70,7 @@ public class AccountDetailVO implements InternalIdentity { this.value = value; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java index 353b7dded49..9fb035d4d1a 100644 --- a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java +++ b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.user; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/engine/schema/src/com/cloud/user/UserAccountVO.java b/engine/schema/src/com/cloud/user/UserAccountVO.java index e8c6d95ef0c..cef923924df 100644 --- a/engine/schema/src/com/cloud/user/UserAccountVO.java +++ b/engine/schema/src/com/cloud/user/UserAccountVO.java @@ -27,9 +27,10 @@ import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.SecondaryTable; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.utils.db.Encrypt; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "user") @@ -276,6 +277,7 @@ public class UserAccountVO implements UserAccount, InternalIdentity { this.loginAttempts = loginAttempts; } + @Override public int getLoginAttempts() { return loginAttempts; } diff --git a/engine/schema/src/com/cloud/user/UserStatisticsVO.java b/engine/schema/src/com/cloud/user/UserStatisticsVO.java index 31d7954ce25..8f71af5dd21 100644 --- a/engine/schema/src/com/cloud/user/UserStatisticsVO.java +++ b/engine/schema/src/com/cloud/user/UserStatisticsVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.user; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "user_statistics") public class UserStatisticsVO implements InternalIdentity { @@ -89,6 +89,7 @@ public class UserStatisticsVO implements InternalIdentity { return accountId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/UserStatsLogVO.java b/engine/schema/src/com/cloud/user/UserStatsLogVO.java index 29a844bbaa4..6cb7e585a48 100644 --- a/engine/schema/src/com/cloud/user/UserStatsLogVO.java +++ b/engine/schema/src/com/cloud/user/UserStatsLogVO.java @@ -57,8 +57,8 @@ public class UserStatsLogVO { public UserStatsLogVO() { } - public UserStatsLogVO(long userStatsId, long netBytesReceived, long netBytesSent, long currentBytesReceived, long currentBytesSent, long aggBytesReceived, long aggBytesSent, - Date updatedTime) { + public UserStatsLogVO(long userStatsId, long netBytesReceived, long netBytesSent, long currentBytesReceived, long currentBytesSent, long aggBytesReceived, + long aggBytesSent, Date updatedTime) { this.userStatsId = userStatsId; this.netBytesReceived = netBytesReceived; this.netBytesSent = netBytesSent; diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java index 96c5a8f49fd..792b3265975 100755 --- a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java @@ -45,8 +45,9 @@ import com.cloud.utils.db.TransactionLegacy; @Local(value = {AccountDao.class}) public class AccountDaoImpl extends GenericDaoBase implements AccountDao { private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class); - private final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, " + "a.id, a.account_name, a.type, a.domain_id, a.state " - + "FROM `cloud`.`user` u, `cloud`.`account` a " + "WHERE u.account_id = a.id AND u.api_key = ? and u.removed IS NULL"; + private final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, " + + "a.id, a.account_name, a.type, a.domain_id, a.state " + "FROM `cloud`.`user` u, `cloud`.`account` a " + + "WHERE u.account_id = a.id AND u.api_key = ? and u.removed IS NULL"; protected final SearchBuilder AllFieldsSearch; protected final SearchBuilder AccountTypeSearch; diff --git a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java index 2aefb11cf89..7a8e714dc77 100644 --- a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java @@ -39,11 +39,12 @@ import com.cloud.utils.db.TransactionLegacy; @Local(value = {UserStatisticsDao.class}) public class UserStatisticsDaoImpl extends GenericDaoBase implements UserStatisticsDao { private static final Logger s_logger = Logger.getLogger(UserStatisticsDaoImpl.class); - private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = "SELECT us.id, us.data_center_id, us.account_id, us.public_ip_address, us.device_id, us.device_type, us.network_id, us.agg_bytes_received, us.agg_bytes_sent " - + "FROM user_statistics us, account a " - + "WHERE us.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY us.id"; - private static final String UPDATED_STATS_SEARCH = "SELECT id, current_bytes_received, current_bytes_sent, net_bytes_received, net_bytes_sent, agg_bytes_received, agg_bytes_sent from user_statistics " - + "where (agg_bytes_received < net_bytes_received + current_bytes_received) OR (agg_bytes_sent < net_bytes_sent + current_bytes_sent)"; + private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = + "SELECT us.id, us.data_center_id, us.account_id, us.public_ip_address, us.device_id, us.device_type, us.network_id, us.agg_bytes_received, us.agg_bytes_sent " + + "FROM user_statistics us, account a " + "WHERE us.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY us.id"; + private static final String UPDATED_STATS_SEARCH = + "SELECT id, current_bytes_received, current_bytes_sent, net_bytes_received, net_bytes_sent, agg_bytes_received, agg_bytes_sent from user_statistics " + + "where (agg_bytes_received < net_bytes_received + current_bytes_received) OR (agg_bytes_sent < net_bytes_sent + current_bytes_sent)"; private final SearchBuilder AllFieldsSearch; private final SearchBuilder AccountSearch; diff --git a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java index 414701ab8f1..e1136d3cf56 100644 --- a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java @@ -39,14 +39,13 @@ import com.cloud.utils.db.TransactionLegacy; @Local(value = {VmDiskStatisticsDao.class}) public class VmDiskStatisticsDaoImpl extends GenericDaoBase implements VmDiskStatisticsDao { private static final Logger s_logger = Logger.getLogger(VmDiskStatisticsDaoImpl.class); - private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = "SELECT vns.id, vns.data_center_id, vns.account_id, vns.vm_id, vns.volume_id, vns.agg_io_read, vns.agg_io_write, vns.agg_bytes_read, vns.agg_bytes_write " - + "FROM vm_disk_statistics vns, account a " - + "WHERE vns.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY vns.id"; + private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = + "SELECT vns.id, vns.data_center_id, vns.account_id, vns.vm_id, vns.volume_id, vns.agg_io_read, vns.agg_io_write, vns.agg_bytes_read, vns.agg_bytes_write " + + "FROM vm_disk_statistics vns, account a " + "WHERE vns.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY vns.id"; private static final String UPDATED_VM_NETWORK_STATS_SEARCH = "SELECT id, current_io_read, current_io_write, net_io_read, net_io_write, agg_io_read, agg_io_write, " - + "current_bytes_read, current_bytes_write, net_bytes_read, net_bytes_write, agg_bytes_read, agg_bytes_write " - + "from vm_disk_statistics " - + "where (agg_io_read < net_io_read + current_io_read) OR (agg_io_write < net_io_write + current_io_write) OR " - + "(agg_bytes_read < net_bytes_read + current_bytes_read) OR (agg_bytes_write < net_bytes_write + current_bytes_write)"; + + "current_bytes_read, current_bytes_write, net_bytes_read, net_bytes_write, agg_bytes_read, agg_bytes_write " + "from vm_disk_statistics " + + "where (agg_io_read < net_io_read + current_io_read) OR (agg_io_write < net_io_write + current_io_write) OR " + + "(agg_bytes_read < net_bytes_read + current_bytes_read) OR (agg_bytes_write < net_bytes_write + current_bytes_write)"; private final SearchBuilder AllFieldsSearch; private final SearchBuilder AccountSearch; diff --git a/engine/schema/src/com/cloud/vm/ConsoleProxyVO.java b/engine/schema/src/com/cloud/vm/ConsoleProxyVO.java index 8ccf364b731..670bc6ac0df 100644 --- a/engine/schema/src/com/cloud/vm/ConsoleProxyVO.java +++ b/engine/schema/src/com/cloud/vm/ConsoleProxyVO.java @@ -39,126 +39,80 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; @DiscriminatorValue(value = "ConsoleProxy") public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy { public static final String keyContent = "-----BEGIN PRIVATE KEY-----\n" + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCDT9AtEfs+s/I8QXp6rrCw0iNJ\n" - + "0+GgsybNHheU+JpL39LMTZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX\n" - + "1FIpOBGph9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/oCfTl\n" - + "XJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo2JUl8ekNLsOi8/cP\n" - + "tfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4j9cBpE+MfUE+35Dq121sTpsSgF85\n" - + "Mz+pVhn2S633AgMBAAECggEAH/Szd9RxbVADenCA6wxKSa3KErRyq1YN8ksJeCKMAj0FIt0caruE\n" - + "qO11DebWW8cwQu1Otl/cYI6pmg24/BBldMrp9IELX/tNJo+lhPpRyGAxxC0eSXinFfoASb8d+jJd\n" - + "Bd1mmemM6fSxqRlxSP4LrzIhjhR1g2CiyYuTsiM9UtoVKGyHwe7KfFwirUOJo3Mr18zUVNm7YqY4\n" - + "IVhOSq59zkH3ULBlYq4bG50jpxa5mNSCZ7IpafPY/kE/CbR+FWNt30+rk69T+qb5abg6+XGm+OAm\n" - + "bnQ18yZEqX6nJLk7Ch0cfA5orGgrTMOrM71wK7tBBDQ308kOxDGebx6j0qD36QKBgQDTRDr8kuhA\n" - + "9sUyKr9vk2DQCMpNvEeiwI3JRMqmmxpNAtg01aJ3Ya57vX5Fc+zcuV87kP6FM1xgpHQvnw5LWo2J\n" - + "s7ANwQcP8ricEW5zkZhSjI4ssMeAubmsHOloGxmLFYZqwx0JI7CWViGTLMcUlqKblmHcjeQDeDfP\n" - + "P1TaCItFmwKBgQCfHZwVvIcaDs5vxVpZ4ftvflIrW8qq0uOVK6QIf9A/YTGhCXl2qxxTg2A6+0rg\n" - + "ZqI7zKzUDxIbVv0KlgCbpHDC9d5+sdtDB3wW2pimuJ3p1z4/RHb4n/lDwXCACZl1S5l24yXX2pFZ\n" - + "wdPCXmy5PYkHMssFLNhI24pprUIQs66M1QKBgQDQwjAjWisD3pRXESSfZRsaFkWJcM28hdbVFhPF\n" - + "c6gWhwQLmTp0CuL2RPXcPUPFi6sN2iWWi3zxxi9Eyz+9uBn6AsOpo56N5MME/LiOnETO9TKb+Ib6\n" - + "rQtKhjshcv3XkIqFPo2XdVvOAgglPO7vajX91iiXXuH7h7RmJud6l0y/lwKBgE+bi90gLuPtpoEr\n" - + "VzIDKz40ED5bNYHT80NNy0rpT7J2GVN9nwStRYXPBBVeZq7xCpgqpgmO5LtDAWULeZBlbHlOdBwl\n" - + "NhNKKl5wzdEUKwW0yBL1WSS5PQgWPwgARYP25/ggW22sj+49WIo1neXsEKPGWObk8e050f1fTt92\n" - + "Vo1lAoGAb1gCoyBCzvi7sqFxm4V5oapnJeiQQJFjhoYWqGa26rQ+AvXXNuBcigIeDXNJPctSF0Uc\n" - + "p11KbbCgiruBbckvM1vGsk6Sx4leRk+IFHRpJktFUek4o0eUg0shOsyyvyet48Dfg0a8FvcxROs0\n" + "gD+IYds5doiob/hcm1hnNB/3vk4=\n" - + "-----END PRIVATE KEY-----\n"; + + "0+GgsybNHheU+JpL39LMTZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX\n" + + "1FIpOBGph9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/oCfTl\n" + + "XJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo2JUl8ekNLsOi8/cP\n" + + "tfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4j9cBpE+MfUE+35Dq121sTpsSgF85\n" + + "Mz+pVhn2S633AgMBAAECggEAH/Szd9RxbVADenCA6wxKSa3KErRyq1YN8ksJeCKMAj0FIt0caruE\n" + + "qO11DebWW8cwQu1Otl/cYI6pmg24/BBldMrp9IELX/tNJo+lhPpRyGAxxC0eSXinFfoASb8d+jJd\n" + + "Bd1mmemM6fSxqRlxSP4LrzIhjhR1g2CiyYuTsiM9UtoVKGyHwe7KfFwirUOJo3Mr18zUVNm7YqY4\n" + + "IVhOSq59zkH3ULBlYq4bG50jpxa5mNSCZ7IpafPY/kE/CbR+FWNt30+rk69T+qb5abg6+XGm+OAm\n" + + "bnQ18yZEqX6nJLk7Ch0cfA5orGgrTMOrM71wK7tBBDQ308kOxDGebx6j0qD36QKBgQDTRDr8kuhA\n" + + "9sUyKr9vk2DQCMpNvEeiwI3JRMqmmxpNAtg01aJ3Ya57vX5Fc+zcuV87kP6FM1xgpHQvnw5LWo2J\n" + + "s7ANwQcP8ricEW5zkZhSjI4ssMeAubmsHOloGxmLFYZqwx0JI7CWViGTLMcUlqKblmHcjeQDeDfP\n" + + "P1TaCItFmwKBgQCfHZwVvIcaDs5vxVpZ4ftvflIrW8qq0uOVK6QIf9A/YTGhCXl2qxxTg2A6+0rg\n" + + "ZqI7zKzUDxIbVv0KlgCbpHDC9d5+sdtDB3wW2pimuJ3p1z4/RHb4n/lDwXCACZl1S5l24yXX2pFZ\n" + + "wdPCXmy5PYkHMssFLNhI24pprUIQs66M1QKBgQDQwjAjWisD3pRXESSfZRsaFkWJcM28hdbVFhPF\n" + + "c6gWhwQLmTp0CuL2RPXcPUPFi6sN2iWWi3zxxi9Eyz+9uBn6AsOpo56N5MME/LiOnETO9TKb+Ib6\n" + + "rQtKhjshcv3XkIqFPo2XdVvOAgglPO7vajX91iiXXuH7h7RmJud6l0y/lwKBgE+bi90gLuPtpoEr\n" + + "VzIDKz40ED5bNYHT80NNy0rpT7J2GVN9nwStRYXPBBVeZq7xCpgqpgmO5LtDAWULeZBlbHlOdBwl\n" + + "NhNKKl5wzdEUKwW0yBL1WSS5PQgWPwgARYP25/ggW22sj+49WIo1neXsEKPGWObk8e050f1fTt92\n" + + "Vo1lAoGAb1gCoyBCzvi7sqFxm4V5oapnJeiQQJFjhoYWqGa26rQ+AvXXNuBcigIeDXNJPctSF0Uc\n" + + "p11KbbCgiruBbckvM1vGsk6Sx4leRk+IFHRpJktFUek4o0eUg0shOsyyvyet48Dfg0a8FvcxROs0\n" + "gD+IYds5doiob/hcm1hnNB/3vk4=\n" + "-----END PRIVATE KEY-----\n"; public static final String certContent = "-----BEGIN CERTIFICATE-----\n" + "MIIFZTCCBE2gAwIBAgIHKBCduBUoKDANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE\n" - + "BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY\n" - + "BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm\n" - + "aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5\n" - + "IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky\n" - + "ODcwHhcNMTIwMjAzMDMzMDQwWhcNMTcwMjA3MDUxMTIzWjBZMRkwFwYDVQQKDBAq\n" - + "LnJlYWxob3N0aXAuY29tMSEwHwYDVQQLDBhEb21haW4gQ29udHJvbCBWYWxpZGF0\n" - + "ZWQxGTAXBgNVBAMMECoucmVhbGhvc3RpcC5jb20wggEiMA0GCSqGSIb3DQEBAQUA\n" - + "A4IBDwAwggEKAoIBAQCDT9AtEfs+s/I8QXp6rrCw0iNJ0+GgsybNHheU+JpL39LM\n" - + "TZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX1FIpOBGp\n" - + "h9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/o\n" - + "CfTlXJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo\n" - + "2JUl8ekNLsOi8/cPtfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4\n" - + "j9cBpE+MfUE+35Dq121sTpsSgF85Mz+pVhn2S633AgMBAAGjggG+MIIBujAPBgNV\n" - + "HRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV\n" - + "HQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5\n" - + "LmNvbS9nZHMxLTY0LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYI\n" - + "KwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3Np\n" - + "dG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au\n" - + "Z29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdv\n" - + "ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSME\n" - + "GDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAqLnJlYWxob3N0\n" - + "aXAuY29tgg5yZWFsaG9zdGlwLmNvbTAdBgNVHQ4EFgQUZyJz9/QLy5TWIIscTXID\n" - + "E8Xk47YwDQYJKoZIhvcNAQEFBQADggEBAKiUV3KK16mP0NpS92fmQkCLqm+qUWyN\n" - + "BfBVgf9/M5pcT8EiTZlS5nAtzAE/eRpBeR3ubLlaAogj4rdH7YYVJcDDLLoB2qM3\n" - + "qeCHu8LFoblkb93UuFDWqRaVPmMlJRnhsRkL1oa2gM2hwQTkBDkP7w5FG1BELCgl\n" - + "gZI2ij2yxjge6pOEwSyZCzzbCcg9pN+dNrYyGEtB4k+BBnPA3N4r14CWbk+uxjrQ\n" - + "6j2Ip+b7wOc5IuMEMl8xwTyjuX3lsLbAZyFI9RCyofwA9NqIZ1GeB6Zd196rubQp\n" + "93cmBqGGjZUs3wMrGlm7xdjlX6GQ9UvmvkMub9+lL99A5W50QgCmFeI=\n" - + "-----END CERTIFICATE-----\n"; + + "BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY\n" + "BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm\n" + + "aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5\n" + "IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky\n" + + "ODcwHhcNMTIwMjAzMDMzMDQwWhcNMTcwMjA3MDUxMTIzWjBZMRkwFwYDVQQKDBAq\n" + "LnJlYWxob3N0aXAuY29tMSEwHwYDVQQLDBhEb21haW4gQ29udHJvbCBWYWxpZGF0\n" + + "ZWQxGTAXBgNVBAMMECoucmVhbGhvc3RpcC5jb20wggEiMA0GCSqGSIb3DQEBAQUA\n" + "A4IBDwAwggEKAoIBAQCDT9AtEfs+s/I8QXp6rrCw0iNJ0+GgsybNHheU+JpL39LM\n" + + "TZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX1FIpOBGp\n" + "h9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/o\n" + + "CfTlXJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo\n" + "2JUl8ekNLsOi8/cPtfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4\n" + + "j9cBpE+MfUE+35Dq121sTpsSgF85Mz+pVhn2S633AgMBAAGjggG+MIIBujAPBgNV\n" + "HRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV\n" + + "HQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5\n" + "LmNvbS9nZHMxLTY0LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYI\n" + + "KwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3Np\n" + "dG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au\n" + + "Z29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdv\n" + "ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSME\n" + + "GDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAqLnJlYWxob3N0\n" + "aXAuY29tgg5yZWFsaG9zdGlwLmNvbTAdBgNVHQ4EFgQUZyJz9/QLy5TWIIscTXID\n" + + "E8Xk47YwDQYJKoZIhvcNAQEFBQADggEBAKiUV3KK16mP0NpS92fmQkCLqm+qUWyN\n" + "BfBVgf9/M5pcT8EiTZlS5nAtzAE/eRpBeR3ubLlaAogj4rdH7YYVJcDDLLoB2qM3\n" + + "qeCHu8LFoblkb93UuFDWqRaVPmMlJRnhsRkL1oa2gM2hwQTkBDkP7w5FG1BELCgl\n" + "gZI2ij2yxjge6pOEwSyZCzzbCcg9pN+dNrYyGEtB4k+BBnPA3N4r14CWbk+uxjrQ\n" + + "6j2Ip+b7wOc5IuMEMl8xwTyjuX3lsLbAZyFI9RCyofwA9NqIZ1GeB6Zd196rubQp\n" + "93cmBqGGjZUs3wMrGlm7xdjlX6GQ9UvmvkMub9+lL99A5W50QgCmFeI=\n" + + "-----END CERTIFICATE-----\n"; public static final String rootCa = "-----BEGIN CERTIFICATE-----\n" + "MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVMx\n" - + "ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g\n" - + "RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw\n" - + "MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH\n" - + "QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j\n" - + "b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" - + "b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj\n" - + "YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN\n" - + "AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H\n" - + "KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm\n" - + "VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR\n" - + "SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT\n" - + "cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ\n" - + "6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu\n" - + "MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS\n" - + "kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB\n" - + "BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f\n" - + "BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv\n" - + "c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH\n" - + "AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO\n" - + "BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG\n" - + "OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU\n" - + "A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o\n" - + "0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX\n" - + "RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH\n" - + "qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV\n" + "U+4=\n" + "-----END CERTIFICATE-----\n" - + "-----BEGIN CERTIFICATE-----\n" + "MIIE+zCCBGSgAwIBAgICAQ0wDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Zh\n" - + "bGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu\n" - + "Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g\n" - + "QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAe\n" - + "BgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MDYyMFoX\n" - + "DTI0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBE\n" - + "YWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgMiBDZXJ0\n" - + "aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgC\n" - + "ggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv\n" - + "2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+q\n" - + "N1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiO\n" - + "r18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lN\n" - + "f4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEH\n" - + "U1jPEX44dMX4/7VpkI+EdOqXG68CAQOjggHhMIIB3TAdBgNVHQ4EFgQU0sSw0pHU\n" - + "TBFxs2HLPaH+3ahq1OMwgdIGA1UdIwSByjCBx6GBwaSBvjCBuzEkMCIGA1UEBxMb\n" - + "VmFsaUNlcnQgVmFsaWRhdGlvbiBOZXR3b3JrMRcwFQYDVQQKEw5WYWxpQ2VydCwg\n" - + "SW5jLjE1MDMGA1UECxMsVmFsaUNlcnQgQ2xhc3MgMiBQb2xpY3kgVmFsaWRhdGlv\n" - + "biBBdXRob3JpdHkxITAfBgNVBAMTGGh0dHA6Ly93d3cudmFsaWNlcnQuY29tLzEg\n" - + "MB4GCSqGSIb3DQEJARYRaW5mb0B2YWxpY2VydC5jb22CAQEwDwYDVR0TAQH/BAUw\n" - + "AwEB/zAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmdv\n" - + "ZGFkZHkuY29tMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jZXJ0aWZpY2F0ZXMu\n" - + "Z29kYWRkeS5jb20vcmVwb3NpdG9yeS9yb290LmNybDBLBgNVHSAERDBCMEAGBFUd\n" - + "IAAwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNv\n" - + "bS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOBgQC1\n" - + "QPmnHfbq/qQaQlpE9xXUhUaJwL6e4+PrxeNYiY+Sn1eocSxI0YGyeR+sBjUZsE4O\n" - + "WBsUs5iB0QQeyAfJg594RAoYC5jcdnplDQ1tgMQLARzLrUc+cb53S8wGd9D0Vmsf\n" + "SxOaFIqII6hR8INMqzW/Rn453HWkrugp++85j09VZw==\n" - + "-----END CERTIFICATE-----\n" + "-----BEGIN CERTIFICATE-----\n" + "MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0\n" - + "IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz\n" - + "BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y\n" - + "aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG\n" - + "9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy\n" - + "NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y\n" - + "azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs\n" - + "YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw\n" - + "Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl\n" - + "cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY\n" - + "dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9\n" - + "WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS\n" - + "v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v\n" - + "UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu\n" - + "IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC\n" + "W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd\n" - + "-----END CERTIFICATE-----\n"; + + "ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g\n" + "RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw\n" + + "MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH\n" + "QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j\n" + + "b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" + "b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj\n" + + "YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN\n" + "AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H\n" + + "KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm\n" + "VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR\n" + + "SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT\n" + "cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ\n" + + "6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu\n" + "MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS\n" + + "kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB\n" + "BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f\n" + + "BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv\n" + "c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH\n" + + "AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO\n" + "BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG\n" + + "OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU\n" + "A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o\n" + + "0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX\n" + "RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH\n" + + "qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV\n" + "U+4=\n" + "-----END CERTIFICATE-----\n" + "-----BEGIN CERTIFICATE-----\n" + + "MIIE+zCCBGSgAwIBAgICAQ0wDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Zh\n" + "bGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu\n" + + "Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g\n" + "QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAe\n" + + "BgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MDYyMFoX\n" + "DTI0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBE\n" + + "YWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgMiBDZXJ0\n" + "aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgC\n" + + "ggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv\n" + "2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+q\n" + + "N1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiO\n" + "r18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lN\n" + + "f4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEH\n" + "U1jPEX44dMX4/7VpkI+EdOqXG68CAQOjggHhMIIB3TAdBgNVHQ4EFgQU0sSw0pHU\n" + + "TBFxs2HLPaH+3ahq1OMwgdIGA1UdIwSByjCBx6GBwaSBvjCBuzEkMCIGA1UEBxMb\n" + "VmFsaUNlcnQgVmFsaWRhdGlvbiBOZXR3b3JrMRcwFQYDVQQKEw5WYWxpQ2VydCwg\n" + + "SW5jLjE1MDMGA1UECxMsVmFsaUNlcnQgQ2xhc3MgMiBQb2xpY3kgVmFsaWRhdGlv\n" + "biBBdXRob3JpdHkxITAfBgNVBAMTGGh0dHA6Ly93d3cudmFsaWNlcnQuY29tLzEg\n" + + "MB4GCSqGSIb3DQEJARYRaW5mb0B2YWxpY2VydC5jb22CAQEwDwYDVR0TAQH/BAUw\n" + "AwEB/zAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmdv\n" + + "ZGFkZHkuY29tMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jZXJ0aWZpY2F0ZXMu\n" + "Z29kYWRkeS5jb20vcmVwb3NpdG9yeS9yb290LmNybDBLBgNVHSAERDBCMEAGBFUd\n" + + "IAAwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNv\n" + "bS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOBgQC1\n" + + "QPmnHfbq/qQaQlpE9xXUhUaJwL6e4+PrxeNYiY+Sn1eocSxI0YGyeR+sBjUZsE4O\n" + "WBsUs5iB0QQeyAfJg594RAoYC5jcdnplDQ1tgMQLARzLrUc+cb53S8wGd9D0Vmsf\n" + + "SxOaFIqII6hR8INMqzW/Rn453HWkrugp++85j09VZw==\n" + "-----END CERTIFICATE-----\n" + "-----BEGIN CERTIFICATE-----\n" + + "MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0\n" + "IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz\n" + + "BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y\n" + "aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG\n" + + "9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy\n" + "NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y\n" + + "azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs\n" + "YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw\n" + + "Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl\n" + "cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY\n" + + "dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9\n" + "WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS\n" + + "v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v\n" + "UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu\n" + + "IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC\n" + "W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd\n" + "-----END CERTIFICATE-----\n"; @Column(name = "public_ip_address", nullable = false) private String publicIpAddress; diff --git a/engine/schema/src/com/cloud/vm/DomainRouterVO.java b/engine/schema/src/com/cloud/vm/DomainRouterVO.java index e92a43ac95c..b7d9d8eb435 100755 --- a/engine/schema/src/com/cloud/vm/DomainRouterVO.java +++ b/engine/schema/src/com/cloud/vm/DomainRouterVO.java @@ -76,7 +76,8 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { private Long vpcId; public DomainRouterVO(long id, long serviceOfferingId, long elementId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long domainId, - long accountId, boolean isRedundantRouter, int priority, boolean isPriorityBumpUp, RedundantState redundantState, boolean haEnabled, boolean stopPending, Long vpcId) { + long accountId, boolean isRedundantRouter, int priority, boolean isPriorityBumpUp, RedundantState redundantState, boolean haEnabled, boolean stopPending, + Long vpcId) { super(id, serviceOfferingId, name, name, Type.DomainRouter, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled); this.elementId = elementId; this.isRedundantRouter = isRedundantRouter; @@ -196,6 +197,7 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { this.stopPending = stopPending; } + @Override public String getTemplateVersion() { return this.templateVersion; } diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java b/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java index 25e027f7484..eecb5b165b4 100644 --- a/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java +++ b/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.vm; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -28,10 +26,12 @@ import javax.persistence.SecondaryTable; import javax.persistence.SecondaryTables; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("instance_group_vm_map")) @SecondaryTables({@SecondaryTable(name = "user_vm", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id")}), - @SecondaryTable(name = "instance_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "group_id", referencedColumnName = "id")})}) + @SecondaryTable(name = "instance_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "group_id", referencedColumnName = "id")})}) public class InstanceGroupVMMapVO implements InternalIdentity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -52,6 +52,7 @@ public class InstanceGroupVMMapVO implements InternalIdentity { this.instanceId = instanceId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java index 1d07d94d9cd..1089017e151 100644 --- a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java +++ b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java @@ -28,9 +28,7 @@ import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.SecondaryTable; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "instance_group") @@ -87,6 +85,7 @@ public class InstanceGroupVO implements InstanceGroup { return accountId; } + @Override public long getDomainId() { return domainId; } @@ -95,6 +94,7 @@ public class InstanceGroupVO implements InstanceGroup { return removed; } + @Override public Date getCreated() { return created; } diff --git a/engine/schema/src/com/cloud/vm/NicVO.java b/engine/schema/src/com/cloud/vm/NicVO.java index 5cdb367a588..2865cc82163 100644 --- a/engine/schema/src/com/cloud/vm/NicVO.java +++ b/engine/schema/src/com/cloud/vm/NicVO.java @@ -316,7 +316,15 @@ public class NicVO implements Nic { @Override public String toString() { - return new StringBuilder("Nic[").append(id).append("-").append(instanceId).append("-").append(reservationId).append("-").append(ip4Address).append("]").toString(); + return new StringBuilder("Nic[").append(id) + .append("-") + .append(instanceId) + .append("-") + .append(reservationId) + .append("-") + .append(ip4Address) + .append("]") + .toString(); } @Override @@ -351,6 +359,7 @@ public class NicVO implements Nic { this.ip6Cidr = ip6Cidr; } + @Override public boolean getSecondaryIp() { return secondaryIp; } diff --git a/engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java b/engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java index 153723f4a10..042ac83c7b4 100644 --- a/engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java +++ b/engine/schema/src/com/cloud/vm/SecondaryStorageVmVO.java @@ -63,8 +63,8 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora @Column(name = "last_update", updatable = true, nullable = true) private Date lastUpdateTime; - public SecondaryStorageVmVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, - long accountId, Role role, boolean haEnabled) { + public SecondaryStorageVmVO(long id, long serviceOfferingId, String name, long templateId, HypervisorType hypervisorType, long guestOSId, long dataCenterId, + long domainId, long accountId, Role role, boolean haEnabled) { super(id, serviceOfferingId, name, name, Type.SecondaryStorageVm, templateId, hypervisorType, guestOSId, domainId, accountId, haEnabled); this.role = role; } diff --git a/engine/schema/src/com/cloud/vm/UserVmVO.java b/engine/schema/src/com/cloud/vm/UserVmVO.java index 59278d78d1a..81308afc75e 100755 --- a/engine/schema/src/com/cloud/vm/UserVmVO.java +++ b/engine/schema/src/com/cloud/vm/UserVmVO.java @@ -69,8 +69,8 @@ public class UserVmVO extends VMInstanceVO implements UserVm { return serviceOfferingId; } - public UserVmVO(long id, String instanceName, String displayName, long templateId, HypervisorType hypervisorType, long guestOsId, boolean haEnabled, boolean limitCpuUse, - long domainId, long accountId, long serviceOfferingId, String userData, String name, Long diskOfferingId) { + public UserVmVO(long id, String instanceName, String displayName, long templateId, HypervisorType hypervisorType, long guestOsId, boolean haEnabled, + boolean limitCpuUse, long domainId, long accountId, long serviceOfferingId, String userData, String name, Long diskOfferingId) { super(id, serviceOfferingId, name, instanceName, Type.User, templateId, hypervisorType, guestOsId, domainId, accountId, haEnabled, limitCpuUse, diskOfferingId); this.userData = userData; this.displayName = displayName; diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java index f3f7f919b60..48229b8ea7e 100644 --- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java +++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java @@ -229,6 +229,7 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject im // proxy vm id, count of assignment // private static final String PROXY_ASSIGNMENT_MATRIX = "SELECT c.id, count(runningVm.id) AS count " - + " FROM console_proxy AS c LEFT JOIN vm_instance AS i ON c.id=i.id LEFT JOIN" - + " (SELECT v.id AS id, v.proxy_id AS proxy_id FROM vm_instance AS v WHERE " - + " (v.state='Running' OR v.state='Creating' OR v.state='Starting' OR v.state='Migrating')) " - + " AS runningVm ON c.id = runningVm.proxy_id WHERE i.state='Running' " + " GROUP BY c.id"; + + " FROM console_proxy AS c LEFT JOIN vm_instance AS i ON c.id=i.id LEFT JOIN" + " (SELECT v.id AS id, v.proxy_id AS proxy_id FROM vm_instance AS v WHERE " + + " (v.state='Running' OR v.state='Creating' OR v.state='Starting' OR v.state='Migrating')) " + + " AS runningVm ON c.id = runningVm.proxy_id WHERE i.state='Running' " + " GROUP BY c.id"; // // query SQL for returnning running VM count at data center basis // - private static final String DATACENTER_VM_MATRIX = "SELECT d.id, d.name, count(v.id) AS count" + " FROM data_center AS d LEFT JOIN vm_instance AS v ON v.data_center_id=d.id " - + " WHERE (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" + " GROUP BY d.id, d.name"; + private static final String DATACENTER_VM_MATRIX = "SELECT d.id, d.name, count(v.id) AS count" + + " FROM data_center AS d LEFT JOIN vm_instance AS v ON v.data_center_id=d.id " + + " WHERE (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" + " GROUP BY d.id, d.name"; private static final String DATACENTER_ACTIVE_SESSION_MATRIX = "SELECT d.id, d.name, sum(c.active_session) AS count" - + " FROM data_center AS d LEFT JOIN vm_instance AS v ON v.data_center_id=d.id " - + " LEFT JOIN console_proxy AS c ON v.id=c.id " - + " WHERE v.type='ConsoleProxy' AND (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" - + " GROUP BY d.id, d.name"; + + " FROM data_center AS d LEFT JOIN vm_instance AS v ON v.data_center_id=d.id " + " LEFT JOIN console_proxy AS c ON v.id=c.id " + + " WHERE v.type='ConsoleProxy' AND (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" + " GROUP BY d.id, d.name"; // // query SQL for returnning running console proxy count at data center basis // - private static final String DATACENTER_PROXY_MATRIX = "SELECT d.id, d.name, count(dcid) as count" - + " FROM data_center as d" - + " LEFT JOIN (" - + " SELECT v.data_center_id as dcid, c.active_session as active_session from vm_instance as v" - + " INNER JOIN console_proxy as c ON v.id=c.id AND v.type='ConsoleProxy' AND (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" - + " ) as t ON d.id = t.dcid" + " GROUP BY d.id, d.name"; + private static final String DATACENTER_PROXY_MATRIX = + "SELECT d.id, d.name, count(dcid) as count" + + " FROM data_center as d" + + " LEFT JOIN (" + + " SELECT v.data_center_id as dcid, c.active_session as active_session from vm_instance as v" + + " INNER JOIN console_proxy as c ON v.id=c.id AND v.type='ConsoleProxy' AND (v.state='Creating' OR v.state='Starting' OR v.state='Running' OR v.state='Migrating')" + + " ) as t ON d.id = t.dcid" + " GROUP BY d.id, d.name"; private static final String GET_PROXY_LOAD = "SELECT count(*) AS count" + " FROM vm_instance AS v " - + " WHERE v.proxy_id=? AND (v.state='Running' OR v.state='Starting' OR v.state='Creating' OR v.state='Migrating')"; + + " WHERE v.proxy_id=? AND (v.state='Running' OR v.state='Starting' OR v.state='Creating' OR v.state='Migrating')"; private static final String GET_PROXY_ACTIVE_LOAD = "SELECT active_session AS count" + " FROM console_proxy" + " WHERE id=?"; private static final String STORAGE_POOL_HOST_INFO = "SELECT p.data_center_id, count(ph.host_id) " + " FROM storage_pool p, storage_pool_host_ref ph " - + " WHERE p.id = ph.pool_id AND p.data_center_id = ? " + " GROUP by p.data_center_id"; + + " WHERE p.id = ph.pool_id AND p.data_center_id = ? " + " GROUP by p.data_center_id"; private static final String SHARED_STORAGE_POOL_HOST_INFO = "SELECT p.data_center_id, count(ph.host_id) " + " FROM storage_pool p, storage_pool_host_ref ph " - + " WHERE p.pool_type <> 'LVM' AND p.id = ph.pool_id AND p.data_center_id = ? " + " GROUP by p.data_center_id"; + + " WHERE p.pool_type <> 'LVM' AND p.id = ph.pool_id AND p.data_center_id = ? " + " GROUP by p.data_center_id"; protected SearchBuilder DataCenterStatusSearch; protected SearchBuilder StateSearch; @@ -314,8 +313,9 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase im ; PreparedStatement pstmt = null; try { - pstmt = txn.prepareAutoCloseStatement("SELECT c.id FROM console_proxy c, vm_instance v, host h " - + "WHERE c.id=v.id AND v.state='Running' AND v.host_id=h.id AND h.mgmt_server_id=?"); + pstmt = + txn.prepareAutoCloseStatement("SELECT c.id FROM console_proxy c, vm_instance v, host h " + + "WHERE c.id=v.id AND v.state='Running' AND v.host_id=h.id AND h.mgmt_server_id=?"); pstmt.setLong(1, msid); ResultSet rs = pstmt.executeQuery(); diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index 55cb9525d71..6bee6441e49 100755 --- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -100,7 +100,8 @@ public class DomainRouterDaoImpl extends GenericDaoBase im IdNetworkIdStatesSearch.and("id", IdNetworkIdStatesSearch.entity().getId(), Op.EQ); SearchBuilder joinRouterNetwork1 = _routerNetworkDao.createSearchBuilder(); joinRouterNetwork1.and("networkId", joinRouterNetwork1.entity().getNetworkId(), Op.EQ); - IdNetworkIdStatesSearch.join("networkRouter", joinRouterNetwork1, joinRouterNetwork1.entity().getRouterId(), IdNetworkIdStatesSearch.entity().getId(), JoinType.INNER); + IdNetworkIdStatesSearch.join("networkRouter", joinRouterNetwork1, joinRouterNetwork1.entity().getRouterId(), IdNetworkIdStatesSearch.entity().getId(), + JoinType.INNER); IdNetworkIdStatesSearch.and("states", IdNetworkIdStatesSearch.entity().getState(), Op.IN); IdNetworkIdStatesSearch.done(); @@ -120,7 +121,8 @@ public class DomainRouterDaoImpl extends GenericDaoBase im SearchBuilder joinRouterNetwork4 = _routerNetworkDao.createSearchBuilder(); joinRouterNetwork4.and("networkId", joinRouterNetwork4.entity().getNetworkId(), Op.EQ); joinRouterNetwork4.and("type", joinRouterNetwork4.entity().getGuestType(), Op.EQ); - StateNetworkTypeSearch.join("networkRouter", joinRouterNetwork4, joinRouterNetwork4.entity().getRouterId(), StateNetworkTypeSearch.entity().getId(), JoinType.INNER); + StateNetworkTypeSearch.join("networkRouter", joinRouterNetwork4, joinRouterNetwork4.entity().getRouterId(), StateNetworkTypeSearch.entity().getId(), + JoinType.INNER); SearchBuilder joinHost = _hostsDao.createSearchBuilder(); joinHost.and("mgmtServerId", joinHost.entity().getManagementServerId(), Op.EQ); @@ -344,10 +346,11 @@ public class DomainRouterDaoImpl extends GenericDaoBase im RouterNetworkVO routerNtwkMap = new RouterNetworkVO(router.getId(), guestNetwork.getId(), guestNetwork.getGuestType()); _routerNetworkDao.persist(routerNtwkMap); //2) create user stats entry for the network - UserStatisticsVO stats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), guestNetwork.getId(), null, router.getId(), router.getType() - .toString()); + UserStatisticsVO stats = + _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), guestNetwork.getId(), null, router.getId(), router.getType().toString()); if (stats == null) { - stats = new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), null, router.getId(), router.getType().toString(), guestNetwork.getId()); + stats = + new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), null, router.getId(), router.getType().toString(), guestNetwork.getId()); _userStatsDao.persist(stats); } txn.commit(); diff --git a/engine/schema/src/com/cloud/vm/dao/NicDao.java b/engine/schema/src/com/cloud/vm/dao/NicDao.java index 3c80729778b..fc934750bf3 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDao.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDao.java @@ -16,13 +16,13 @@ // under the License. package com.cloud.vm.dao; +import java.net.URI; +import java.util.List; + import com.cloud.utils.db.GenericDao; import com.cloud.vm.NicVO; import com.cloud.vm.VirtualMachine; -import java.net.URI; -import java.util.List; - public interface NicDao extends GenericDao { List listByVmId(long instanceId); diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java index 1df5beeb44e..8c95a0e8fb9 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java @@ -18,9 +18,10 @@ package com.cloud.vm.dao; import javax.ejb.Local; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; + import com.cloud.vm.NicDetailVO; @Component diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java index 2e04d11dd24..ff3a24b3db0 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java @@ -17,6 +17,7 @@ package com.cloud.vm.dao; import java.util.List; + import com.cloud.utils.db.GenericDao; import com.cloud.vm.NicIpAlias; diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java index 6c2cc86558b..a267218008a 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java @@ -16,6 +16,13 @@ // under the License. package com.cloud.vm.dao; +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; @@ -23,11 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.vm.NicIpAlias; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.ArrayList; -import java.util.List; @Component @Local(value = NicIpAliasDao.class) diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java index cebb36c9591..37aa0e340ad 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java @@ -16,9 +16,8 @@ // under the License. package com.cloud.vm.dao; -import com.cloud.utils.db.GenericDao; -import com.cloud.utils.net.NetUtils; -import com.cloud.vm.NicIpAlias; +import java.util.Date; +import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,8 +27,10 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import java.util.Date; -import java.util.UUID; + +import com.cloud.utils.db.GenericDao; +import com.cloud.utils.net.NetUtils; +import com.cloud.vm.NicIpAlias; @Entity @Table(name = "nic_ip_alias") @@ -103,6 +104,7 @@ public class NicIpAliasVO implements NicIpAlias { @Column(name = "start_ip_of_subnet") String startIpOfSubnet; + @Override public long getId() { return id; } @@ -111,6 +113,7 @@ public class NicIpAliasVO implements NicIpAlias { this.id = id; } + @Override public long getNicId() { return nicId; } @@ -119,6 +122,7 @@ public class NicIpAliasVO implements NicIpAlias { this.nicId = nicId; } + @Override public long getDomainId() { return domainId; } @@ -127,6 +131,7 @@ public class NicIpAliasVO implements NicIpAlias { this.domainId = domainId; } + @Override public long getAccountId() { return accountId; } @@ -135,6 +140,7 @@ public class NicIpAliasVO implements NicIpAlias { this.accountId = accountId; } + @Override public String getIp4Address() { return ip4Address; } @@ -143,6 +149,7 @@ public class NicIpAliasVO implements NicIpAlias { this.ip4Address = ip4Address; } + @Override public String getIp6Address() { return ip6Address; } @@ -151,6 +158,7 @@ public class NicIpAliasVO implements NicIpAlias { this.ip6Address = ip6Address; } + @Override public long getNetworkId() { return networkId; } @@ -167,6 +175,7 @@ public class NicIpAliasVO implements NicIpAlias { this.created = created; } + @Override public String getUuid() { return uuid; } @@ -175,6 +184,7 @@ public class NicIpAliasVO implements NicIpAlias { this.uuid = uuid; } + @Override public long getVmId() { return vmId; } @@ -183,6 +193,7 @@ public class NicIpAliasVO implements NicIpAlias { this.vmId = vmId; } + @Override public Long getAliasCount() { return aliasCount; } @@ -195,10 +206,12 @@ public class NicIpAliasVO implements NicIpAlias { this.netmask = netmask; } + @Override public String getNetmask() { return netmask; } + @Override public String getGateway() { return gateway; } diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java index 76025668f05..9fbfa279089 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java +++ b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDao.java @@ -17,6 +17,7 @@ package com.cloud.vm.dao; import java.util.List; + import com.cloud.utils.db.GenericDao; public interface NicSecondaryIpDao extends GenericDao { diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java index 903585c4da6..78b779f6a02 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java @@ -77,6 +77,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { @Column(name = "vmId") Long vmId; + @Override public long getId() { return id; } @@ -85,6 +86,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.id = id; } + @Override public long getNicId() { return nicId; } @@ -93,6 +95,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.nicId = nicId; } + @Override public long getDomainId() { return domainId; } @@ -101,6 +104,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.domainId = domainId; } + @Override public long getAccountId() { return accountId; } @@ -109,6 +113,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.accountId = accountId; } + @Override public String getIp4Address() { return ip4Address; } @@ -125,6 +130,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.ip6Address = ip6Address; } + @Override public long getNetworkId() { return networkId; } @@ -141,6 +147,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.created = created; } + @Override public String getUuid() { return uuid; } @@ -149,6 +156,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp { this.uuid = uuid; } + @Override public long getVmId() { return vmId; } diff --git a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java index 9739266e20e..1f382d6ab6e 100644 --- a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java @@ -173,10 +173,12 @@ public class SecondaryStorageVmDaoImpl extends GenericDaoBase implements Use @Inject ResourceTagDao _tagsDao; - private static final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT = "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 final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT = + "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; @@ -185,7 +184,8 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use AccountDataCenterVirtualSearch = createSearchBuilder(); AccountDataCenterVirtualSearch.and("account", AccountDataCenterVirtualSearch.entity().getAccountId(), SearchCriteria.Op.EQ); AccountDataCenterVirtualSearch.and("dc", AccountDataCenterVirtualSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); - AccountDataCenterVirtualSearch.join("nicSearch", nicSearch, AccountDataCenterVirtualSearch.entity().getId(), nicSearch.entity().getInstanceId(), JoinBuilder.JoinType.INNER); + AccountDataCenterVirtualSearch.join("nicSearch", nicSearch, AccountDataCenterVirtualSearch.entity().getId(), nicSearch.entity().getInstanceId(), + JoinBuilder.JoinType.INNER); AccountDataCenterVirtualSearch.done(); UserVmByIsoSearch = createSearchBuilder(); diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmData.java b/engine/schema/src/com/cloud/vm/dao/UserVmData.java index 1963d70f5c8..ff4a3c277dd 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmData.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmData.java @@ -712,6 +712,7 @@ public class UserVmData { } + @Override public String toString() { return "id=" + id + ", name=" + name; } diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index 74019658868..3f931208417 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -18,9 +18,10 @@ package com.cloud.vm.dao; import javax.ejb.Local; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; + import com.cloud.vm.UserVmDetailVO; @Component diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index 3eae32c3298..2381e5f03aa 100644 --- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -95,14 +95,18 @@ public class VMInstanceDaoImpl extends GenericDaoBase implem protected Attribute _updateTimeAttr; - private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 = "SELECT host.cluster_id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id WHERE "; - private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = " AND host.type = 'Routing' AND host.removed is null GROUP BY host.cluster_id ORDER BY 2 ASC "; + private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 = + "SELECT host.cluster_id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id WHERE "; + private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = + " AND host.type = 'Routing' AND host.removed is null GROUP BY host.cluster_id ORDER BY 2 ASC "; - private static final String ORDER_PODS_NUMBER_OF_VMS_FOR_ACCOUNT = "SELECT pod.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host_pod_ref` pod LEFT JOIN `cloud`.`vm_instance` vm ON pod.id = vm.pod_id WHERE pod.data_center_id = ? AND pod.removed is null " - + " GROUP BY pod.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 " + + " 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 "; + 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 "; private static final String ORDER_HOSTS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = " GROUP BY host.id ORDER BY 2 ASC "; diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java index 128069ab17d..79fd274618b 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java +++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java @@ -41,7 +41,12 @@ import com.cloud.utils.db.GenericDao; @Table(name = "vm_snapshots") public class VMSnapshotVO implements VMSnapshot { @Id - @TableGenerator(name = "vm_snapshots_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "vm_snapshots_seq", allocationSize = 1) + @TableGenerator(name = "vm_snapshots_sq", + table = "sequence", + pkColumnName = "name", + valueColumnName = "value", + pkColumnValue = "vm_snapshots_seq", + allocationSize = 1) @GeneratedValue(strategy = GenerationType.TABLE) @Column(name = "id") Long id; @@ -105,6 +110,7 @@ public class VMSnapshotVO implements VMSnapshot { this.options = options; } + @Override public Long getParent() { return parent; } @@ -117,6 +123,7 @@ public class VMSnapshotVO implements VMSnapshot { } + @Override public Date getRemoved() { return removed; } @@ -134,6 +141,7 @@ public class VMSnapshotVO implements VMSnapshot { this.current = current; } + @Override public String getDescription() { return description; } @@ -203,6 +211,7 @@ public class VMSnapshotVO implements VMSnapshot { this.displayName = displayName; } + @Override public Boolean getCurrent() { return current; } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java index ea37194a117..e1357cdc232 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java @@ -23,9 +23,10 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.domain.PartOf; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.domain.PartOf; + @Entity @Table(name = "affinity_group_domain_map") public class AffinityGroupDomainMapVO implements PartOf, InternalIdentity { diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java index 0c696fb6301..0670060419a 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java @@ -21,9 +21,6 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; import javax.persistence.Table; import org.apache.cloudstack.api.InternalIdentity; @@ -50,6 +47,7 @@ public class AffinityGroupVMMapVO implements InternalIdentity { this.instanceId = instanceId; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java index 425935dc299..76a81440c70 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupVO; + import com.cloud.utils.db.GenericDao; public interface AffinityGroupDao extends GenericDao { diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java index dbab53c6af4..c63b04b4e74 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java @@ -28,9 +28,9 @@ import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO; import org.apache.cloudstack.affinity.AffinityGroupVO; import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.JoinBuilder.JoinType; @Local(value = {AffinityGroupDao.class}) public class AffinityGroupDaoImpl extends GenericDaoBase implements AffinityGroupDao { @@ -69,7 +69,8 @@ public class AffinityGroupDaoImpl extends GenericDaoBase DomainLevelNameSearch = createSearchBuilder(); DomainLevelNameSearch.and("name", DomainLevelNameSearch.entity().getName(), SearchCriteria.Op.EQ); DomainLevelNameSearch.and("aclType", DomainLevelNameSearch.entity().getAclType(), SearchCriteria.Op.EQ); - DomainLevelNameSearch.join("domainMapSearch", domainMapSearch, domainMapSearch.entity().getAffinityGroupId(), DomainLevelNameSearch.entity().getId(), JoinType.INNER); + DomainLevelNameSearch.join("domainMapSearch", domainMapSearch, domainMapSearch.entity().getAffinityGroupId(), DomainLevelNameSearch.entity().getId(), + JoinType.INNER); DomainLevelNameSearch.done(); AccountIdTypeSearch = createSearchBuilder(); @@ -81,7 +82,8 @@ public class AffinityGroupDaoImpl extends GenericDaoBase DomainLevelTypeSearch = createSearchBuilder(); DomainLevelTypeSearch.and("type", DomainLevelTypeSearch.entity().getType(), SearchCriteria.Op.EQ); DomainLevelTypeSearch.and("aclType", DomainLevelTypeSearch.entity().getAclType(), SearchCriteria.Op.EQ); - DomainLevelTypeSearch.join("domainTypeSearch", domainTypeSearch, domainTypeSearch.entity().getAffinityGroupId(), DomainLevelTypeSearch.entity().getId(), JoinType.INNER); + DomainLevelTypeSearch.join("domainTypeSearch", domainTypeSearch, domainTypeSearch.entity().getAffinityGroupId(), DomainLevelTypeSearch.entity().getId(), + JoinType.INNER); DomainLevelTypeSearch.done(); } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java index 0c1dc38b7e9..5ecf63d6a6c 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDomainMapDaoImpl.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.affinity.dao; import java.util.List; import javax.annotation.PostConstruct; + import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO; import com.cloud.utils.db.GenericDaoBase; @@ -56,7 +57,7 @@ public class AffinityGroupDomainMapDaoImpl extends GenericDaoBase listByDomain(Object... domainId) { SearchCriteria sc = DomainsSearch.create(); - sc.setParameters("domainId", (Object[])domainId); + sc.setParameters("domainId", domainId); return listBy(sc); } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java index 20c2fa6edff..aac67ec0525 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java @@ -24,6 +24,7 @@ import javax.inject.Inject; import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; import org.apache.cloudstack.affinity.AffinityGroupVO; + import com.cloud.utils.Pair; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java index a8270cd0b83..ae6a807f500 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java @@ -52,6 +52,7 @@ public class VMComputeTagVO implements InternalIdentity { this.computeTag = tag; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java index 716cc90f304..a4a0cc9877c 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java @@ -234,6 +234,7 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject private void saveVolumeReservation(VMReservationVO reservation) { if (reservation.getVolumeReservation() != null) { for (Long volumeId : reservation.getVolumeReservation().keySet()) { - VolumeReservationVO volumeReservation = new VolumeReservationVO(reservation.getVmId(), volumeId, reservation.getVolumeReservation().get(volumeId), - reservation.getId()); + VolumeReservationVO volumeReservation = + new VolumeReservationVO(reservation.getVmId(), volumeId, reservation.getVolumeReservation().get(volumeId), reservation.getId()); _volumeReservationDao.persist(volumeReservation); } } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java index b6d887807f9..3e35150bae6 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java @@ -22,10 +22,10 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.ejb.Local; -import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; - import org.springframework.stereotype.Component; +import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java index 64220ddd3fa..b864b75e7a8 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java @@ -20,13 +20,11 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.ejb.Local; -import javax.inject.Inject; -import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; -import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; import org.springframework.stereotype.Component; -import com.cloud.host.dao.HostTagsDaoImpl; +import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java index b52ae2d71b4..9a1b5a03655 100644 --- a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java @@ -21,9 +21,10 @@ import java.util.List; import javax.ejb.Local; -import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.springframework.stereotype.Component; +import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; + import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.State; import com.cloud.network.rules.LoadBalancerContainer.Scheme; diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java index 0e8f74fdeae..753995e6175 100755 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpDao.java @@ -18,9 +18,6 @@ package org.apache.cloudstack.region; import java.util.List; -import com.cloud.dc.Vlan; -import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; import com.cloud.utils.db.GenericDao; public interface PortableIpDao extends GenericDao { diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java index c3b4898136f..08717748f41 100755 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java @@ -16,33 +16,15 @@ // under the License. package org.apache.cloudstack.region; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; -import com.cloud.dc.AccountVlanMapVO; -import com.cloud.dc.PodVlanMapVO; -import com.cloud.dc.Vlan; -import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; -import com.cloud.network.dao.IPAddressDao; -import com.cloud.utils.Pair; -import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {PortableIpDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java index 85da6c0a87e..3028673329a 100755 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDao.java @@ -18,9 +18,6 @@ package org.apache.cloudstack.region; import java.util.List; -import com.cloud.dc.Vlan; -import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; import com.cloud.utils.db.GenericDao; public interface PortableIpRangeDao extends GenericDao { diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java index e76ba4fcde6..e9fdb000a39 100755 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java @@ -16,33 +16,15 @@ // under the License. package org.apache.cloudstack.region; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; -import com.cloud.dc.AccountVlanMapVO; -import com.cloud.dc.PodVlanMapVO; -import com.cloud.dc.Vlan; -import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; -import com.cloud.network.dao.IPAddressDao; -import com.cloud.utils.Pair; -import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {PortableIpRangeDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java index 645ccfa0c1a..338ec6c47c0 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java @@ -20,16 +20,11 @@ import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - @Entity @Table(name = "portable_ip_range") public class PortableIpRangeVO implements PortableIpRange { diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java index 932aa04d23b..06d0508bede 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java @@ -17,12 +17,15 @@ package org.apache.cloudstack.region; import java.util.Date; -import java.util.UUID; -import javax.persistence.*; - -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; @Entity @Table(name = "portable_ip_address") diff --git a/engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java b/engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java index 2aa13c45ad8..bb92b666af7 100644 --- a/engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/RegionSyncVO.java @@ -53,6 +53,7 @@ public class RegionSyncVO implements RegionSync { this.api = api; } + @Override public int getRegionId() { return regionId; } @@ -61,6 +62,7 @@ public class RegionSyncVO implements RegionSync { this.regionId = regionId; } + @Override public String getApi() { return api; } @@ -69,6 +71,7 @@ public class RegionSyncVO implements RegionSync { this.api = api; } + @Override public Date getCreateDate() { return createDate; } @@ -85,6 +88,7 @@ public class RegionSyncVO implements RegionSync { this.processed = processed; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/RegionVO.java b/engine/schema/src/org/apache/cloudstack/region/RegionVO.java index 9df966faae1..608bd2b1587 100644 --- a/engine/schema/src/org/apache/cloudstack/region/RegionVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/RegionVO.java @@ -59,18 +59,22 @@ public class RegionVO implements Region { this.gslbEnabled = true; } + @Override public int getId() { return id; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public String getEndPoint() { return endPoint; } diff --git a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java index 65587e53635..d7f102d6059 100644 --- a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java @@ -18,10 +18,11 @@ package org.apache.cloudstack.region.dao; import javax.ejb.Local; -import org.apache.cloudstack.region.RegionVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.region.RegionVO; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java index 2c4eb0f9b6d..6676fa0ee8c 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java @@ -17,13 +17,15 @@ package org.apache.cloudstack.region.gslb; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = {GlobalLoadBalancerRuleDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java index 5ce0b403a70..c2e0d7a56c4 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDao.java @@ -17,10 +17,10 @@ package org.apache.cloudstack.region.gslb; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface GlobalLoadBalancerLbRuleMapDao extends GenericDao { List listByGslbRuleId(long gslbRuleId); diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java index 77fc6dd788b..77f20d74e7b 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java @@ -17,14 +17,16 @@ package org.apache.cloudstack.region.gslb; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = {GlobalLoadBalancerLbRuleMapDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java index f1551ee9c5b..9445dc916d5 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java @@ -17,8 +17,6 @@ package org.apache.cloudstack.region.gslb; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -26,6 +24,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("global_load_balancer_lb_rule_map")) public class GlobalLoadBalancerLbRuleMapVO implements InternalIdentity { @@ -57,6 +57,7 @@ public class GlobalLoadBalancerLbRuleMapVO implements InternalIdentity { this.weight = weight; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java index cfc86256c42..1bbfe615a7c 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleDao.java @@ -17,10 +17,10 @@ package org.apache.cloudstack.region.gslb; -import com.cloud.utils.db.GenericDao; - import java.util.List; +import com.cloud.utils.db.GenericDao; + public interface GlobalLoadBalancerRuleDao extends GenericDao { List listByRegionId(int regionId); diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java index 60b6132b6ee..b7b720d31f0 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java @@ -17,11 +17,19 @@ package org.apache.cloudstack.region.gslb; -import com.cloud.region.ha.GlobalLoadBalancerRule; - -import javax.persistence.*; import java.util.UUID; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import com.cloud.region.ha.GlobalLoadBalancerRule; + @Entity @Table(name = ("global_load_balancing_rules")) public class GlobalLoadBalancerRuleVO implements GlobalLoadBalancerRule { @@ -69,8 +77,8 @@ public class GlobalLoadBalancerRuleVO implements GlobalLoadBalancerRule { this.uuid = UUID.randomUUID().toString(); } - public GlobalLoadBalancerRuleVO(String name, String description, String gslbDomain, String algorithm, String persistence, String serviceType, int regionId, long accountId, - long domainId, State state) { + public GlobalLoadBalancerRuleVO(String name, String description, String gslbDomain, String algorithm, String persistence, String serviceType, int regionId, + long accountId, long domainId, State state) { this.name = name; this.description = description; this.region = regionId; diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java index f0f04c4cd6b..1c1e83910f2 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java @@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; -import org.springframework.stereotype.Component; @Component @Local(value = {FirewallRuleDetailsDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java index d1402434d54..e8f312e054f 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java @@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.RemoteAccessVpnDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; -import org.springframework.stereotype.Component; @Component @Local(value = {RemoteAccessVpnDetailsDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java index 71650abb9fe..a8d211ec745 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java @@ -18,9 +18,10 @@ package org.apache.cloudstack.resourcedetail.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.UserIpAddressDetailVO; -import org.springframework.stereotype.Component; @Component @Local(value = {UserIpAddressDetailsDao.class}) diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java index b9221489e05..66014377004 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.storage.datastore.db; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "image_store_details") public class ImageStoreDetailVO implements InternalIdentity { @@ -51,6 +51,7 @@ public class ImageStoreDetailVO implements InternalIdentity { this.value = value; } + @Override public long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java index 7ecb371b188..77e50bddbf3 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java @@ -90,14 +90,17 @@ public class ImageStoreVO implements ImageStore { this.role = role; } + @Override public long getId() { return this.id; } + @Override public String getName() { return this.name; } + @Override public String getProviderName() { return this.providerName; } @@ -114,6 +117,7 @@ public class ImageStoreVO implements ImageStore { this.protocol = protocol; } + @Override public String getProtocol() { return this.protocol; } @@ -122,6 +126,7 @@ public class ImageStoreVO implements ImageStore { this.dcId = dcId; } + @Override public Long getDataCenterId() { return this.dcId; } @@ -138,6 +143,7 @@ public class ImageStoreVO implements ImageStore { this.uuid = uuid; } + @Override public String getUuid() { return this.uuid; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java index 16e8322eb5d..1a5949459ea 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java @@ -28,8 +28,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.springframework.stereotype.Component; - import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.ScopeType; @@ -57,9 +55,11 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase @Inject protected StoragePoolDetailsDao _detailsDao; - private final String DetailsSqlPrefix = "SELECT storage_pool.* from storage_pool LEFT JOIN storage_pool_details ON storage_pool.id = storage_pool_details.pool_id WHERE storage_pool.removed is null and storage_pool.status = 'Up' and storage_pool.data_center_id = ? and (storage_pool.pod_id = ? or storage_pool.pod_id is null) and storage_pool.scope = ? and ("; + private final String DetailsSqlPrefix = + "SELECT storage_pool.* from storage_pool LEFT JOIN storage_pool_details ON storage_pool.id = storage_pool_details.pool_id WHERE storage_pool.removed is null and storage_pool.status = 'Up' and storage_pool.data_center_id = ? and (storage_pool.pod_id = ? or storage_pool.pod_id is null) and storage_pool.scope = ? and ("; private final String DetailsSqlSuffix = ") GROUP BY storage_pool_details.pool_id HAVING COUNT(storage_pool_details.name) >= ?"; - private final String ZoneWideDetailsSqlPrefix = "SELECT storage_pool.* from storage_pool LEFT JOIN storage_pool_details ON storage_pool.id = storage_pool_details.pool_id WHERE storage_pool.removed is null and storage_pool.status = 'Up' and storage_pool.data_center_id = ? and storage_pool.scope = ? and ("; + private final String ZoneWideDetailsSqlPrefix = + "SELECT storage_pool.* from storage_pool LEFT JOIN storage_pool_details ON storage_pool.id = storage_pool_details.pool_id WHERE storage_pool.removed is null and storage_pool.status = 'Up' and storage_pool.data_center_id = ? and storage_pool.scope = ? and ("; private final String ZoneWideDetailsSqlSuffix = ") GROUP BY storage_pool_details.pool_id HAVING COUNT(storage_pool_details.name) >= ?"; private final String FindPoolTagDetails = "SELECT storage_pool_details.name FROM storage_pool_details WHERE pool_id = ? and value = ?"; @@ -249,7 +249,11 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase } for (Map.Entry detail : details.entrySet()) { - sql.append("((storage_pool_details.name='").append(detail.getKey()).append("') AND (storage_pool_details.value='").append(detail.getValue()).append("')) OR "); + sql.append("((storage_pool_details.name='") + .append(detail.getKey()) + .append("') AND (storage_pool_details.value='") + .append(detail.getValue()) + .append("')) OR "); } sql.delete(sql.length() - 4, sql.length()); sql.append(DetailsSqlSuffix); @@ -325,7 +329,11 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase StringBuilder sql = new StringBuilder(ZoneWideDetailsSqlPrefix); for (Map.Entry detail : details.entrySet()) { - sql.append("((storage_pool_details.name='").append(detail.getKey()).append("') AND (storage_pool_details.value='").append(detail.getValue()).append("')) OR "); + sql.append("((storage_pool_details.name='") + .append(detail.getKey()) + .append("') AND (storage_pool_details.value='") + .append(detail.getValue()) + .append("')) OR "); } sql.delete(sql.length() - 4, sql.length()); sql.append(ZoneWideDetailsSqlSuffix); diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java index 77d5256bb9a..8b68d6c9038 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java @@ -197,7 +197,14 @@ public class SnapshotDataStoreVO implements StateObject context = new TemplateOpContext(null, (TemplateObject)templateOnStore, future); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); @@ -688,7 +693,8 @@ public class TemplateServiceImpl implements TemplateService { try { TemplateApiResult result = future.get(); if (result.isFailed()) { - throw new CloudRuntimeException("sync template from cache to region wide store failed for image store " + store.getName() + ":" + result.getResult()); + throw new CloudRuntimeException("sync template from cache to region wide store failed for image store " + store.getName() + ":" + + result.getResult()); } _cacheMgr.releaseCacheObject(srcTemplate); // reduce reference count for template on cache, so it can recycled by schedule } catch (Exception ex) { @@ -704,7 +710,7 @@ public class TemplateServiceImpl implements TemplateService { String url = generateCopyUrl(srcTemplate); if (url == null) { s_logger.warn("Unable to start/resume copy of template " + srcTemplate.getUniqueName() + " to " + destStore.getName() + - ", no secondary storage vm in running state in source zone"); + ", no secondary storage vm in running state in source zone"); throw new CloudRuntimeException("No secondary VM in running state in source template zone "); } @@ -838,8 +844,9 @@ public class TemplateServiceImpl implements TemplateService { for (VMTemplateVO tmplt : rtngTmplts) { TemplateDataStoreVO tmpltStore = _vmTemplateStoreDao.findByStoreTemplate(storeId, tmplt.getId()); if (tmpltStore == null) { - tmpltStore = new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, - TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + File.separator, tmplt.getUrl()); + tmpltStore = + new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, + TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + File.separator, tmplt.getUrl()); tmpltStore.setSize(0L); tmpltStore.setPhysicalSize(0); // no size information for // pre-seeded system vm templates diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java index 2d0182e0d26..8da7eb7dab2 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java @@ -24,6 +24,8 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.ImageStoreProvider; @@ -39,7 +41,6 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; import org.apache.cloudstack.storage.to.ImageStoreTO; -import org.apache.log4j.Logger; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.capacity.dao.CapacityDao; diff --git a/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java b/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java index 2a2ef9c201a..a16a3334d1e 100644 --- a/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java +++ b/engine/storage/integration-test/test/com/cloud/vm/snapshot/dao/VmSnapshotDaoTest.java @@ -24,12 +24,13 @@ import javax.inject.Inject; import junit.framework.Assert; -import org.apache.cloudstack.storage.test.CloudStackTestNGBase; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.storage.test.CloudStackTestNGBase; + import com.cloud.vm.snapshot.VMSnapshotDetailsVO; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java index 0a390e5b266..896342890c8 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java @@ -16,35 +16,19 @@ // under the License. package org.apache.cloudstack.storage; -import static com.cloud.utils.StringUtils.join; -import static java.util.Arrays.asList; - -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; import java.util.HashMap; -import java.util.List; import javax.naming.ConfigurationException; -import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource; -import org.apache.cloudstack.storage.template.DownloadManagerImpl; import org.springframework.stereotype.Component; -import com.amazonaws.services.s3.model.S3ObjectSummary; +import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource; +import org.apache.cloudstack.storage.template.DownloadManagerImpl; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; -import com.cloud.agent.api.storage.DownloadAnswer; -import com.cloud.agent.api.to.DataStoreTO; -import com.cloud.agent.api.to.NfsTO; -import com.cloud.agent.api.to.S3TO; -import com.cloud.agent.api.to.SwiftTO; import com.cloud.storage.JavaStorageLayer; import com.cloud.storage.StorageLayer; -import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; -import com.cloud.utils.S3Utils; -import com.cloud.utils.UriUtils; -import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; @Component diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java index 26a70bb005a..bb74a3780f0 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTest.java @@ -118,8 +118,9 @@ public class StorageAllocatorTest { } protected void createDb() { - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); @@ -162,7 +163,9 @@ public class StorageAllocatorTest { diskOffering = diskOfferingDao.persist(diskOffering); diskOfferingId = diskOffering.getId(); - volume = new VolumeVO(Volume.Type.ROOT, "volume", dcId, 1, 1, diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getMinIops(), diskOffering.getMaxIops(), ""); + volume = + new VolumeVO(Volume.Type.ROOT, "volume", dcId, 1, 1, diskOffering.getId(), diskOffering.getDiskSize(), diskOffering.getMinIops(), diskOffering.getMaxIops(), + ""); volume = volumeDao.persist(volume); volumeId = volume.getId(); } diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java index 1d312c2cba7..3b50f53c4ad 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java @@ -18,9 +18,6 @@ package org.apache.cloudstack.storage.allocator; import java.io.IOException; -import org.apache.cloudstack.storage.allocator.StorageAllocatorTestConfiguration.Library; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; -import org.apache.cloudstack.test.utils.SpringUtils; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -31,6 +28,10 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.storage.allocator.StorageAllocatorTestConfiguration.Library; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.dc.dao.DataCenterDaoImpl; import com.cloud.domain.dao.DomainDaoImpl; import com.cloud.host.dao.HostDaoImpl; @@ -41,7 +42,7 @@ import com.cloud.vm.UserVmManager; @Configuration @ComponentScan(basePackageClasses = {StoragePoolDetailsDaoImpl.class, PrimaryDataStoreDaoImpl.class, VMTemplateDaoImpl.class, HostDaoImpl.class, DomainDaoImpl.class, - DataCenterDaoImpl.class}, includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) + DataCenterDaoImpl.class}, includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public class StorageAllocatorTestConfiguration { @Bean public UserVmManager UserVmManager() { diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java index d0252dba43a..61a04c5307d 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRUTest.java @@ -18,13 +18,20 @@ */ package org.apache.cloudstack.storage.cache.manager; -import com.cloud.storage.DataStoreRole; -import com.cloud.storage.Storage; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.dao.VMTemplateDao; -import com.cloud.utils.DateUtil; -import com.cloud.utils.component.ComponentContext; +import java.util.Calendar; +import java.util.Date; +import java.util.UUID; + +import javax.inject.Inject; + import junit.framework.Assert; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -33,16 +40,13 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.inject.Inject; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.Storage; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.utils.DateUtil; +import com.cloud.utils.component.ComponentContext; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/storageContext.xml") diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java index e51155d9d13..233b0461150 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.storage.test; import org.aspectj.lang.ProceedingJoinPoint; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class AopTestAdvice { diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java index 1662f3bcd9d..9a676f9201f 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java @@ -16,6 +16,28 @@ // under the License. package org.apache.cloudstack.storage.test; +import java.io.IOException; + +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import org.apache.cloudstack.acl.APIChecker; +import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; +import org.apache.cloudstack.engine.service.api.OrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; +import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; +import org.apache.cloudstack.framework.rpc.RpcProvider; +import org.apache.cloudstack.storage.cache.manager.StorageCacheManagerImpl; +import org.apache.cloudstack.storage.test.ChildTestConfiguration.Library; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.agent.AgentManager; import com.cloud.alert.AlertManager; import com.cloud.capacity.dao.CapacityDaoImpl; @@ -24,10 +46,10 @@ import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; import com.cloud.dc.ClusterDetailsDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.HostPodDaoImpl; import com.cloud.dc.dao.PodVlanDaoImpl; import com.cloud.domain.dao.DomainDaoImpl; @@ -73,37 +95,17 @@ import com.cloud.vm.dao.UserVmDaoImpl; import com.cloud.vm.dao.UserVmDetailsDaoImpl; import com.cloud.vm.dao.VMInstanceDaoImpl; import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl; -import org.apache.cloudstack.acl.APIChecker; -import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; -import org.apache.cloudstack.engine.service.api.OrchestrationService; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; -import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; -import org.apache.cloudstack.framework.rpc.RpcProvider; -import org.apache.cloudstack.storage.cache.manager.StorageCacheManagerImpl; -import org.apache.cloudstack.storage.test.ChildTestConfiguration.Library; -import org.apache.cloudstack.test.utils.SpringUtils; -import org.mockito.Mockito; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; - -import java.io.IOException; @Configuration @ComponentScan(basePackageClasses = {NicDaoImpl.class, VMInstanceDaoImpl.class, VMTemplateHostDaoImpl.class, VolumeHostDaoImpl.class, VolumeDaoImpl.class, - VMTemplatePoolDaoImpl.class, ResourceTagsDaoImpl.class, VMTemplateDaoImpl.class, MockStorageMotionStrategy.class, ConfigurationDaoImpl.class, - ClusterDaoImpl.class, HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, - HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, - PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, DiskOfferingDaoImpl.class, StoragePoolHostDaoImpl.class, UserVmDaoImpl.class, - UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, VMSnapshotDaoImpl.class, OCFS2ManagerImpl.class, - ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class, ConsoleProxyDaoImpl.class, StoragePoolWorkDaoImpl.class, StorageCacheManagerImpl.class, - UserDaoImpl.class, DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class, DownloadMonitorImpl.class, AccountDaoImpl.class, - ActionEventUtils.class, EventDaoImpl.class}, + VMTemplatePoolDaoImpl.class, ResourceTagsDaoImpl.class, VMTemplateDaoImpl.class, MockStorageMotionStrategy.class, ConfigurationDaoImpl.class, + ClusterDaoImpl.class, HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, + DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, DiskOfferingDaoImpl.class, StoragePoolHostDaoImpl.class, + UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, VMSnapshotDaoImpl.class, + OCFS2ManagerImpl.class, ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class, ConsoleProxyDaoImpl.class, StoragePoolWorkDaoImpl.class, + StorageCacheManagerImpl.class, UserDaoImpl.class, DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class, + DownloadMonitorImpl.class, AccountDaoImpl.class, ActionEventUtils.class, EventDaoImpl.class}, includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public class ChildTestConfiguration extends TestConfiguration { diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java index 0731e058610..51e49431b85 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java @@ -25,7 +25,6 @@ import org.testng.annotations.Parameters; import org.testng.annotations.Test; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests { @@ -72,11 +71,11 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests { @BeforeMethod(alwaysRun = true) @Parameters({"devcloud-host-uuid", "devcloud-host-gateway", "devcloud-host-cidr", "devcloud-host-ip", "template-url", "devcloud-local-storage-uuid", - "primary-storage-want-to-add", "devcloud-secondary-storage", "s3-accesskey", "s3-secretkey", "s3-endpoint", "s3-template-bucket", "s3-usehttps", "image-install-path", - "primary-storage-uuid-want-to-add", "script-path", "hypervisor"}) - protected void setup(String hostuuid, String gateway, String cidr, String hostIp, String templateUrl, String localStorageUuid, String primaryStorage, String secondaryStorage, - String s3_accessKey, String s3_secretKey, String s3_endpoint, String s3_template_bucket, String s3_usehttps, String imageInstallPath, String primaryStorageUuid, - String scriptPath, String hypervisor) { + "primary-storage-want-to-add", "devcloud-secondary-storage", "s3-accesskey", "s3-secretkey", "s3-endpoint", "s3-template-bucket", "s3-usehttps", + "image-install-path", "primary-storage-uuid-want-to-add", "script-path", "hypervisor"}) + protected void setup(String hostuuid, String gateway, String cidr, String hostIp, String templateUrl, String localStorageUuid, String primaryStorage, + String secondaryStorage, String s3_accessKey, String s3_secretKey, String s3_endpoint, String s3_template_bucket, String s3_usehttps, String imageInstallPath, + String primaryStorageUuid, String scriptPath, String hypervisor) { this.hostGuid = hostuuid; this.hostGateway = gateway; this.hostCidr = cidr; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index eaa5a90bb86..5151629e87d 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -26,10 +26,6 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.host.Host; -import com.cloud.host.Status; -import com.cloud.utils.fsm.NoTransitionException; -import com.cloud.utils.fsm.StateMachine2; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -157,8 +153,8 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa String password = clusterDetailsDao.findDetail(cluster.getId(), "password").getValue(); VmwareServerDiscoverer discover = new VmwareServerDiscoverer(); - Map> resources = discover.find(host.getDataCenterId(), host.getPodId(), host.getClusterId(), uri, userName, password, - null); + Map> resources = + discover.find(host.getDataCenterId(), host.getPodId(), host.getClusterId(), uri, userName, password, null); for (Map.Entry> entry : resources.entrySet()) { resource = entry.getKey(); } diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java index 26c0b741cdc..71c7c8dd916 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java @@ -76,8 +76,9 @@ public class DirectAgentTest extends CloudStackTestNGBase { return; } // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java index d507eeae4a6..9227c887813 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java @@ -28,12 +28,12 @@ import java.util.UUID; import javax.inject.Inject; -import com.cloud.server.LockMasterListener; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -59,9 +59,6 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.agent.AgentManager; - -import com.cloud.agent.AgentManager; - import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterVO; @@ -77,6 +74,7 @@ import com.cloud.hypervisor.Hypervisor; import com.cloud.org.Cluster; import com.cloud.org.Managed; import com.cloud.resource.ResourceState; +import com.cloud.server.LockMasterListener; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; @@ -151,8 +149,9 @@ public class EndpointSelectorTest { public void setUp() { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, - null, true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, + null, true, true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -178,7 +177,7 @@ public class EndpointSelectorTest { imageStore.setProtocol("nfs"); imageStore = imageStoreDao.persist(imageStore); - when(primaryDataStoreProvider.configure(Mockito.anyMap())).thenReturn(true); + when(primaryDataStoreProvider.configure(Matchers.anyMap())).thenReturn(true); Set types = new HashSet(); types.add(DataStoreProvider.DataStoreProviderType.PRIMARY); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java index 99de7cc0179..0485d9b08b8 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java @@ -18,22 +18,17 @@ */ package org.apache.cloudstack.storage.test; -import com.cloud.storage.snapshot.SnapshotScheduler; -import com.cloud.storage.snapshot.SnapshotSchedulerImpl; -import com.cloud.user.DomainManager; -import com.cloud.utils.component.ComponentContext; - -import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; -import org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl; -import org.apache.cloudstack.storage.datastore.type.DataStoreType; -import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; -import java.util.HashSet; -import java.util.Set; +import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; +import org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl; +import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector; + +import com.cloud.storage.snapshot.SnapshotScheduler; +import com.cloud.user.DomainManager; +import com.cloud.utils.component.ComponentContext; public class FakeDriverTestConfiguration extends ChildTestConfiguration { @Bean diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java index 60308da274b..25f96c26750 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java @@ -18,9 +18,10 @@ package org.apache.cloudstack.storage.test; import javax.inject.Inject; -import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.log4j.Logger; +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java index f3b1a9c507f..d1a7743cf7c 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java @@ -16,6 +16,9 @@ // under the License. package org.apache.cloudstack.storage.test; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -23,6 +26,11 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.annotations.Test; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -42,20 +50,15 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailVO; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertNotNull; -import com.cloud.dc.DataCenterVO; + import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.Storage.TemplateType; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.download.DownloadMonitorImpl; import com.cloud.utils.component.ComponentContext; @@ -91,8 +94,9 @@ public class S3TemplateTest extends CloudStackTestNGBase { public void setUp() { ComponentContext.initComponentsLifeCycle(); // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java index c6d47279acb..f1f9383bfce 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java @@ -18,6 +18,56 @@ */ package org.apache.cloudstack.storage.test; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ExecutionException; + +import javax.inject.Inject; + +import junit.framework.Assert; + +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; + +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; +import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation; +import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.storage.LocalHostEndpoint; +import org.apache.cloudstack.storage.MockLocalNfsSecondaryStorageResource; +import org.apache.cloudstack.storage.RemoteHostEndPoint; +import org.apache.cloudstack.storage.command.CopyCmdAnswer; +import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; +import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.to.TemplateObjectTO; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Command; import com.cloud.dc.ClusterVO; @@ -53,52 +103,6 @@ import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.component.ComponentContext; -import junit.framework.Assert; -import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; -import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; -import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService; -import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy; -import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation; -import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; -import org.apache.cloudstack.framework.async.AsyncCallFuture; -import org.apache.cloudstack.storage.LocalHostEndpoint; -import org.apache.cloudstack.storage.MockLocalNfsSecondaryStorageResource; -import org.apache.cloudstack.storage.RemoteHostEndPoint; -import org.apache.cloudstack.storage.command.CopyCmdAnswer; -import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; -import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; -import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; - -import javax.inject.Inject; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.ExecutionException; @ContextConfiguration(locations = {"classpath:/storageContext.xml"}) public class SnapshotTest extends CloudStackTestNGBase { @@ -177,8 +181,9 @@ public class SnapshotTest extends CloudStackTestNGBase { imageStore = this.imageStoreDao.findByName(imageStoreName); } else { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -335,8 +340,9 @@ public class SnapshotTest extends CloudStackTestNGBase { private SnapshotVO createSnapshotInDb(VolumeInfo volume) { Snapshot.Type snapshotType = Snapshot.Type.MANUAL; - SnapshotVO snapshotVO = new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), - snapshotType.name(), volume.getSize(), HypervisorType.XenServer); + SnapshotVO snapshotVO = + new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), + volume.getSize(), HypervisorType.XenServer); return this.snapshotDao.persist(snapshotVO); } @@ -355,8 +361,8 @@ public class SnapshotTest extends CloudStackTestNGBase { primaryStore = this.dataStoreMgr.getPrimaryDataStore(primaryStoreId); VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); - AsyncCallFuture future = this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, - this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + AsyncCallFuture future = + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); VolumeApiResult result; result = future.get(); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java index 56d1b6db2d1..88fd54d4db8 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java @@ -18,6 +18,9 @@ */ package org.apache.cloudstack.storage.test; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; @@ -35,6 +38,15 @@ import javax.inject.Inject; import junit.framework.Assert; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -54,13 +66,6 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.volume.VolumeObject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; @@ -93,9 +98,6 @@ import com.cloud.utils.DateUtil; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.Merovingian2; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:/fakeDriverTestContext.xml"}) public class SnapshotTestWithFakeData { @@ -146,8 +148,9 @@ public class SnapshotTestWithFakeData { public void setUp() { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, - null, true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, DataCenter.NetworkType.Basic, null, + null, true, true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -173,7 +176,7 @@ public class SnapshotTestWithFakeData { imageStore.setProtocol("nfs"); imageStore = imageStoreDao.persist(imageStore); - when(primaryDataStoreProvider.configure(Mockito.anyMap())).thenReturn(true); + when(primaryDataStoreProvider.configure(Matchers.anyMap())).thenReturn(true); Set types = new HashSet(); types.add(DataStoreProvider.DataStoreProviderType.PRIMARY); @@ -203,15 +206,16 @@ public class SnapshotTestWithFakeData { private SnapshotVO createSnapshotInDb() { Snapshot.Type snapshotType = Snapshot.Type.RECURRING; - SnapshotVO snapshotVO = new SnapshotVO(dcId, 2, 1, 1L, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, - Hypervisor.HypervisorType.XenServer); + SnapshotVO snapshotVO = + new SnapshotVO(dcId, 2, 1, 1L, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, Hypervisor.HypervisorType.XenServer); return this.snapshotDao.persist(snapshotVO); } private SnapshotVO createSnapshotInDb(Long volumeId) { Snapshot.Type snapshotType = Snapshot.Type.DAILY; - SnapshotVO snapshotVO = new SnapshotVO(dcId, 2, 1, volumeId, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, - Hypervisor.HypervisorType.XenServer); + SnapshotVO snapshotVO = + new SnapshotVO(dcId, 2, 1, volumeId, 1L, UUID.randomUUID().toString(), (short)snapshotType.ordinal(), snapshotType.name(), 100, + Hypervisor.HypervisorType.XenServer); return this.snapshotDao.persist(snapshotVO); } diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java index 5db3a0f09b0..12217fc48a4 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.storage.test; -import static org.junit.Assert.*; +import static org.junit.Assert.fail; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java index 89a8fa46121..0c42b1e6b6c 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java @@ -23,6 +23,11 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.annotations.Test; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -37,18 +42,14 @@ import org.apache.cloudstack.storage.LocalHostEndpoint; import org.apache.cloudstack.storage.MockLocalNfsSecondaryStorageResource; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.annotations.Test; -import com.cloud.dc.DataCenterVO; import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.storage.DataStoreRole; import com.cloud.storage.Storage; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.Storage.TemplateType; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.download.DownloadMonitorImpl; import com.cloud.utils.component.ComponentContext; @@ -81,8 +82,9 @@ public class TemplateTest extends CloudStackTestNGBase { ComponentContext.initComponentsLifeCycle(); // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java index 11d4931fd7d..b1524f37efe 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; + import junit.framework.Assert; import org.apache.commons.httpclient.HttpException; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java index 07dc9dab1c9..c75b2e75c80 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java @@ -28,6 +28,12 @@ import javax.inject.Inject; import junit.framework.Assert; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -38,10 +44,10 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.storage.RemoteHostEndPoint; @@ -52,11 +58,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Command; @@ -80,12 +81,12 @@ import com.cloud.resource.ResourceState; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; -import com.cloud.storage.Volume; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.Volume; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; @@ -156,8 +157,9 @@ public class VolumeTest extends CloudStackTestNGBase { imageStore = this.imageStoreDao.findByName(imageStoreName); } else { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -326,8 +328,8 @@ public class VolumeTest extends CloudStackTestNGBase { primaryStore = this.dataStoreMgr.getPrimaryDataStore(primaryStoreId); VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); - AsyncCallFuture future = this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, - this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + AsyncCallFuture future = + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); try { VolumeApiResult result = future.get(); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java index f7302edf7d9..800bc6b05de 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java @@ -26,6 +26,12 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.AssertJUnit; +import org.testng.annotations.Test; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -48,11 +54,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.dc.ClusterDetailsDao; @@ -77,11 +78,11 @@ import com.cloud.resource.ResourceState; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; -import com.cloud.storage.Volume; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.Volume; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; @@ -152,8 +153,9 @@ public class VolumeTestVmware extends CloudStackTestNGBase { imageStore = this.imageStoreDao.findByName(imageStoreName); } else { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod @@ -327,8 +329,8 @@ public class VolumeTestVmware extends CloudStackTestNGBase { primaryStore = this.dataStoreMgr.getPrimaryDataStore(primaryStoreId); VolumeVO volume = createVolume(image.getId(), primaryStore.getId()); VolumeInfo volInfo = this.volFactory.getVolume(volume.getId()); - AsyncCallFuture future = this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, - this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); + AsyncCallFuture future = + this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image)); try { VolumeApiResult result = future.get(); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java index 66740bc6e89..167dd529ed1 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -29,6 +29,12 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.testng.Assert; +import org.testng.annotations.Test; + import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -50,11 +56,6 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.mockito.Matchers; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.testng.Assert; -import org.testng.annotations.Test; import com.cloud.agent.AgentManager; import com.cloud.dc.ClusterVO; @@ -74,10 +75,10 @@ import com.cloud.resource.ResourceState; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage; -import com.cloud.storage.Volume; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.Volume; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; @@ -137,8 +138,9 @@ public class volumeServiceTest extends CloudStackTestNGBase { return; } // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index 4e3e563f282..2594f1df295 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -19,10 +19,11 @@ package org.apache.cloudstack.storage.snapshot; import java.util.Date; -import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -30,7 +31,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation; -import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; @@ -40,7 +40,6 @@ import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.to.SnapshotObjectTO; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DataObjectType; @@ -289,7 +288,7 @@ public class SnapshotObject implements SnapshotInfo { VolumeVO vol = volumeDao.findByUuid(snapshotTO.getVolume().getUuid()); if (vol != null) { s_logger.info("Update volume path change due to snapshot operation, volume " + vol.getId() + " path: " + vol.getPath() + "->" + - snapshotTO.getVolume().getPath()); + snapshotTO.getVolume().getPath()); vol.setPath(snapshotTO.getVolume().getPath()); volumeDao.update(vol.getId(), vol); } else { diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java index 1aa6a6b2f5f..9940249f486 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java @@ -17,10 +17,13 @@ package org.apache.cloudstack.storage.snapshot; -import com.cloud.storage.DataStoreRole; -import com.cloud.storage.Snapshot; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.fsm.NoTransitionException; +import java.util.concurrent.ExecutionException; + +import javax.inject.Inject; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService; @@ -28,6 +31,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; @@ -40,14 +44,13 @@ import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.CopyCmdAnswer; -import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import javax.inject.Inject; -import java.util.concurrent.ExecutionException; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.Snapshot; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.fsm.NoTransitionException; @Component public class SnapshotServiceImpl implements SnapshotService { diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java index 473ccad6aa3..22182b1615e 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java @@ -20,7 +20,6 @@ import java.util.List; import javax.inject.Inject; -import com.cloud.storage.*; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -41,6 +40,11 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.to.SnapshotObjectTO; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.storage.CreateSnapshotPayload; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.Snapshot; +import com.cloud.storage.SnapshotVO; +import com.cloud.storage.Volume; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.utils.NumbersUtil; @@ -136,7 +140,7 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase { boolean resultIsSet = false; //need to track, the snapshot itself is deleted or not. try { while (snapshot != null && - (snapshot.getState() == Snapshot.State.Destroying || snapshot.getState() == Snapshot.State.Destroyed || snapshot.getState() == Snapshot.State.Error)) { + (snapshot.getState() == Snapshot.State.Destroying || snapshot.getState() == Snapshot.State.Destroyed || snapshot.getState() == Snapshot.State.Error)) { SnapshotInfo child = snapshot.getChild(); if (child != null) { diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java index 098651fc085..42bef7eb866 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java @@ -24,12 +24,13 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -92,6 +93,7 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot return true; } + @Override public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) { Long hostId = vmSnapshotHelper.pickRunningHost(vmSnapshot.getVmId()); UserVm userVm = userVmDao.findById(vmSnapshot.getVmId()); @@ -117,7 +119,8 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot boolean quiescevm = true; if (options != null) quiescevm = options.needQuiesceVM(); - VMSnapshotTO target = new VMSnapshotTO(vmSnapshot.getId(), vmSnapshot.getName(), vmSnapshot.getType(), null, vmSnapshot.getDescription(), false, current, quiescevm); + VMSnapshotTO target = + new VMSnapshotTO(vmSnapshot.getId(), vmSnapshot.getName(), vmSnapshot.getType(), null, vmSnapshot.getDescription(), false, current, quiescevm); if (current == null) vmSnapshotVO.setParent(null); else @@ -178,8 +181,9 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot String vmInstanceName = userVm.getInstanceName(); VMSnapshotTO parent = vmSnapshotHelper.getSnapshotWithParents(vmSnapshotVO).getParent(); - VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(vmSnapshot.getId(), vmSnapshot.getName(), vmSnapshot.getType(), vmSnapshot.getCreated().getTime(), - vmSnapshot.getDescription(), vmSnapshot.getCurrent(), parent, true); + VMSnapshotTO vmSnapshotTO = + new VMSnapshotTO(vmSnapshot.getId(), vmSnapshot.getName(), vmSnapshot.getType(), vmSnapshot.getCreated().getTime(), vmSnapshot.getDescription(), + vmSnapshot.getCurrent(), parent, true); GuestOSVO guestOS = guestOSDao.findById(userVm.getGuestOSId()); DeleteVMSnapshotCommand deleteSnapshotCommand = new DeleteVMSnapshotCommand(vmInstanceName, vmSnapshotTO, volumeTOs, guestOS.getDisplayName()); @@ -325,8 +329,9 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot String vmInstanceName = userVm.getInstanceName(); VMSnapshotTO parent = vmSnapshotHelper.getSnapshotWithParents(snapshot).getParent(); - VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(snapshot.getId(), snapshot.getName(), snapshot.getType(), snapshot.getCreated().getTime(), snapshot.getDescription(), - snapshot.getCurrent(), parent, true); + VMSnapshotTO vmSnapshotTO = + new VMSnapshotTO(snapshot.getId(), snapshot.getName(), snapshot.getType(), snapshot.getCreated().getTime(), snapshot.getDescription(), + snapshot.getCurrent(), parent, true); Long hostId = vmSnapshotHelper.pickRunningHost(vmSnapshot.getVmId()); GuestOSVO guestOS = guestOSDao.findById(userVm.getGuestOSId()); RevertToVMSnapshotCommand revertToSnapshotCommand = new RevertToVMSnapshotCommand(vmInstanceName, vmSnapshotTO, volumeTOs, guestOS.getDisplayName()); diff --git a/engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java b/engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java index 317521de734..6edaff1ce4e 100644 --- a/engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java +++ b/engine/storage/snapshot/test/src/SnapshotDataFactoryTest.java @@ -18,9 +18,10 @@ */ package src; +import junit.framework.TestCase; + import org.junit.Before; import org.junit.Test; -import junit.framework.TestCase; //@RunWith(SpringJUnit4ClassRunner.class) //@ContextConfiguration(locations = "classpath:/SnapshotManagerTestContext.xml") diff --git a/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java b/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java index c67f5499b38..9eaa7e19c13 100644 --- a/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java +++ b/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java @@ -25,15 +25,12 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.cloudstack.storage.vmsnapshot.DefaultVMSnapshotStrategy; -import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper; -import org.apache.cloudstack.test.utils.SpringUtils; +import junit.framework.TestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -46,6 +43,13 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.storage.to.VolumeObjectTO; +import org.apache.cloudstack.storage.vmsnapshot.DefaultVMSnapshotStrategy; +import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Command; import com.cloud.agent.api.CreateVMSnapshotAnswer; @@ -67,8 +71,6 @@ import com.cloud.vm.snapshot.VMSnapshot; import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; -import junit.framework.TestCase; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) public class VMSnapshotStrategyTest extends TestCase { @@ -101,12 +103,12 @@ public class VMSnapshotStrategyTest extends TestCase { UserVmVO userVmVO = Mockito.mock(UserVmVO.class); Mockito.when(userVmVO.getGuestOSId()).thenReturn(guestOsId); Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId); - Mockito.when(vmSnapshotHelper.pickRunningHost(Mockito.anyLong())).thenReturn(hostId); - Mockito.when(vmSnapshotHelper.getVolumeTOList(Mockito.anyLong())).thenReturn(volumeObjectTOs); - Mockito.when(userVmDao.findById(Mockito.anyLong())).thenReturn(userVmVO); + Mockito.when(vmSnapshotHelper.pickRunningHost(Matchers.anyLong())).thenReturn(hostId); + Mockito.when(vmSnapshotHelper.getVolumeTOList(Matchers.anyLong())).thenReturn(volumeObjectTOs); + Mockito.when(userVmDao.findById(Matchers.anyLong())).thenReturn(userVmVO); GuestOSVO guestOSVO = Mockito.mock(GuestOSVO.class); - Mockito.when(guestOSDao.findById(Mockito.anyLong())).thenReturn(guestOSVO); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(null); + Mockito.when(guestOSDao.findById(Matchers.anyLong())).thenReturn(guestOSVO); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(null); Exception e = null; try { vmSnapshotStrategy.takeVMSnapshot(vmSnapshot); @@ -117,8 +119,8 @@ public class VMSnapshotStrategyTest extends TestCase { assertNotNull(e); CreateVMSnapshotAnswer answer = Mockito.mock(CreateVMSnapshotAnswer.class); Mockito.when(answer.getResult()).thenReturn(true); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(answer); - Mockito.when(vmSnapshotDao.findById(Mockito.anyLong())).thenReturn(vmSnapshot); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(answer); + Mockito.when(vmSnapshotDao.findById(Matchers.anyLong())).thenReturn(vmSnapshot); VMSnapshot snapshot = null; snapshot = vmSnapshotStrategy.takeVMSnapshot(vmSnapshot); assertNotNull(snapshot); @@ -134,17 +136,17 @@ public class VMSnapshotStrategyTest extends TestCase { UserVmVO userVmVO = Mockito.mock(UserVmVO.class); Mockito.when(userVmVO.getGuestOSId()).thenReturn(guestOsId); Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId); - Mockito.when(vmSnapshotHelper.pickRunningHost(Mockito.anyLong())).thenReturn(hostId); - Mockito.when(vmSnapshotHelper.getVolumeTOList(Mockito.anyLong())).thenReturn(volumeObjectTOs); - Mockito.when(userVmDao.findById(Mockito.anyLong())).thenReturn(userVmVO); + Mockito.when(vmSnapshotHelper.pickRunningHost(Matchers.anyLong())).thenReturn(hostId); + Mockito.when(vmSnapshotHelper.getVolumeTOList(Matchers.anyLong())).thenReturn(volumeObjectTOs); + Mockito.when(userVmDao.findById(Matchers.anyLong())).thenReturn(userVmVO); GuestOSVO guestOSVO = Mockito.mock(GuestOSVO.class); - Mockito.when(guestOSDao.findById(Mockito.anyLong())).thenReturn(guestOSVO); + Mockito.when(guestOSDao.findById(Matchers.anyLong())).thenReturn(guestOSVO); VMSnapshotTO vmSnapshotTO = Mockito.mock(VMSnapshotTO.class); - Mockito.when(vmSnapshotHelper.getSnapshotWithParents(Mockito.any(VMSnapshotVO.class))).thenReturn(vmSnapshotTO); - Mockito.when(vmSnapshotDao.findById(Mockito.anyLong())).thenReturn(vmSnapshot); + Mockito.when(vmSnapshotHelper.getSnapshotWithParents(Matchers.any(VMSnapshotVO.class))).thenReturn(vmSnapshotTO); + Mockito.when(vmSnapshotDao.findById(Matchers.anyLong())).thenReturn(vmSnapshot); Mockito.when(vmSnapshot.getId()).thenReturn(1L); Mockito.when(vmSnapshot.getCreated()).thenReturn(new Date()); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(null); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(null); Exception e = null; try { vmSnapshotStrategy.revertVMSnapshot(vmSnapshot); @@ -156,7 +158,7 @@ public class VMSnapshotStrategyTest extends TestCase { RevertToVMSnapshotAnswer answer = Mockito.mock(RevertToVMSnapshotAnswer.class); Mockito.when(answer.getResult()).thenReturn(Boolean.TRUE); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(answer); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(answer); boolean result = vmSnapshotStrategy.revertVMSnapshot(vmSnapshot); assertTrue(result); } @@ -171,17 +173,17 @@ public class VMSnapshotStrategyTest extends TestCase { UserVmVO userVmVO = Mockito.mock(UserVmVO.class); Mockito.when(userVmVO.getGuestOSId()).thenReturn(guestOsId); Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId); - Mockito.when(vmSnapshotHelper.pickRunningHost(Mockito.anyLong())).thenReturn(hostId); - Mockito.when(vmSnapshotHelper.getVolumeTOList(Mockito.anyLong())).thenReturn(volumeObjectTOs); - Mockito.when(userVmDao.findById(Mockito.anyLong())).thenReturn(userVmVO); + Mockito.when(vmSnapshotHelper.pickRunningHost(Matchers.anyLong())).thenReturn(hostId); + Mockito.when(vmSnapshotHelper.getVolumeTOList(Matchers.anyLong())).thenReturn(volumeObjectTOs); + Mockito.when(userVmDao.findById(Matchers.anyLong())).thenReturn(userVmVO); GuestOSVO guestOSVO = Mockito.mock(GuestOSVO.class); - Mockito.when(guestOSDao.findById(Mockito.anyLong())).thenReturn(guestOSVO); + Mockito.when(guestOSDao.findById(Matchers.anyLong())).thenReturn(guestOSVO); VMSnapshotTO vmSnapshotTO = Mockito.mock(VMSnapshotTO.class); - Mockito.when(vmSnapshotHelper.getSnapshotWithParents(Mockito.any(VMSnapshotVO.class))).thenReturn(vmSnapshotTO); - Mockito.when(vmSnapshotDao.findById(Mockito.anyLong())).thenReturn(vmSnapshot); + Mockito.when(vmSnapshotHelper.getSnapshotWithParents(Matchers.any(VMSnapshotVO.class))).thenReturn(vmSnapshotTO); + Mockito.when(vmSnapshotDao.findById(Matchers.anyLong())).thenReturn(vmSnapshot); Mockito.when(vmSnapshot.getId()).thenReturn(1L); Mockito.when(vmSnapshot.getCreated()).thenReturn(new Date()); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(null); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(null); Exception e = null; try { @@ -194,7 +196,7 @@ public class VMSnapshotStrategyTest extends TestCase { DeleteVMSnapshotAnswer answer = Mockito.mock(DeleteVMSnapshotAnswer.class); Mockito.when(answer.getResult()).thenReturn(true); - Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(answer); + Mockito.when(agentMgr.send(Matchers.anyLong(), Matchers.any(Command.class))).thenReturn(answer); boolean result = vmSnapshotStrategy.deleteVMSnapshot(vmSnapshot); assertTrue(result); diff --git a/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java b/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java index 3cae2b95f1d..98c9db17fff 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java +++ b/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java @@ -24,10 +24,11 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java index 0a24269671a..aab38769731 100755 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -38,7 +38,6 @@ import com.cloud.dc.ClusterVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; -import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java index 04c983baa13..761c3a8eabc 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -23,18 +23,17 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; - import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; import com.cloud.utils.component.ComponentContext; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = StoragePoolAllocator.class) @@ -68,7 +67,8 @@ public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAl } // Try to find a storage pool after cleanup - ExcludeList myAvoids = new ExcludeList(avoid.getDataCentersToAvoid(), avoid.getPodsToAvoid(), avoid.getClustersToAvoid(), avoid.getHostsToAvoid(), avoid.getPoolsToAvoid()); + ExcludeList myAvoids = + new ExcludeList(avoid.getDataCentersToAvoid(), avoid.getPodsToAvoid(), avoid.getClustersToAvoid(), avoid.getHostsToAvoid(), avoid.getPoolsToAvoid()); return allocator.allocateToPool(dskCh, vmProfile, plan, myAvoids, returnUpTo); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java index fe281e6a7f9..678b2a38073 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java @@ -25,13 +25,13 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.capacity.dao.CapacityDao; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; @@ -42,7 +42,6 @@ import com.cloud.storage.Volume; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.utils.NumbersUtil; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @@ -99,7 +98,8 @@ public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { // zone wide primary storage deployment return null; } - List availablePools = _storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), dskCh.getTags()); + List availablePools = + _storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), dskCh.getTags()); for (StoragePoolVO pool : availablePools) { if (suitablePools.size() == returnUpTo) { break; diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java index 96932e8d46a..bb59a8cc584 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java @@ -31,7 +31,6 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.storage.StoragePool; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = StoragePoolAllocator.class) diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java index 6daa87e2453..57253a787a3 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java @@ -23,20 +23,20 @@ import java.util.Map; import javax.inject.Inject; -import com.cloud.user.Account; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.StoragePool; import com.cloud.storage.Volume; +import com.cloud.user.Account; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Component diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java index 4756af5a121..6ed1274604c 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java @@ -20,6 +20,9 @@ package org.apache.cloudstack.storage.datastore; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService; @@ -32,8 +35,6 @@ import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.exception.ConcurrentOperationException; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index ee0582cfa34..2eafacc2ae6 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -18,6 +18,9 @@ package org.apache.cloudstack.storage.datastore; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -37,8 +40,6 @@ import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.db.ObjectInDataStoreDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.S3TO; @@ -129,8 +130,9 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { ts.setTemplateId(obj.getId()); ts.setDataStoreId(dataStore.getId()); ts.setDataStoreRole(dataStore.getRole()); - String installPath = TemplateConstants.DEFAULT_TMPLT_ROOT_DIR + "/" + TemplateConstants.DEFAULT_TMPLT_FIRST_LEVEL_DIR + - templateDao.findById(obj.getId()).getAccountId() + "/" + obj.getId(); + String installPath = + TemplateConstants.DEFAULT_TMPLT_ROOT_DIR + "/" + TemplateConstants.DEFAULT_TMPLT_FIRST_LEVEL_DIR + + templateDao.findById(obj.getId()).getAccountId() + "/" + obj.getId(); if (dataStore.getTO() instanceof S3TO) { TemplateInfo tmpl = (TemplateInfo)obj; installPath += "/" + tmpl.getUniqueName(); // for S3, we diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java index 3f46fa32129..6e36514c491 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java @@ -18,9 +18,20 @@ */ package org.apache.cloudstack.storage.datastore.provider; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.utils.component.ManagerBase; -import com.cloud.utils.component.Registry; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import org.apache.cloudstack.api.response.StorageProviderResponse; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -30,20 +41,10 @@ import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager; import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.utils.component.ManagerBase; +import com.cloud.utils.component.Registry; @Component public class DataStoreProviderManagerImpl extends ManagerBase implements DataStoreProviderManager, Registry { diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java index c7037b09f7f..a492e76b991 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java @@ -21,11 +21,12 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index c9c2c1be505..df1c9ee0c67 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -57,8 +57,9 @@ public class DefaultEndPointSelector implements EndPointSelector { private static final Logger s_logger = Logger.getLogger(DefaultEndPointSelector.class); @Inject HostDao hostDao; - private final String findOneHostOnPrimaryStorage = "select h.id from host h, storage_pool_host_ref s where h.status = 'Up' and h.type = 'Routing' and h.resource_state = 'Enabled' and" - + " h.id = s.host_id and s.pool_id = ? "; + private final String findOneHostOnPrimaryStorage = + "select h.id from host h, storage_pool_host_ref s where h.status = 'Up' and h.type = 'Routing' and h.resource_state = 'Enabled' and" + + " h.id = s.host_id and s.pool_id = ? "; protected boolean moveBetweenPrimaryImage(DataStore srcStore, DataStore destStore) { DataStoreRole srcRole = srcStore.getRole(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java index ceaba014cb4..3836c2c3d49 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java @@ -32,8 +32,8 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.command.ForgetObjectCmd; import org.apache.cloudstack.storage.command.IntroduceObjectAnswer; import org.apache.cloudstack.storage.command.IntroduceObjectCmd; -import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper; import org.apache.cloudstack.storage.to.VolumeObjectTO; +import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -114,7 +114,8 @@ public class HypervisorHelperImpl implements HypervisorHelper { VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(1L, UUID.randomUUID().toString(), VMSnapshot.Type.DiskAndMemory, null, null, false, null, true); GuestOSVO guestOS = guestOSDao.findById(virtualMachine.getGuestOSId()); List volumeTOs = vmSnapshotHelper.getVolumeTOList(virtualMachine.getId()); - CreateVMSnapshotCommand ccmd = new CreateVMSnapshotCommand(virtualMachine.getInstanceName(), vmSnapshotTO, volumeTOs, guestOS.getDisplayName(), virtualMachine.getState()); + CreateVMSnapshotCommand ccmd = + new CreateVMSnapshotCommand(virtualMachine.getInstanceName(), vmSnapshotTO, volumeTOs, guestOS.getDisplayName(), virtualMachine.getState()); ccmd.setWait(wait); try { Answer answer = agentMgr.send(hostId, ccmd); diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java index 5814e0972d7..e0fc90cc138 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java @@ -100,7 +100,8 @@ public class VMSnapshotHelperImpl implements VMSnapshotHelper { if (storagePool == null) { throw new InvalidParameterValueException("storage pool is not found"); } - List listHost = hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, storagePool.getClusterId(), storagePool.getPodId(), storagePool.getDataCenterId(), null); + List listHost = + hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, storagePool.getClusterId(), storagePool.getPodId(), storagePool.getDataCenterId(), null); if (listHost == null || listHost.size() == 0) { throw new InvalidParameterValueException("no host in up state is found"); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java index b7160bc9d0a..7ed11ecd0e1 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java @@ -21,14 +21,18 @@ package org.apache.cloudstack.storage.image; import java.net.URI; import java.net.URISyntaxException; import java.util.Date; -import java.util.HashMap; import java.util.Map; import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.*; import org.apache.log4j.Logger; +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.async.AsyncRpcContext; @@ -130,7 +134,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { } } - protected Void createTemplateAsyncCallback(AsyncCallbackDispatcher callback, CreateContext context) { + protected Void createTemplateAsyncCallback(AsyncCallbackDispatcher callback, + CreateContext context) { if (s_logger.isDebugEnabled()) { s_logger.debug("Performing image store createTemplate async callback"); } @@ -165,8 +170,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { AsyncCompletionCallback caller = context.getParentCallback(); - if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || - answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { + if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || + answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); result.setResult(answer.getErrorString()); @@ -184,7 +189,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { return null; } - protected Void createVolumeAsyncCallback(AsyncCallbackDispatcher callback, CreateContext context) { + protected Void + createVolumeAsyncCallback(AsyncCallbackDispatcher callback, CreateContext context) { DownloadAnswer answer = callback.getResult(); DataObject obj = context.data; DataStore store = obj.getDataStore(); @@ -216,8 +222,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { AsyncCompletionCallback caller = context.getParentCallback(); - if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || - answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { + if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || + answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); result.setResult(answer.getErrorString()); diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java index 3c766cf80c7..659a14894c6 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java @@ -22,9 +22,10 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailVO; import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao; -import org.springframework.stereotype.Component; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java index eb02e3bde6f..e40cfd00b62 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java @@ -55,7 +55,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase storeSnapshotSearch; private SearchBuilder snapshotIdSearch; private final String parentSearch = "select store_id, store_role, snapshot_id from cloud.snapshot_store_ref where store_id = ? " - + " and store_role = ? and volume_id = ? and state = 'Ready'" + " order by created DESC " + " limit 1"; + + " and store_role = ? and volume_id = ? and state = 'Ready'" + " order by created DESC " + " limit 1"; @Override public boolean configure(String name, Map params) throws ConfigurationException { diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java index 72e683be132..a639641b6ad 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/BAREMETAL.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component public class BAREMETAL extends BaseType implements ImageFormat { private final String type = "BAREMETAL"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java index 77a355a0c86..3ef390f4904 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/OVA.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component public class OVA extends BaseType implements ImageFormat { private final String type = "OVA"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java index d51052b8998..3c205ac064e 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/QCOW2.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component("imageformat_qcow2") public class QCOW2 extends BaseType implements ImageFormat { private final String type = "QCOW2"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java index 84adff2ef88..38606a19655 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/RAW.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component("imageformat_raw") public class RAW extends BaseType implements ImageFormat { private final String type = "RAW"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java index 992654e085b..d45ec935973 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/Unknown.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component public class Unknown extends BaseType implements ImageFormat { private final String type = "Unknown"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java index 89cd424311e..824d4a3fec4 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/VHD.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component("image_format_vhd") public class VHD extends BaseType implements ImageFormat { private final String type = "VHD"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java index b17707feaf3..429bbd58912 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/VHDX.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.storage.image.format; -import org.apache.cloudstack.storage.BaseType; import org.springframework.stereotype.Component; +import org.apache.cloudstack.storage.BaseType; + @Component("image_format_vhdx") public class VHDX extends BaseType implements ImageFormat { private final String type = "VHDX"; diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java b/engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java index 5026f3e145f..b679a7f606a 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/TemplateOnPrimaryDataStoreInfo.java @@ -18,8 +18,8 @@ */ package org.apache.cloudstack.storage.volume; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; public interface TemplateOnPrimaryDataStoreInfo { public String getPath(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java b/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java index 03d3e83a389..21cefb7a61e 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java @@ -23,22 +23,23 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreParameters; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.api.StoragePoolInfo; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ScopeType; -import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolHostVO; import com.cloud.storage.StoragePoolStatus; diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java index 3fd1d789e95..8ba3e12a1a0 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.storage.volume.db; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDetailVO; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDetailsDao; -import org.springframework.stereotype.Component; @Component public class PrimaryDataStoreDetailsDaoImpl extends ResourceDetailsDaoBase implements PrimaryDataStoreDetailsDao { diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java index 4277a389af7..9635729442b 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java @@ -31,10 +31,9 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; - import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.fsm.StateObject; @@ -171,8 +170,8 @@ public class TemplatePrimaryDataStoreVO implements StateObject context = new CreateBaseImageContext(null, volume, dataStore, template, future, templateOnPrimaryStoreObj, - templatePoolRefId); + CreateBaseImageContext context = + new CreateBaseImageContext(null, volume, dataStore, template, future, templateOnPrimaryStoreObj, templatePoolRefId); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().copyBaseImageCallback(null, null)).setContext(context); @@ -422,7 +422,7 @@ public class VolumeServiceImpl implements VolumeService { templatePoolRef = _tmpltPoolDao.findByPoolTemplate(dataStore.getId(), template.getId()); if (templatePoolRef.getState() == ObjectInDataStoreStateMachine.State.Ready) { s_logger.info("Unable to acquire lock on VMTemplateStoragePool " + templatePoolRefId + ", But Template " + template.getUniqueName() + - " is already copied to primary storage, skip copying"); + " is already copied to primary storage, skip copying"); createVolumeFromBaseImageAsync(volume, templateOnPrimaryStoreObj, dataStore, future); return; } @@ -502,8 +502,8 @@ public class VolumeServiceImpl implements VolumeService { DataObject volumeOnPrimaryStorage = pd.create(volume); volumeOnPrimaryStorage.processEvent(Event.CreateOnlyRequested); - CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volumeOnPrimaryStorage, pd, templateOnPrimaryStore, - future, null); + CreateVolumeFromBaseImageContext context = + new CreateVolumeFromBaseImageContext(null, volumeOnPrimaryStorage, pd, templateOnPrimaryStore, future, null); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().createVolumeFromBaseImageCallBack(null, null)); caller.setContext(context); @@ -594,7 +594,8 @@ public class VolumeServiceImpl implements VolumeService { DataObject volumeOnStore = store.create(volume); volumeOnStore.processEvent(Event.CreateOnlyRequested); snapshot.processEvent(Event.CopyingRequested); - CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volume, store, volumeOnStore, future, snapshot); + CreateVolumeFromBaseImageContext context = + new CreateVolumeFromBaseImageContext(null, volume, store, volumeOnStore, future, snapshot); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().createVolumeFromSnapshotCallback(null, null)).setContext(context); motionSrv.copyAsync(snapshot, volumeOnStore, caller); @@ -656,7 +657,8 @@ public class VolumeServiceImpl implements VolumeService { final VolumeInfo destVolume; final AsyncCallFuture future; - public CopyVolumeContext(AsyncCompletionCallback callback, AsyncCallFuture future, VolumeInfo srcVolume, VolumeInfo destVolume, DataStore destStore) { + public CopyVolumeContext(AsyncCompletionCallback callback, AsyncCallFuture future, VolumeInfo srcVolume, VolumeInfo destVolume, + DataStore destStore) { super(callback); this.srcVolume = srcVolume; this.destVolume = destVolume; @@ -693,7 +695,8 @@ public class VolumeServiceImpl implements VolumeService { } } - protected Void copyVolumeFromImageToPrimaryCallback(AsyncCallbackDispatcher callback, CopyVolumeContext context) { + protected Void + copyVolumeFromImageToPrimaryCallback(AsyncCallbackDispatcher callback, CopyVolumeContext context) { VolumeInfo srcVolume = context.srcVolume; VolumeInfo destVolume = context.destVolume; CopyCommandResult result = callback.getResult(); @@ -746,7 +749,8 @@ public class VolumeServiceImpl implements VolumeService { } } - protected Void copyVolumeFromPrimaryToImageCallback(AsyncCallbackDispatcher callback, CopyVolumeContext context) { + protected Void + copyVolumeFromPrimaryToImageCallback(AsyncCallbackDispatcher callback, CopyVolumeContext context) { VolumeInfo srcVolume = context.srcVolume; VolumeInfo destVolume = context.destVolume; CopyCommandResult result = callback.getResult(); @@ -852,7 +856,8 @@ public class VolumeServiceImpl implements VolumeService { /** * @param callback */ - public MigrateVolumeContext(AsyncCompletionCallback callback, AsyncCallFuture future, VolumeInfo srcVolume, VolumeInfo destVolume, DataStore destStore) { + public MigrateVolumeContext(AsyncCompletionCallback callback, AsyncCallFuture future, VolumeInfo srcVolume, VolumeInfo destVolume, + DataStore destStore) { super(callback); this.srcVolume = srcVolume; this.destVolume = destVolume; @@ -962,7 +967,8 @@ public class VolumeServiceImpl implements VolumeService { return future; } - protected Void migrateVmWithVolumesCallBack(AsyncCallbackDispatcher callback, MigrateVmWithVolumesContext context) { + protected Void + migrateVmWithVolumesCallBack(AsyncCallbackDispatcher callback, MigrateVmWithVolumesContext context) { Map volumeToPool = context.volumeToPool; CopyCommandResult result = callback.getResult(); AsyncCallFuture future = context.future; @@ -1038,20 +1044,21 @@ public class VolumeServiceImpl implements VolumeService { if (volStore != null) { physicalSize = volStore.getPhysicalSize(); } else { - s_logger.warn("No entry found in volume_store_ref for volume id: " + vo.getId() + " and image store id: " + ds.getId() + " at the end of uploading volume!"); + s_logger.warn("No entry found in volume_store_ref for volume id: " + vo.getId() + " and image store id: " + ds.getId() + + " at the end of uploading volume!"); } Scope dsScope = ds.getScope(); if (dsScope.getScopeType() == ScopeType.ZONE) { if (dsScope.getScopeId() != null) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_UPLOAD, vo.getAccountId(), dsScope.getScopeId(), vo.getId(), vo.getName(), null, null, - physicalSize, vo.getSize(), Volume.class.getName(), vo.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_UPLOAD, vo.getAccountId(), dsScope.getScopeId(), vo.getId(), vo.getName(), null, + null, physicalSize, vo.getSize(), Volume.class.getName(), vo.getUuid()); } else { s_logger.warn("Zone scope image store " + ds.getId() + " has a null scope id"); } } else if (dsScope.getScopeType() == ScopeType.REGION) { // publish usage event for region-wide image store using a -1 zoneId for 4.2, need to revisit post-4.2 - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_UPLOAD, vo.getAccountId(), -1, vo.getId(), vo.getName(), null, null, physicalSize, vo.getSize(), - Volume.class.getName(), vo.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_UPLOAD, vo.getAccountId(), -1, vo.getId(), vo.getName(), null, null, physicalSize, + vo.getSize(), Volume.class.getName(), vo.getUuid()); _resourceLimitMgr.incrementResourceCount(vo.getAccountId(), ResourceType.secondary_storage, vo.getSize()); } @@ -1146,7 +1153,7 @@ public class VolumeServiceImpl implements VolumeService { VolumeVO volume = _volumeDao.findById(volumeStore.getVolumeId()); if (volume == null) { s_logger.warn("Volume_store_ref shows that volume " + volumeStore.getVolumeId() + " is on image store " + storeId + - ", but the volume is not found in volumes table, potentially some bugs in deleteVolume, so we just treat this volume to be deleted and mark it as destroyed"); + ", but the volume is not found in volumes table, potentially some bugs in deleteVolume, so we just treat this volume to be deleted and mark it as destroyed"); volumeStore.setDestroyed(true); _volumeStoreDao.update(volumeStore.getId(), volumeStore); continue; @@ -1165,8 +1172,9 @@ public class VolumeServiceImpl implements VolumeService { volumeStore.setErrorString(msg); s_logger.info("msg"); if (volumeStore.getDownloadUrl() == null) { - msg = "Volume (" + volume.getUuid() + ") with install path " + volInfo.getInstallPath() + "is corrupted, please check in image store: " + - volumeStore.getDataStoreId(); + msg = + "Volume (" + volume.getUuid() + ") with install path " + volInfo.getInstallPath() + + "is corrupted, please check in image store: " + volumeStore.getDataStoreId(); s_logger.warn(msg); } else { s_logger.info("Removing volume_store_ref entry for corrupted volume " + volume.getName()); @@ -1208,7 +1216,8 @@ public class VolumeServiceImpl implements VolumeService { } // Volume is not on secondary but we should download. if (volumeStore.getDownloadState() != Status.DOWNLOADED) { - s_logger.info("Volume Sync did not find " + volume.getName() + " ready on image store " + storeId + ", will request download to start/resume shortly"); + s_logger.info("Volume Sync did not find " + volume.getName() + " ready on image store " + storeId + + ", will request download to start/resume shortly"); toBeDownloaded.add(volumeStore); } } diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java b/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java index ddbccb2fdb5..b3de945e3ad 100644 --- a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java +++ b/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/ConfiguratorTest.java @@ -21,14 +21,17 @@ package org.apache.cloudstack.storage.volume.test; import static org.junit.Assert.assertTrue; import java.util.List; + import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider; + import com.cloud.dc.dao.ClusterDao; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java b/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java index eb871a54ae2..6c0d2607691 100644 --- a/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java +++ b/engine/storage/volume/test/org/apache/cloudstack/storage/volume/test/TestConfiguration.java @@ -18,12 +18,12 @@ */ package org.apache.cloudstack.storage.volume.test; -import org.apache.cloudstack.storage.image.motion.ImageMotionService; - import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.apache.cloudstack.storage.image.motion.ImageMotionService; + import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.ClusterDaoImpl; diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java index 36fb1c3b0b6..3e7138f46d7 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.cluster; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.net.ConnectException; import java.net.InetSocketAddress; @@ -43,6 +41,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; @@ -53,7 +52,6 @@ import com.cloud.cluster.dao.ManagementServerHostDao; import com.cloud.cluster.dao.ManagementServerHostPeerDao; import com.cloud.utils.DateUtil; import com.cloud.utils.Profiler; -import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; @@ -258,15 +256,15 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C try { if (s_logger.isDebugEnabled()) { s_logger.debug("Cluster PDU " + getSelfPeerName() + " -> " + pdu.getDestPeer() + ". agent: " + pdu.getAgentId() + ", pdu seq: " + - pdu.getSequenceId() + ", pdu ack seq: " + pdu.getAckSequenceId() + ", json: " + pdu.getJsonPackage()); + pdu.getSequenceId() + ", pdu ack seq: " + pdu.getAckSequenceId() + ", json: " + pdu.getJsonPackage()); } long startTick = System.currentTimeMillis(); String strResult = peerService.execute(pdu); if (s_logger.isDebugEnabled()) { - s_logger.debug("Cluster PDU " + getSelfPeerName() + " -> " + pdu.getDestPeer() + " completed. time: " + (System.currentTimeMillis() - startTick) + - "ms. agent: " + pdu.getAgentId() + ", pdu seq: " + pdu.getSequenceId() + ", pdu ack seq: " + pdu.getAckSequenceId() + ", json: " + - pdu.getJsonPackage()); + s_logger.debug("Cluster PDU " + getSelfPeerName() + " -> " + pdu.getDestPeer() + " completed. time: " + + (System.currentTimeMillis() - startTick) + "ms. agent: " + pdu.getAgentId() + ", pdu seq: " + pdu.getSequenceId() + + ", pdu ack seq: " + pdu.getAckSequenceId() + ", json: " + pdu.getJsonPackage()); } if ("true".equals(strResult)) @@ -275,7 +273,8 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C } catch (RemoteException e) { invalidatePeerService(pdu.getDestPeer()); if (s_logger.isInfoEnabled()) { - s_logger.info("Exception on remote execution, peer: " + pdu.getDestPeer() + ", iteration: " + i + ", exception message :" + e.getMessage()); + s_logger.info("Exception on remote execution, peer: " + pdu.getDestPeer() + ", iteration: " + i + ", exception message :" + + e.getMessage()); } } } @@ -565,7 +564,7 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C if (profiler.getDuration() >= HeartbeatInterval.value()) { if (s_logger.isDebugEnabled()) s_logger.debug("Management server heartbeat takes too long to finish. profiler: " + profiler.toString() + ", profilerHeartbeatUpdate: " + - profilerHeartbeatUpdate.toString() + ", profilerPeerScan: " + profilerPeerScan.toString()); + profilerHeartbeatUpdate.toString() + ", profilerPeerScan: " + profilerPeerScan.toString()); } } @@ -772,8 +771,8 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C if (s_logger.isInfoEnabled()) { s_logger.info("Found " + inactiveList.size() + " inactive management server node based on timestamp"); for (ManagementServerHostVO host : inactiveList) - s_logger.info("management server node msid: " + host.getMsid() + ", name: " + host.getName() + ", service ip: " + host.getServiceIP() + ", version: " + - host.getVersion()); + s_logger.info("management server node msid: " + host.getMsid() + ", name: " + host.getName() + ", service ip: " + host.getServiceIP() + + ", version: " + host.getVersion()); } List downHostList = new ArrayList(); @@ -810,7 +809,8 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C if (_mshostId != null) { if (_mshostPeerDao.countStateSeenInPeers(_mshostId, _runId, ManagementServerHost.State.Down) > 0) { - String msg = "We have detected that at least one management server peer reports that this management server is down, perform active fencing to avoid split-brain situation"; + String msg = + "We have detected that at least one management server peer reports that this management server is down, perform active fencing to avoid split-brain situation"; s_logger.error(msg); throw new ActiveFencingException(msg); } @@ -830,7 +830,8 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C if (current.getRunid() == 0) { if (entry.getKey().longValue() != _mshostId.longValue()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Detected management node left because of invalidated session, id:" + entry.getKey() + ", nodeIP:" + entry.getValue().getServiceIP()); + s_logger.debug("Detected management node left because of invalidated session, id:" + entry.getKey() + ", nodeIP:" + + entry.getValue().getServiceIP()); } invalidatedNodeList.add(entry.getValue()); } @@ -916,9 +917,9 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C if (profiler.getDuration() >= HeartbeatInterval.value()) { if (s_logger.isDebugEnabled()) - s_logger.debug("Peer scan takes too long to finish. profiler: " + profiler.toString() + ", profilerQueryActiveList: " + profilerQueryActiveList.toString() + - ", profilerSyncClusterInfo: " + profilerSyncClusterInfo.toString() + ", profilerInvalidatedNodeList: " + profilerInvalidatedNodeList.toString() + - ", profilerRemovedList: " + profilerRemovedList.toString()); + s_logger.debug("Peer scan takes too long to finish. profiler: " + profiler.toString() + ", profilerQueryActiveList: " + + profilerQueryActiveList.toString() + ", profilerSyncClusterInfo: " + profilerSyncClusterInfo.toString() + ", profilerInvalidatedNodeList: " + + profilerInvalidatedNodeList.toString() + ", profilerRemovedList: " + profilerRemovedList.toString()); } } @@ -1063,10 +1064,12 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C return true; } + @Override public long getManagementNodeId() { return _msId; } + @Override public long getCurrentRunId() { return _runId; } @@ -1161,18 +1164,21 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C s_logger.error(msg); throw new ConfigurationException(msg); } else { - String msg = "Detected another management node with localhost IP is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node"; + String msg = + "Detected another management node with localhost IP is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node"; s_logger.info(msg); } } else { if (pingManagementNode(peer.getMsid())) { - String msg = "Detected that another management node with the same IP " + peer.getServiceIP() + - " is already running, please check your cluster configuration"; + String msg = + "Detected that another management node with the same IP " + peer.getServiceIP() + + " is already running, please check your cluster configuration"; s_logger.error(msg); throw new ConfigurationException(msg); } else { - String msg = "Detected that another management node with the same IP " + peer.getServiceIP() + - " is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node"; + String msg = + "Detected that another management node with the same IP " + peer.getServiceIP() + + " is considered as running in DB, however it is not pingable, we will continue cluster initialization with this management server node"; s_logger.info(msg); } } diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java index a9620b8e77b..d36aed1d4d2 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletAdapter.java @@ -23,9 +23,10 @@ import java.util.Properties; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.log4j.Logger; +import org.apache.cloudstack.framework.config.ConfigDepot; + import com.cloud.cluster.dao.ManagementServerHostDao; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.AdapterBase; diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java index d8f390e9629..9615f01a2dc 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java @@ -22,7 +22,6 @@ import java.net.Socket; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.http.ConnectionClosedException; import org.apache.http.HttpException; import org.apache.http.impl.DefaultConnectionReuseStrategy; @@ -44,6 +43,8 @@ import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + import com.cloud.utils.concurrency.NamedThreadFactory; public class ClusterServiceServletContainer { @@ -118,6 +119,7 @@ public class ClusterServiceServletContainer { } } + @Override public void run() { if (s_logger.isInfoEnabled()) s_logger.info("Cluster service servlet container listening on port " + _serverSocket.getLocalPort()); diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java index 5a26ba4b4cd..a103f0bf12f 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletImpl.java @@ -39,7 +39,8 @@ public class ClusterServiceServletImpl implements ClusterService { } public ClusterServiceServletImpl(String serviceUrl) { - s_logger.info("Setup cluster service servlet. service url: " + serviceUrl + ", request timeout: " + ClusterServiceAdapter.ClusterMessageTimeOut.value() + " seconds"); + s_logger.info("Setup cluster service servlet. service url: " + serviceUrl + ", request timeout: " + ClusterServiceAdapter.ClusterMessageTimeOut.value() + + " seconds"); _serviceUrl = serviceUrl; } @@ -95,7 +96,7 @@ public class ClusterServiceServletImpl implements ClusterService { } } else { s_logger.error("Invalid response code : " + response + ", from : " + _serviceUrl + ", method : " + method.getParameter("method") + " responding time: " + - (System.currentTimeMillis() - startTick)); + (System.currentTimeMillis() - startTick)); } } catch (HttpException e) { s_logger.error("HttpException from : " + _serviceUrl + ", method : " + method.getParameter("method")); diff --git a/framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java b/framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java index dd76211aa61..f93c2ac2467 100644 --- a/framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java +++ b/framework/cluster/src/com/cloud/cluster/ManagementServerHostVO.java @@ -135,6 +135,7 @@ public class ManagementServerHostVO implements ManagementServerHost { this.version = version; } + @Override public String getServiceIP() { return serviceIP; } diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java index 33fa9ac90a2..6ff07365b1f 100644 --- a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java +++ b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java @@ -86,7 +86,8 @@ public class ManagementServerHostDaoImpl extends GenericDaoBase 0 AND t.mgmt_server_id NOT IN (select msid from mshost)"); + pstmt = + txn.prepareAutoCloseStatement("select t.mgmt_server_id from (select mgmt_server_id, count(*) as count from host group by mgmt_server_id) as t WHERE t.count > 0 AND t.mgmt_server_id NOT IN (select msid from mshost)"); ResultSet rs = pstmt.executeQuery(); while (rs.next()) { diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java index d5c862638d2..88569558fc6 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java @@ -17,7 +17,6 @@ package org.apache.cloudstack.framework.config.dao; import java.util.Map; -import java.util.List; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java index 6a9c7a29e66..15933de60ff 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java @@ -27,14 +27,15 @@ import java.util.Set; import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.apache.commons.lang.ObjectUtils; +import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigDepotAdmin; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.ScopedConfigStorage; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.commons.lang.ObjectUtils; -import org.apache.log4j.Logger; import com.cloud.utils.Pair; import com.cloud.utils.exception.CloudRuntimeException; @@ -110,8 +111,8 @@ public class ConfigDepotImpl implements ConfigDepot, ConfigDepotAdmin { for (ConfigKey key : configurable.getConfigKeys()) { Pair> previous = _allKeys.get(key.key()); if (previous != null && !previous.first().equals(configurable.getConfigComponentName())) { - throw new CloudRuntimeException("Configurable " + configurable.getConfigComponentName() + " is adding a key that has been added before by " + previous.first() + - ": " + key.toString()); + throw new CloudRuntimeException("Configurable " + configurable.getConfigComponentName() + " is adding a key that has been added before by " + + previous.first() + ": " + key.toString()); } _allKeys.put(key.key(), new Pair>(configurable.getConfigComponentName(), key)); diff --git a/framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java b/framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java index b5cb645e29b..245e9a6d49e 100644 --- a/framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java +++ b/framework/config/test/org/apache/cloudstack/framework/config/impl/ConfigDepotAdminTest.java @@ -35,8 +35,6 @@ import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.ScopedConfigStorage; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.framework.config.impl.ConfigDepotImpl; -import org.apache.cloudstack.framework.config.impl.ConfigurationVO; import com.cloud.utils.db.EntityManager; diff --git a/framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java b/framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java index 89a23ce9c11..58584f93a14 100755 --- a/framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java +++ b/framework/db/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java @@ -32,19 +32,17 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import org.jasypt.exceptions.EncryptionOperationNotPossibleException; import org.jasypt.properties.EncryptableProperties; import com.cloud.utils.PropertiesUtil; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; - /* * EncryptionSecretKeyChanger updates Management Secret Key / DB Secret Key or both. * DB secret key is validated against the key in db.properties @@ -420,6 +418,6 @@ public class EncryptionSecretKeyChanger { private static void usage() { System.out.println("Usage: \tEncryptionSecretKeyChanger \n" + "\t\t-m \n" + "\t\t-d \n" + "\t\t-n [New Mgmt Secret Key] \n" - + "\t\t-e [New DB Secret Key]"); + + "\t\t-e [New DB Secret Key]"); } } diff --git a/framework/db/src/com/cloud/utils/db/Attribute.java b/framework/db/src/com/cloud/utils/db/Attribute.java index cefb837366b..82c2bdbaa79 100755 --- a/framework/db/src/com/cloud/utils/db/Attribute.java +++ b/framework/db/src/com/cloud/utils/db/Attribute.java @@ -34,9 +34,27 @@ import javax.persistence.TemporalType; */ public class Attribute { public enum Flag { - Insertable(0x01), Updatable(0x02), Nullable(0x04), DaoGenerated(0x08), DbGenerated(0x10), Embedded(0x20), Id(0x40), Selectable(0x80), Time(0x100), Date(0x200), TimeStamp( - 0x400), SequenceGV(0x1000), TableGV(0x2000), AutoGV(0x4000), Created(0x10000), Removed(0x20000), DC(0x40000), CharDT(0x100000), StringDT(0x200000), IntegerDT( - 0x400000), Encrypted(0x800000); + Insertable(0x01), + Updatable(0x02), + Nullable(0x04), + DaoGenerated(0x08), + DbGenerated(0x10), + Embedded(0x20), + Id(0x40), + Selectable(0x80), + Time(0x100), + Date(0x200), + TimeStamp(0x400), + SequenceGV(0x1000), + TableGV(0x2000), + AutoGV(0x4000), + Created(0x10000), + Removed(0x20000), + DC(0x40000), + CharDT(0x100000), + StringDT(0x200000), + IntegerDT(0x400000), + Encrypted(0x800000); int place; diff --git a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java index 2a59fbdb3f2..f5a3b2f0f17 100644 --- a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java +++ b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java @@ -30,9 +30,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.management.StandardMBean; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.log4j.Logger; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.mgmt.JmxUtil; diff --git a/framework/db/src/com/cloud/utils/db/EcInfo.java b/framework/db/src/com/cloud/utils/db/EcInfo.java index b33aa57b695..4e266f68e29 100644 --- a/framework/db/src/com/cloud/utils/db/EcInfo.java +++ b/framework/db/src/com/cloud/utils/db/EcInfo.java @@ -50,7 +50,8 @@ public class EcInfo { Type rawType = pType.getRawType(); Class rawClazz = (Class)rawType; try { - if (!Modifier.isAbstract(rawClazz.getModifiers()) && !rawClazz.isInterface() && rawClazz.getConstructors().length != 0 && rawClazz.getConstructor() != null) { + if (!Modifier.isAbstract(rawClazz.getModifiers()) && !rawClazz.isInterface() && rawClazz.getConstructors().length != 0 && + rawClazz.getConstructor() != null) { rawClass = rawClazz; } else if (Set.class == rawClazz) { rawClass = HashSet.class; diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java index 1a582df1f0d..8e6f6a45b69 100755 --- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java +++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java @@ -552,7 +552,8 @@ public abstract class GenericDaoBase extends Compone final Enum[] enums = (Enum[])field.getType().getEnumConstants(); for (final Enum e : enums) { - if ((enumType == EnumType.STRING && e.name().equalsIgnoreCase(rs.getString(index))) || (enumType == EnumType.ORDINAL && e.ordinal() == rs.getInt(index))) { + if ((enumType == EnumType.STRING && e.name().equalsIgnoreCase(rs.getString(index))) || + (enumType == EnumType.ORDINAL && e.ordinal() == rs.getInt(index))) { field.set(entity, e); return; } diff --git a/framework/db/src/com/cloud/utils/db/GlobalLock.java b/framework/db/src/com/cloud/utils/db/GlobalLock.java index c28873008bc..e03da53fc7d 100644 --- a/framework/db/src/com/cloud/utils/db/GlobalLock.java +++ b/framework/db/src/com/cloud/utils/db/GlobalLock.java @@ -133,7 +133,7 @@ public class GlobalLock { if (ownerThread != null) { profiler.start(); try { - wait(((long)timeoutSeconds) * 1000L); + wait((timeoutSeconds) * 1000L); } catch (InterruptedException e) { interrupted = true; } diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java b/framework/db/src/com/cloud/utils/db/Merovingian2.java index 6e110d3fd1e..59dff2dd383 100644 --- a/framework/db/src/com/cloud/utils/db/Merovingian2.java +++ b/framework/db/src/com/cloud/utils/db/Merovingian2.java @@ -39,7 +39,8 @@ import com.cloud.utils.time.InaccurateClock; public class Merovingian2 extends StandardMBean implements MerovingianMBean { private static final Logger s_logger = Logger.getLogger(Merovingian2.class); - private static final String ACQUIRE_SQL = "INSERT INTO op_lock (op_lock.key, op_lock.mac, op_lock.ip, op_lock.thread, op_lock.acquired_on, waiters) VALUES (?, ?, ?, ?, ?, 1)"; + private static final String ACQUIRE_SQL = + "INSERT INTO op_lock (op_lock.key, op_lock.mac, op_lock.ip, op_lock.thread, op_lock.acquired_on, waiters) VALUES (?, ?, ?, ?, ?, 1)"; private static final String INCREMENT_SQL = "UPDATE op_lock SET waiters=waiters+1 where op_lock.key=? AND op_lock.mac=? AND op_lock.ip=? AND op_lock.thread=?"; private static final String SELECT_SQL = "SELECT op_lock.key, mac, ip, thread, acquired_on, waiters FROM op_lock"; private static final String INQUIRE_SQL = SELECT_SQL + " WHERE op_lock.key=?"; @@ -427,7 +428,7 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean { pstmt.setInt(3, threadId); int rows = pstmt.executeUpdate(); assert (false) : "Abandon hope, all ye who enter here....There were still " + rows + ":" + c + - " locks not released when the transaction ended, check for lock not released or @DB is not added to the code that using the locks!"; + " locks not released when the transaction ended, check for lock not released or @DB is not added to the code that using the locks!"; } catch (SQLException e) { throw new CloudRuntimeException("Can't clear locks " + pstmt, e); } finally { diff --git a/framework/db/src/com/cloud/utils/db/SearchCriteria.java b/framework/db/src/com/cloud/utils/db/SearchCriteria.java index b6087102037..b7f8a93b2c8 100755 --- a/framework/db/src/com/cloud/utils/db/SearchCriteria.java +++ b/framework/db/src/com/cloud/utils/db/SearchCriteria.java @@ -103,7 +103,8 @@ public class SearchCriteria { _joins = new HashMap>>(sb._joins.size()); for (Map.Entry>> entry : sb._joins.entrySet()) { JoinBuilder> value = entry.getValue(); - _joins.put(entry.getKey(), new JoinBuilder>(value.getT().create(), value.getFirstAttribute(), value.getSecondAttribute(), value.getType())); + _joins.put(entry.getKey(), + new JoinBuilder>(value.getT().create(), value.getFirstAttribute(), value.getSecondAttribute(), value.getType())); } } _selects = sb._selects; diff --git a/framework/db/src/com/cloud/utils/db/SqlGenerator.java b/framework/db/src/com/cloud/utils/db/SqlGenerator.java index 86e28909660..2c24f62ced5 100755 --- a/framework/db/src/com/cloud/utils/db/SqlGenerator.java +++ b/framework/db/src/com/cloud/utils/db/SqlGenerator.java @@ -313,7 +313,8 @@ public class SqlGenerator { } } if (attrs.size() != 0) { - Pair pair = new Pair(buildUpdateSql(tableName, attrs), attrs.toArray(new Attribute[attrs.size()])); + Pair pair = + new Pair(buildUpdateSql(tableName, attrs), attrs.toArray(new Attribute[attrs.size()])); sqls.add(pair); } } diff --git a/framework/db/src/com/cloud/utils/db/StaticStrategy.java b/framework/db/src/com/cloud/utils/db/StaticStrategy.java index 72fa11a18e3..c8d21dd1a8f 100644 --- a/framework/db/src/com/cloud/utils/db/StaticStrategy.java +++ b/framework/db/src/com/cloud/utils/db/StaticStrategy.java @@ -34,16 +34,19 @@ public class StaticStrategy implements BalanceStrategy { public StaticStrategy() { } + @Override public void destroy() { // we don't have anything to clean up } + @Override public void init(Connection conn, Properties props) throws SQLException { // we don't have anything to initialize } - public ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy, List configuredHosts, Map liveConnections, long[] responseTimes, - int numRetries) throws SQLException { + @Override + public ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy, List configuredHosts, Map liveConnections, + long[] responseTimes, int numRetries) throws SQLException { int numHosts = configuredHosts.size(); SQLException ex = null; diff --git a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java index 86a01223224..e5cece182d2 100755 --- a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java +++ b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java @@ -114,7 +114,7 @@ public class TransactionLegacy { assert txn != null : "No Transaction on stack. Did you mark the method with @DB?"; assert checkAnnotation(4, txn) : "Did you even read the guide to use Transaction...IOW...other people's code? Try method can't be private. What about @DB? hmmm... could that be it? " + - txn; + txn; } return txn; } @@ -604,7 +604,7 @@ public class TransactionLegacy { _stack.push(new StackElement(CREATE_CONN, null)); if (s_connLogger.isTraceEnabled()) { s_connLogger.trace("Creating a DB connection with " + (_txn ? " txn: " : " no txn: ") + " for " + _dbId + ": dbconn" + System.identityHashCode(_conn) + - ". Stack: " + buildName()); + ". Stack: " + buildName()); } } else { s_logger.trace("conn: Using existing DB connection"); @@ -1093,20 +1093,19 @@ public class TransactionLegacy { System.setProperty("javax.net.ssl.trustStorePassword", dbProps.getProperty("db.cloud.trustStorePassword")); } - final GenericObjectPool cloudConnectionPool = new GenericObjectPool(null, cloudMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, cloudMaxWait, cloudMaxIdle, - cloudTestOnBorrow, false, cloudTimeBtwEvictionRunsMillis, 1, cloudMinEvcitableIdleTimeMillis, cloudTestWhileIdle); + final GenericObjectPool cloudConnectionPool = + new GenericObjectPool(null, cloudMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, cloudMaxWait, cloudMaxIdle, cloudTestOnBorrow, false, + cloudTimeBtwEvictionRunsMillis, 1, cloudMinEvcitableIdleTimeMillis, cloudTestWhileIdle); - final ConnectionFactory cloudConnectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://" + cloudHost + (s_dbHAEnabled ? "," + cloudSlaves : "") + ":" + - cloudPort + "/" + cloudDbName + "?autoReconnect=" + cloudAutoReconnect + - (url != null ? "&" + url : "") + (useSSL ? "&useSSL=true" : "") + - (s_dbHAEnabled ? "&" + cloudDbHAParams : "") + - (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), - cloudUsername, cloudPassword); + final ConnectionFactory cloudConnectionFactory = + new DriverManagerConnectionFactory("jdbc:mysql://" + cloudHost + (s_dbHAEnabled ? "," + cloudSlaves : "") + ":" + cloudPort + "/" + cloudDbName + + "?autoReconnect=" + cloudAutoReconnect + (url != null ? "&" + url : "") + (useSSL ? "&useSSL=true" : "") + + (s_dbHAEnabled ? "&" + cloudDbHAParams : "") + (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), cloudUsername, cloudPassword); final KeyedObjectPoolFactory poolableObjFactory = (cloudPoolPreparedStatements ? new StackKeyedObjectPoolFactory() : null); - final PoolableConnectionFactory cloudPoolableConnectionFactory = new PoolableConnectionFactory(cloudConnectionFactory, cloudConnectionPool, poolableObjFactory, - cloudValidationQuery, false, false, isolationLevel); + final PoolableConnectionFactory cloudPoolableConnectionFactory = + new PoolableConnectionFactory(cloudConnectionFactory, cloudConnectionPool, poolableObjFactory, cloudValidationQuery, false, false, isolationLevel); // Default Data Source for CloudStack s_ds = new PoolingDataSource(cloudPoolableConnectionFactory.getPool()); @@ -1123,32 +1122,31 @@ public class TransactionLegacy { final boolean usageAutoReconnect = Boolean.parseBoolean(dbProps.getProperty("db.usage.autoReconnect")); final String usageUrl = dbProps.getProperty("db.usage.url.params"); - final GenericObjectPool usageConnectionPool = new GenericObjectPool(null, usageMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, usageMaxWait, usageMaxIdle); + final GenericObjectPool usageConnectionPool = + new GenericObjectPool(null, usageMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, usageMaxWait, usageMaxIdle); - final ConnectionFactory usageConnectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://" + usageHost + - (s_dbHAEnabled ? "," + dbProps.getProperty("db.cloud.slaves") : "") + ":" + - usagePort + "/" + usageDbName + "?autoReconnect=" + usageAutoReconnect + - (usageUrl != null ? "&" + usageUrl : "") + - (s_dbHAEnabled ? "&" + getDBHAParams("usage", dbProps) : "") + - (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), - usageUsername, usagePassword); + final ConnectionFactory usageConnectionFactory = + new DriverManagerConnectionFactory("jdbc:mysql://" + usageHost + (s_dbHAEnabled ? "," + dbProps.getProperty("db.cloud.slaves") : "") + ":" + usagePort + + "/" + usageDbName + "?autoReconnect=" + usageAutoReconnect + (usageUrl != null ? "&" + usageUrl : "") + + (s_dbHAEnabled ? "&" + getDBHAParams("usage", dbProps) : "") + (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), usageUsername, + usagePassword); - final PoolableConnectionFactory usagePoolableConnectionFactory = new PoolableConnectionFactory(usageConnectionFactory, usageConnectionPool, - new StackKeyedObjectPoolFactory(), null, false, false); + final PoolableConnectionFactory usagePoolableConnectionFactory = + new PoolableConnectionFactory(usageConnectionFactory, usageConnectionPool, new StackKeyedObjectPoolFactory(), null, false, false); // Data Source for usage server s_usageDS = new PoolingDataSource(usagePoolableConnectionFactory.getPool()); // Configure awsapi db final String awsapiDbName = dbProps.getProperty("db.awsapi.name"); - final GenericObjectPool awsapiConnectionPool = new GenericObjectPool(null, usageMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, usageMaxWait, usageMaxIdle); - final ConnectionFactory awsapiConnectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://" + cloudHost + (s_dbHAEnabled ? "," + cloudSlaves : "") + ":" + - cloudPort + "/" + awsapiDbName + "?autoReconnect=" + cloudAutoReconnect + - (s_dbHAEnabled ? "&" + cloudDbHAParams : "") + - (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), - cloudUsername, cloudPassword); - final PoolableConnectionFactory awsapiPoolableConnectionFactory = new PoolableConnectionFactory(awsapiConnectionFactory, awsapiConnectionPool, - new StackKeyedObjectPoolFactory(), null, false, false); + final GenericObjectPool awsapiConnectionPool = + new GenericObjectPool(null, usageMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, usageMaxWait, usageMaxIdle); + final ConnectionFactory awsapiConnectionFactory = + new DriverManagerConnectionFactory("jdbc:mysql://" + cloudHost + (s_dbHAEnabled ? "," + cloudSlaves : "") + ":" + cloudPort + "/" + awsapiDbName + + "?autoReconnect=" + cloudAutoReconnect + (s_dbHAEnabled ? "&" + cloudDbHAParams : "") + + (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : ""), cloudUsername, cloudPassword); + final PoolableConnectionFactory awsapiPoolableConnectionFactory = + new PoolableConnectionFactory(awsapiConnectionFactory, awsapiConnectionPool, new StackKeyedObjectPoolFactory(), null, false, false); // Data Source for awsapi s_awsapiDS = new PoolingDataSource(awsapiPoolableConnectionFactory.getPool()); @@ -1165,15 +1163,15 @@ public class TransactionLegacy { final String simulatorDbName = dbProps.getProperty("db.simulator.name"); final boolean simulatorAutoReconnect = Boolean.parseBoolean(dbProps.getProperty("db.simulator.autoReconnect")); - final GenericObjectPool simulatorConnectionPool = new GenericObjectPool(null, simulatorMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, - simulatorMaxWait, simulatorMaxIdle); + final GenericObjectPool simulatorConnectionPool = + new GenericObjectPool(null, simulatorMaxActive, GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION, simulatorMaxWait, simulatorMaxIdle); - final ConnectionFactory simulatorConnectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://" + simulatorHost + ":" + simulatorPort + "/" + - simulatorDbName + "?autoReconnect=" + simulatorAutoReconnect, - simulatorUsername, simulatorPassword); + final ConnectionFactory simulatorConnectionFactory = + new DriverManagerConnectionFactory("jdbc:mysql://" + simulatorHost + ":" + simulatorPort + "/" + simulatorDbName + "?autoReconnect=" + + simulatorAutoReconnect, simulatorUsername, simulatorPassword); - final PoolableConnectionFactory simulatorPoolableConnectionFactory = new PoolableConnectionFactory(simulatorConnectionFactory, simulatorConnectionPool, - new StackKeyedObjectPoolFactory(), null, false, false); + final PoolableConnectionFactory simulatorPoolableConnectionFactory = + new PoolableConnectionFactory(simulatorConnectionFactory, simulatorConnectionPool, new StackKeyedObjectPoolFactory(), null, false, false); s_simulatorDS = new PoolingDataSource(simulatorPoolableConnectionFactory.getPool()); } catch (Exception e) { s_logger.debug("Simulator DB properties are not available. Not initializing simulator DS"); @@ -1205,7 +1203,7 @@ public class TransactionLegacy { final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/" + database, "cloud", "cloud"); final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory, connectionPool, null, null, false, true); return new PoolingDataSource( - /* connectionPool */poolableConnectionFactory.getPool()); + /* connectionPool */poolableConnectionFactory.getPool()); } /** diff --git a/framework/db/test/com/cloud/utils/DbUtilTest.java b/framework/db/test/com/cloud/utils/DbUtilTest.java index 6ae0e732ad8..a2153fee506 100644 --- a/framework/db/test/com/cloud/utils/DbUtilTest.java +++ b/framework/db/test/com/cloud/utils/DbUtilTest.java @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; @@ -149,13 +150,13 @@ public class DbUtilTest { @Test public void getGlobalLock() throws SQLException { Mockito.when(dataSource.getConnection()).thenReturn(connection); - Mockito.when(connection.prepareStatement(Mockito.anyString())).thenReturn(preparedStatement); + Mockito.when(connection.prepareStatement(Matchers.anyString())).thenReturn(preparedStatement); Mockito.when(preparedStatement.executeQuery()).thenReturn(resultSet); Mockito.when(resultSet.first()).thenReturn(true); Mockito.when(resultSet.getInt(1)).thenReturn(1); Assert.assertTrue(DbUtil.getGlobalLock("TEST", 600)); - Mockito.verify(connection).prepareStatement(Mockito.anyString()); + Mockito.verify(connection).prepareStatement(Matchers.anyString()); Mockito.verify(preparedStatement).close(); Mockito.verify(resultSet).close(); } @@ -163,13 +164,13 @@ public class DbUtilTest { @Test public void getGlobalLockTimeout() throws SQLException { Mockito.when(dataSource.getConnection()).thenReturn(connection); - Mockito.when(connection.prepareStatement(Mockito.anyString())).thenReturn(preparedStatement); + Mockito.when(connection.prepareStatement(Matchers.anyString())).thenReturn(preparedStatement); Mockito.when(preparedStatement.executeQuery()).thenReturn(resultSet); Mockito.when(resultSet.first()).thenReturn(true); Mockito.when(resultSet.getInt(1)).thenReturn(0); Assert.assertFalse(DbUtil.getGlobalLock("TEST", 600)); - Mockito.verify(connection).prepareStatement(Mockito.anyString()); + Mockito.verify(connection).prepareStatement(Matchers.anyString()); Mockito.verify(preparedStatement).close(); Mockito.verify(resultSet).close(); Mockito.verify(connection).close(); @@ -236,7 +237,7 @@ public class DbUtilTest { @Test public void releaseGlobalLock() throws SQLException { - Mockito.when(connection.prepareStatement(Mockito.anyString())).thenReturn(preparedStatement); + Mockito.when(connection.prepareStatement(Matchers.anyString())).thenReturn(preparedStatement); Mockito.when(preparedStatement.executeQuery()).thenReturn(resultSet); Mockito.when(resultSet.first()).thenReturn(true); Mockito.when(resultSet.getInt(1)).thenReturn(1); diff --git a/framework/db/test/com/cloud/utils/db/DbTestDao.java b/framework/db/test/com/cloud/utils/db/DbTestDao.java index 6d74b0ec1bb..fbcdb44996a 100644 --- a/framework/db/test/com/cloud/utils/db/DbTestDao.java +++ b/framework/db/test/com/cloud/utils/db/DbTestDao.java @@ -17,10 +17,7 @@ package com.cloud.utils.db; import java.sql.PreparedStatement; -import java.util.Date; -import java.util.TimeZone; -import com.cloud.utils.DateUtil; import com.cloud.utils.exception.CloudRuntimeException; public class DbTestDao extends GenericDaoBase implements GenericDao { diff --git a/framework/db/test/com/cloud/utils/db/ElementCollectionTest.java b/framework/db/test/com/cloud/utils/db/ElementCollectionTest.java index b64b381de88..44f183dc8cd 100644 --- a/framework/db/test/com/cloud/utils/db/ElementCollectionTest.java +++ b/framework/db/test/com/cloud/utils/db/ElementCollectionTest.java @@ -50,7 +50,8 @@ public class ElementCollectionTest extends TestCase { ParameterizedType type = (ParameterizedType)field.getGenericType(); Type rawType = type.getRawType(); Class rawClazz = (Class)rawType; - if (!Modifier.isAbstract(rawClazz.getModifiers()) && !rawClazz.isInterface() && rawClazz.getConstructors().length != 0 && rawClazz.getConstructor() != null) { + if (!Modifier.isAbstract(rawClazz.getModifiers()) && !rawClazz.isInterface() && rawClazz.getConstructors().length != 0 && + rawClazz.getConstructor() != null) { collection = rawClazz.newInstance(); } diff --git a/framework/db/test/com/cloud/utils/db/TestTransaction.java b/framework/db/test/com/cloud/utils/db/TestTransaction.java index 46db299094f..133472d3e0b 100644 --- a/framework/db/test/com/cloud/utils/db/TestTransaction.java +++ b/framework/db/test/com/cloud/utils/db/TestTransaction.java @@ -18,8 +18,11 @@ */ package com.cloud.utils.db; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import java.io.FileNotFoundException; import java.sql.Connection; diff --git a/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java b/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java index 1075a423176..a0f7c803e4b 100644 --- a/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java +++ b/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java @@ -17,7 +17,6 @@ package com.cloud.utils.db; import java.util.List; -import java.util.Map; import javax.inject.Inject; diff --git a/framework/db/test/com/cloud/utils/db/TransactionTest.java b/framework/db/test/com/cloud/utils/db/TransactionTest.java index 15b3ce0f48a..76bd5a54161 100644 --- a/framework/db/test/com/cloud/utils/db/TransactionTest.java +++ b/framework/db/test/com/cloud/utils/db/TransactionTest.java @@ -43,8 +43,9 @@ public class TransactionTest { try { conn = TransactionLegacy.getStandaloneConnection(); - pstmt = conn.prepareStatement("CREATE TABLE `cloud`.`test` (" + "`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT," + "`fld_int` int unsigned," - + "`fld_long` bigint unsigned," + "`fld_string` varchar(255)," + "PRIMARY KEY (`id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + pstmt = + conn.prepareStatement("CREATE TABLE `cloud`.`test` (" + "`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT," + "`fld_int` int unsigned," + + "`fld_long` bigint unsigned," + "`fld_string` varchar(255)," + "PRIMARY KEY (`id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"); pstmt.execute(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java index f0f21180a6a..7ccd8bbaa78 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java @@ -19,9 +19,7 @@ package org.apache.cloudstack.framework.rpc; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class RpcClientCallImpl implements RpcClientCall { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java index 11ca2b9e38d..0fb8141b4b2 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java @@ -24,6 +24,8 @@ import java.util.Random; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.serializer.MessageSerializer; import org.apache.cloudstack.framework.transport.TransportAddress; import org.apache.cloudstack.framework.transport.TransportDataPdu; @@ -32,7 +34,6 @@ import org.apache.cloudstack.framework.transport.TransportEndpointSite; import org.apache.cloudstack.framework.transport.TransportPdu; import org.apache.cloudstack.framework.transport.TransportProvider; import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.log4j.Logger; import com.cloud.utils.concurrency.NamedThreadFactory; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java index 75ee5eda993..4a724fd96fc 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java @@ -117,7 +117,7 @@ public class TransportAddress { return true; return _nodeId.equals(((TransportAddress)other)._nodeId) && _connectionId == (((TransportAddress)other)._connectionId) && - _endpointId.equals(((TransportAddress)other)._endpointId) && _magic == ((TransportAddress)other)._magic; + _endpointId.equals(((TransportAddress)other)._endpointId) && _magic == ((TransportAddress)other)._magic; } @Override diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java index 14e492de41f..164852af4e7 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java @@ -20,11 +20,6 @@ package org.apache.cloudstack.framework.codestyle; import java.util.concurrent.ExecutionException; -import org.apache.cloudstack.framework.async.AsyncCallFuture; -import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; -import org.apache.cloudstack.framework.async.AsyncCallbackDriver; -import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -32,6 +27,12 @@ import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; +import org.apache.cloudstack.framework.async.AsyncCallbackDriver; +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import org.apache.cloudstack.framework.async.AsyncRpcContext; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/SampleManagementServerAppContext.xml") public class AsyncSampleEventDrivenStyleCaller { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java index e026b9a3333..b1dbfc5a165 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java @@ -18,8 +18,6 @@ */ package org.apache.cloudstack.framework.codestyle; -import org.apache.cloudstack.framework.async.AsyncCompletionCallback; - public class AsyncSampleListenerStyleCaller { AsyncSampleCallee _ds; diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java index 9d6ab174940..2ea7c7c3dc1 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java @@ -32,7 +32,13 @@ public class ClientOnlyEventDrivenStyle { String cmd = new String(); RpcCallbackDispatcher callbackDispatcher = RpcCallbackDispatcher.create(this); callbackDispatcher.setCallback(callbackDispatcher.getTarget().OnAsyncCallRpcServiceCallback(null, null)); - _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000).setCallbackDispatcher(callbackDispatcher).setContext("Context Object") // save context object for callback handler + _rpcProvider.newCall("host-2") + .setCommand("TestCommand") + .setCommandArg(cmd) + .setTimeout(10000) + .setCallbackDispatcher(callbackDispatcher) + .setContext("Context Object") + // save context object for callback handler .apply(); } diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java index ad93160110c..e3abcca9d46 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java @@ -24,6 +24,9 @@ import java.util.TimerTask; import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.MessageDispatcher; import org.apache.cloudstack.framework.messagebus.MessageHandler; @@ -33,8 +36,6 @@ import org.apache.cloudstack.framework.rpc.RpcProvider; import org.apache.cloudstack.framework.rpc.RpcServerCall; import org.apache.cloudstack.framework.rpc.RpcServiceDispatcher; import org.apache.cloudstack.framework.rpc.RpcServiceHandler; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; @Component public class SampleManagerComponent { @@ -59,6 +60,7 @@ public class SampleManagerComponent { _eventBus.subscribe("network", MessageDispatcher.getDispatcher(this)); _timer.schedule(new TimerTask() { + @Override public void run() { testRpc(); } @@ -79,16 +81,21 @@ public class SampleManagerComponent { cmd.setStoragePool("Pool1"); cmd.setVolumeId("vol1"); - _rpcProvider.newCall().setCommand("StoragePrepare").setCommandArg(cmd).setTimeout(10000).addCallbackListener(new RpcCallbackListener() { - @Override - public void onSuccess(SampleStoragePrepareAnswer result) { - s_logger.info("StoragePrepare return result: " + result.getResult()); - } + _rpcProvider.newCall() + .setCommand("StoragePrepare") + .setCommandArg(cmd) + .setTimeout(10000) + .addCallbackListener(new RpcCallbackListener() { + @Override + public void onSuccess(SampleStoragePrepareAnswer result) { + s_logger.info("StoragePrepare return result: " + result.getResult()); + } - @Override - public void onFailure(RpcException e) { - s_logger.info("StoragePrepare failed"); - } - }).apply(); + @Override + public void onFailure(RpcException e) { + s_logger.info("StoragePrepare failed"); + } + }) + .apply(); } } diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java index d77cfc7ff1f..13040c1c935 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java @@ -21,6 +21,9 @@ package org.apache.cloudstack.framework.sampleserver; import javax.annotation.PostConstruct; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.MessageDispatcher; import org.apache.cloudstack.framework.messagebus.MessageHandler; @@ -28,8 +31,6 @@ import org.apache.cloudstack.framework.rpc.RpcProvider; import org.apache.cloudstack.framework.rpc.RpcServerCall; import org.apache.cloudstack.framework.rpc.RpcServiceDispatcher; import org.apache.cloudstack.framework.rpc.RpcServiceHandler; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; @Component public class SampleManagerComponent2 { diff --git a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java b/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java index 74581284b7c..c81d8aa994a 100644 --- a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java +++ b/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java @@ -22,10 +22,6 @@ import javax.inject.Inject; import junit.framework.TestCase; -import org.apache.cloudstack.framework.messagebus.MessageBus; -import org.apache.cloudstack.framework.messagebus.MessageDetector; -import org.apache.cloudstack.framework.messagebus.MessageSubscriber; -import org.apache.cloudstack.framework.messagebus.PublishScope; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +29,11 @@ import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.framework.messagebus.MessageBus; +import org.apache.cloudstack.framework.messagebus.MessageDetector; +import org.apache.cloudstack.framework.messagebus.MessageSubscriber; +import org.apache.cloudstack.framework.messagebus.PublishScope; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/MessageBusTestContext.xml") public class TestMessageBus extends TestCase { diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java index 2f3e5cf4542..f0de4cd002a 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.framework.jobs; import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.jobs.dao.AsyncJobJoinMapDao; import org.apache.cloudstack.framework.jobs.impl.AsyncJobJoinMapVO; import org.apache.cloudstack.framework.jobs.impl.JobSerializerHelper; diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java index 5d5faab3a25..612573f31fc 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java @@ -169,8 +169,9 @@ public class AsyncJobDaoImpl extends GenericDaoBase implements @Override @DB public void resetJobProcess(long msid, int jobResultCode, String jobResultMessage) { - String sql = "UPDATE async_job SET job_status=" + JobInfo.Status.FAILED.ordinal() + ", job_result_code=" + jobResultCode + ", job_result='" + jobResultMessage + - "' where job_status=" + JobInfo.Status.IN_PROGRESS.ordinal() + " AND (job_executing_msid=? OR (job_executing_msid IS NULL AND job_init_msid=?))"; + String sql = + "UPDATE async_job SET job_status=" + JobInfo.Status.FAILED.ordinal() + ", job_result_code=" + jobResultCode + ", job_result='" + jobResultMessage + + "' where job_status=" + JobInfo.Status.IN_PROGRESS.ordinal() + " AND (job_executing_msid=? OR (job_executing_msid IS NULL AND job_init_msid=?))"; TransactionLegacy txn = TransactionLegacy.currentTxn(); PreparedStatement pstmt = null; diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java index f27c49ce295..7bc29db8cbe 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobJoinMapDaoImpl.java @@ -74,7 +74,8 @@ public class AsyncJobJoinMapDaoImpl extends GenericDaoBase public List getNextQueueItems(int maxItems) { List l = new ArrayList(); - String sql = "SELECT i.id, i.queue_id, i.content_type, i.content_id, i.created " + " FROM sync_queue AS q JOIN sync_queue_item AS i ON q.id = i.queue_id " - + " WHERE i.queue_proc_number IS NULL " + " GROUP BY q.id " + " ORDER BY i.id " + " LIMIT 0, ?"; + String sql = + "SELECT i.id, i.queue_id, i.content_type, i.content_id, i.created " + " FROM sync_queue AS q JOIN sync_queue_item AS i ON q.id = i.queue_id " + + " WHERE i.queue_proc_number IS NULL " + " GROUP BY q.id " + " ORDER BY i.id " + " LIMIT 0, ?"; TransactionLegacy txn = TransactionLegacy.currentTxn(); PreparedStatement pstmt = null; diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java index 441fdf31358..3079a64d28d 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobJournalVO.java @@ -28,7 +28,6 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.cloudstack.framework.jobs.AsyncJob; -import org.apache.cloudstack.framework.jobs.AsyncJob.JournalType; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDao; diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 02411933441..39f48188fc0 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -33,6 +33,8 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; @@ -52,7 +54,6 @@ import org.apache.cloudstack.jobs.JobInfo; import org.apache.cloudstack.jobs.JobInfo.Status; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHost; @@ -211,7 +212,8 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, final AsyncJobVO job = _jobDao.findById(jobId); if (job == null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus + ", resultCode: " + resultCode + ", result: " + resultObject); + s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus + ", resultCode: " + resultCode + ", result: " + + resultObject); } return; @@ -350,47 +352,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, @Override @DB public void completeJoin(long joinJobId, JobInfo.Status joinStatus, String joinResult) { - // - // TODO - // this is a temporary solution to solve strange MySQL deadlock issue, - // completeJoin() causes deadlock happens at async_job table - // I removed the temporary solution already. I think my changes should fix the deadlock. - - /* - ------------------------ - LATEST DETECTED DEADLOCK - ------------------------ - 130625 20:03:10 - *** (1) TRANSACTION: - TRANSACTION 0 98087127, ACTIVE 0 sec, process no 1489, OS thread id 139837829175040 fetching rows, thread declared inside InnoDB 494 - mysql tables in use 2, locked 1 - LOCK WAIT 3 lock struct(s), heap size 368, 2 row lock(s), undo log entries 1 - MySQL thread id 28408, query id 368571321 localhost 127.0.0.1 cloud preparing - UPDATE async_job SET job_pending_signals=1 WHERE id IN (SELECT job_id FROM async_job_join_map WHERE join_job_id = 9) - *** (1) WAITING FOR THIS LOCK TO BE GRANTED: - RECORD LOCKS space id 0 page no 1275 n bits 80 index `PRIMARY` of table `cloud`.`async_job` trx id 0 98087127 lock_mode X locks rec but not gap waiting - Record lock, heap no 9 PHYSICAL RECORD: n_fields 26; compact format; info bits 0 - 0: len 8; hex 0000000000000008; asc ;; 1: len 6; hex 000005d8b0d8; asc ;; 2: len 7; hex 00000009270110; asc ' ;; 3: len 8; hex 0000000000000002; asc ;; 4: len 8; hex 0000000000000002; asc ;; 5: SQL NULL; 6: SQL NULL; 7: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e636f6d6d; asc org.apache.cloudstack.api.comm;...(truncated); 8: len 30; hex 7b226964223a2232222c22706879736963616c6e6574776f726b6964223a; asc {"id":"2","physicalnetworkid":;...(truncated); 9: len 4; hex 80000000; asc ;; 10: len 4; hex 80000001; asc ;; 11: len 4; hex 80000000; asc ;; 12: len 4; hex 80000000; asc ;; 13: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e72657370; asc org.apache.cloudstack.api.resp;...(truncated); 14: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 15: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 16: len 8; hex 8000124f06cfd5b6; asc O ;; 17: len 8; hex 8000124f06cfd5b6; asc O ;; 18: SQL NULL; 19: SQL NULL; 20: len 30; hex 66376466396532362d323139622d346338652d393231332d393766653636; asc f7df9e26-219b-4c8e-9213-97fe66;...(truncated); 21: len 30; hex 36623238306364362d663436652d343563322d383833642d333863616439; asc 6b280cd6-f46e-45c2-883d-38cad9;...(truncated); 22: SQL NULL; 23: len 21; hex 4170694173796e634a6f6244697370617463686572; asc ApiAsyncJobDispatcher;; 24: SQL NULL; 25: len 4; hex 80000000; asc ;; - - *** (2) TRANSACTION: - TRANSACTION 0 98087128, ACTIVE 0 sec, process no 1489, OS thread id 139837671909120 fetching rows, thread declared inside InnoDB 492 - mysql tables in use 2, locked 1 - 3 lock struct(s), heap size 368, 2 row lock(s), undo log entries 1 - MySQL thread id 28406, query id 368571323 localhost 127.0.0.1 cloud preparing - UPDATE async_job SET job_pending_signals=1 WHERE id IN (SELECT job_id FROM async_job_join_map WHERE join_job_id = 8) - *** (2) HOLDS THE LOCK(S): - RECORD LOCKS space id 0 page no 1275 n bits 80 index `PRIMARY` of table `cloud`.`async_job` trx id 0 98087128 lock_mode X locks rec but not gap - Record lock, heap no 9 PHYSICAL RECORD: n_fields 26; compact format; info bits 0 - 0: len 8; hex 0000000000000008; asc ;; 1: len 6; hex 000005d8b0d8; asc ;; 2: len 7; hex 00000009270110; asc ' ;; 3: len 8; hex 0000000000000002; asc ;; 4: len 8; hex 0000000000000002; asc ;; 5: SQL NULL; 6: SQL NULL; 7: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e636f6d6d; asc org.apache.cloudstack.api.comm;...(truncated); 8: len 30; hex 7b226964223a2232222c22706879736963616c6e6574776f726b6964223a; asc {"id":"2","physicalnetworkid":;...(truncated); 9: len 4; hex 80000000; asc ;; 10: len 4; hex 80000001; asc ;; 11: len 4; hex 80000000; asc ;; 12: len 4; hex 80000000; asc ;; 13: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e72657370; asc org.apache.cloudstack.api.resp;...(truncated); 14: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 15: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 16: len 8; hex 8000124f06cfd5b6; asc O ;; 17: len 8; hex 8000124f06cfd5b6; asc O ;; 18: SQL NULL; 19: SQL NULL; 20: len 30; hex 66376466396532362d323139622d346338652d393231332d393766653636; asc f7df9e26-219b-4c8e-9213-97fe66;...(truncated); 21: len 30; hex 36623238306364362d663436652d343563322d383833642d333863616439; asc 6b280cd6-f46e-45c2-883d-38cad9;...(truncated); 22: SQL NULL; 23: len 21; hex 4170694173796e634a6f6244697370617463686572; asc ApiAsyncJobDispatcher;; 24: SQL NULL; 25: len 4; hex 80000000; asc ;; - - *** (2) WAITING FOR THIS LOCK TO BE GRANTED: - RECORD LOCKS space id 0 page no 1275 n bits 80 index `PRIMARY` of table `cloud`.`async_job` trx id 0 98087128 lock_mode X locks rec but not gap waiting - Record lock, heap no 10 PHYSICAL RECORD: n_fields 26; compact format; info bits 0 - 0: len 8; hex 0000000000000009; asc ;; 1: len 6; hex 000005d8b0d7; asc ;; 2: len 7; hex 00000009280110; asc ( ;; 3: len 8; hex 0000000000000002; asc ;; 4: len 8; hex 0000000000000002; asc ;; 5: SQL NULL; 6: SQL NULL; 7: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e636f6d6d; asc org.apache.cloudstack.api.comm;...(truncated); 8: len 30; hex 7b226964223a2233222c22706879736963616c6e6574776f726b6964223a; asc {"id":"3","physicalnetworkid":;...(truncated); 9: len 4; hex 80000000; asc ;; 10: len 4; hex 80000001; asc ;; 11: len 4; hex 80000000; asc ;; 12: len 4; hex 80000000; asc ;; 13: len 30; hex 6f72672e6170616368652e636c6f7564737461636b2e6170692e72657370; asc org.apache.cloudstack.api.resp;...(truncated); 14: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 15: len 8; hex 80001a6f7bb0d0a8; asc o{ ;; 16: len 8; hex 8000124f06cfd5b6; asc O ;; 17: len 8; hex 8000124f06cfd5b6; asc O ;; 18: SQL NULL; 19: SQL NULL; 20: len 30; hex 62313065306432342d336233352d343663622d386361622d623933623562; asc b10e0d24-3b35-46cb-8cab-b93b5b;...(truncated); 21: len 30; hex 39353664383563632d383336622d346663612d623738622d646238343739; asc 956d85cc-836b-4fca-b78b-db8479;...(truncated); 22: SQL NULL; 23: len 21; hex 4170694173796e634a6f6244697370617463686572; asc ApiAsyncJobDispatcher;; 24: SQL NULL; 25: len 4; hex 80000000; asc ;; - - *** WE ROLL BACK TRANSACTION (2) - */ - _joinMapDao.completeJoin(joinJobId, joinStatus, joinResult, getMsid()); } @@ -613,8 +574,8 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, if (executionContext.getSyncSource() != null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Release sync source for job-" + executionContext.getJob().getId() + " sync source: " + executionContext.getSyncSource().getContentType() + "-" + - executionContext.getSyncSource().getContentId()); + s_logger.debug("Release sync source for job-" + executionContext.getJob().getId() + " sync source: " + executionContext.getSyncSource().getContentType() + + "-" + executionContext.getSyncSource().getContentId()); } _queueMgr.purgeItem(executionContext.getSyncSource().getId()); diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java index 44a92672b01..671818130f9 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java @@ -19,13 +19,13 @@ package org.apache.cloudstack.framework.jobs.impl; import java.util.HashMap; import java.util.Map; import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.jobs.AsyncJob; import org.apache.cloudstack.framework.jobs.AsyncJobManager; import org.apache.cloudstack.framework.messagebus.MessageBus; @@ -86,7 +86,8 @@ public class AsyncJobMonitor extends ManagerBase { synchronized (this) { for (Map.Entry entry : _activeTasks.entrySet()) { if (entry.getValue().millisSinceLastJobHeartbeat() > _inactivityWarningThresholdMs) { - s_logger.warn("Task (job-" + entry.getValue().getJobId() + ") has been pending for " + entry.getValue().millisSinceLastJobHeartbeat() / 1000 + " seconds"); + s_logger.warn("Task (job-" + entry.getValue().getJobId() + ") has been pending for " + entry.getValue().millisSinceLastJobHeartbeat() / 1000 + + " seconds"); } } } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java index 5592c69cea9..cbdb78d4d55 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.framework.jobs.impl; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; import javax.persistence.Column; @@ -29,6 +27,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "sync_queue_item") public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity { @@ -60,6 +60,7 @@ public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity { @Column(name = "created") private Date created; + @Override public long getId() { return id; } @@ -119,6 +120,7 @@ public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity { this.created = created; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("SyncQueueItemVO {id:").append(getId()).append(", queueId: ").append(getQueueId()); diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java index b4d13dfa826..09974a1c133 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java @@ -23,6 +23,7 @@ import java.util.List; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.jobs.dao.SyncQueueDao; import org.apache.cloudstack.framework.jobs.dao.SyncQueueItemDao; diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java index 1316cc27bf7..9e4093b5818 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java @@ -17,9 +17,8 @@ package org.apache.cloudstack.framework.jobs.impl; -import org.apache.cloudstack.api.InternalIdentity; - import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -29,6 +28,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "sync_queue") public class SyncQueueVO implements InternalIdentity { @@ -61,6 +62,7 @@ public class SyncQueueVO implements InternalIdentity { @Column(name = "queue_size_limit") private long queueSizeLimit = 0; + @Override public long getId() { return id; } @@ -105,6 +107,7 @@ public class SyncQueueVO implements InternalIdentity { this.lastUpdated = lastUpdated; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("SyncQueueVO {id:").append(getId()); diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java index 04481e1c73b..ef0ac7daddf 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/VmWorkJobVO.java @@ -24,8 +24,6 @@ import javax.persistence.Enumerated; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; -import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; - import com.cloud.vm.VirtualMachine; @Entity diff --git a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/ManagedContextRunnable.java b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/ManagedContextRunnable.java index 25ff0db42fd..d33521501f4 100644 --- a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/ManagedContextRunnable.java +++ b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/ManagedContextRunnable.java @@ -18,10 +18,11 @@ */ package org.apache.cloudstack.managed.context; -import org.apache.cloudstack.managed.context.impl.DefaultManagedContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cloudstack.managed.context.impl.DefaultManagedContext; + public abstract class ManagedContextRunnable implements Runnable { private static final int SLEEP_COUNT = 120; diff --git a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContext.java b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContext.java index 0bcf05d0dd1..34c83b1d332 100644 --- a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContext.java +++ b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContext.java @@ -23,12 +23,13 @@ import java.util.Stack; import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cloudstack.managed.context.ManagedContext; import org.apache.cloudstack.managed.context.ManagedContextListener; import org.apache.cloudstack.managed.context.ManagedContextUtils; import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DefaultManagedContext implements ManagedContext { diff --git a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/threadlocal/ManagedThreadLocal.java b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/threadlocal/ManagedThreadLocal.java index 73adc413bb3..57377bcb0fd 100644 --- a/framework/managed-context/src/main/java/org/apache/cloudstack/managed/threadlocal/ManagedThreadLocal.java +++ b/framework/managed-context/src/main/java/org/apache/cloudstack/managed/threadlocal/ManagedThreadLocal.java @@ -21,10 +21,11 @@ package org.apache.cloudstack.managed.threadlocal; import java.util.HashMap; import java.util.Map; -import org.apache.cloudstack.managed.context.ManagedContextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cloudstack.managed.context.ManagedContextUtils; + public class ManagedThreadLocal extends ThreadLocal { private static final ThreadLocal> MANAGED_THREAD_LOCAL = new ThreadLocal>() { diff --git a/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java b/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java index 7ad06f4f2f9..3da9a9a8b91 100644 --- a/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java +++ b/framework/managed-context/src/test/java/org/apache/cloudstack/managed/context/impl/DefaultManagedContextTest.java @@ -18,17 +18,21 @@ */ package org.apache.cloudstack.managed.context.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import org.apache.cloudstack.managed.context.ManagedContextListener; -import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal; import org.junit.Before; import org.junit.Test; +import org.apache.cloudstack.managed.context.ManagedContextListener; +import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal; + public class DefaultManagedContextTest { DefaultManagedContext context; diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java index dc9cca498f9..ede9e78fb1e 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java @@ -46,8 +46,8 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - for ( Class typeClass : typeClasses ) { - if ( typeClass.isAssignableFrom(bean.getClass()) ) { + for (Class typeClass : typeClasses) { + if (typeClass.isAssignableFrom(bean.getClass())) { doPostProcessBeforeInitialization(bean, beanName); break; } @@ -62,7 +62,7 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple protected void doPostProcessAfterInitialization(Object bean, Class typeClass, String beanName) throws BeansException { Set beansOfType = beans.get(typeClass); - if ( beansOfType == null ) { + if (beansOfType == null) { beansOfType = new HashSet(); beans.put(typeClass, beansOfType); } @@ -72,8 +72,8 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - for ( Class typeClass : typeClasses ) { - if ( typeClass.isAssignableFrom(bean.getClass()) ) { + for (Class typeClass : typeClasses) { + if (typeClass.isAssignableFrom(bean.getClass())) { doPostProcessAfterInitialization(bean, typeClass, beanName); } } @@ -83,23 +83,23 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple protected Set getBeans(Class typeClass) { @SuppressWarnings("unchecked") - Set result = (Set) beans.get(typeClass); + Set result = (Set)beans.get(typeClass); - if ( result == null ) + if (result == null) return Collections.emptySet(); return result; } public Class getTypeClass() { - if ( typeClasses == null || typeClasses.length == 0 ) + if (typeClasses == null || typeClasses.length == 0) return null; return typeClasses[0]; } public void setTypeClass(Class typeClass) { - this.typeClasses = new Class[] { typeClass }; + this.typeClasses = new Class[] {typeClass}; } public Class[] getTypeClasses() { diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java index 9f3a66929f2..75aca3e5ba7 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java @@ -46,10 +46,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { public CloudStackExtendedLifeCycle() { super(); - setTypeClasses(new Class[] { - ComponentLifecycle.class, - SystemIntegrityChecker.class - }); + setTypeClasses(new Class[] {ComponentLifecycle.class, SystemIntegrityChecker.class}); } @Override @@ -62,7 +59,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } protected void checkIntegrity() { - for ( SystemIntegrityChecker checker : getBeans(SystemIntegrityChecker.class) ) { + for (SystemIntegrityChecker checker : getBeans(SystemIntegrityChecker.class)) { log.info("Running system integrity checker {}", checker); checker.check(); @@ -77,7 +74,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { public void with(ComponentLifecycle lifecycle) { lifecycle.start(); - if ( lifecycle instanceof ManagementBean ) { + if (lifecycle instanceof ManagementBean) { ManagementBean mbean = (ManagementBean)lifecycle; try { JmxUtil.registerMBean(mbean); @@ -126,10 +123,10 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } private void sortBeans() { - for ( ComponentLifecycle lifecycle : getBeans(ComponentLifecycle.class) ) { + for (ComponentLifecycle lifecycle : getBeans(ComponentLifecycle.class)) { Set set = sorted.get(lifecycle.getRunLevel()); - if ( set == null ) { + if (set == null) { set = new HashSet(); sorted.put(lifecycle.getRunLevel(), set); } @@ -151,8 +148,8 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } protected void with(WithComponentLifeCycle with) { - for ( Set lifecycles : sorted.values() ) { - for ( ComponentLifecycle lifecycle : lifecycles ) { + for (Set lifecycles : sorted.values()) { + for (ComponentLifecycle lifecycle : lifecycles) { with.with(lifecycle); } } @@ -164,6 +161,6 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } private static interface WithComponentLifeCycle { - public void with(ComponentLifecycle lifecycle); + public void with(ComponentLifecycle lifecycle); } } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java index 82d6a7af6df..167c3c2cad4 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java @@ -20,11 +20,12 @@ package org.apache.cloudstack.spring.lifecycle; import javax.inject.Inject; -import org.apache.cloudstack.framework.config.ConfigDepotAdmin; -import org.apache.cloudstack.framework.config.Configurable; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.apache.cloudstack.framework.config.ConfigDepotAdmin; +import org.apache.cloudstack.framework.config.Configurable; + public class ConfigDepotLifeCycle implements BeanPostProcessor { @Inject @@ -32,7 +33,7 @@ public class ConfigDepotLifeCycle implements BeanPostProcessor { @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if ( bean instanceof Configurable ) { + if (bean instanceof Configurable) { configDepotAdmin.populateConfiguration((Configurable)bean); } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java index 424f6dafc41..79e35f11d0c 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java @@ -20,15 +20,15 @@ package org.apache.cloudstack.spring.lifecycle.registry; import java.util.List; -import com.cloud.utils.component.ComponentLifecycleBase; -import com.cloud.utils.component.Named; -import com.cloud.utils.component.Registry; - import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.cloud.utils.component.ComponentLifecycleBase; +import com.cloud.utils.component.Named; +import com.cloud.utils.component.Registry; + public class DumpRegistry extends ComponentLifecycleBase { private static final Logger log = LoggerFactory.getLogger(DumpRegistry.class); @@ -46,11 +46,11 @@ public class DumpRegistry extends ComponentLifecycleBase { @Override public boolean start() { - for ( Registry registry : registries ) { + for (Registry registry : registries) { StringBuilder buffer = new StringBuilder(); - for ( Object o : registry.getRegistered() ) { - if ( buffer.length() > 0 ) + for (Object o : registry.getRegistered()) { + if (buffer.length() > 0) buffer.append(", "); buffer.append(getName(o)); @@ -65,7 +65,7 @@ public class DumpRegistry extends ComponentLifecycleBase { protected String getName(Object o) { String name = null; if (o instanceof Named) { - name = ((Named) o).getName(); + name = ((Named)o).getName(); } if (name == null) { diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java index 9e81e0aa3a6..6927d2f5fda 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java @@ -27,13 +27,14 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.annotation.PostConstruct; -import org.apache.cloudstack.framework.config.ConfigKey; -import org.apache.cloudstack.framework.config.Configurable; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.BeanNameAware; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.config.Configurable; + import com.cloud.utils.component.Registry; public class ExtensionRegistry implements Registry, Configurable, BeanNameAware { @@ -58,23 +59,23 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa @Override public boolean register(Object item) { - if ( registered.contains(item) ) + if (registered.contains(item)) return false; String[] order = new String[] {}; Set exclude = new HashSet(); - if ( orderConfigKeyObj != null ) { + if (orderConfigKeyObj != null) { Object value = orderConfigKeyObj.value(); - if ( value != null && value.toString().trim().length() > 0 ) { + if (value != null && value.toString().trim().length() > 0) { order = value.toString().trim().split("\\s*,\\s*"); } } - if ( excludeKeyObj != null ) { + if (excludeKeyObj != null) { Object value = excludeKeyObj.value(); - if ( value != null && value.toString().trim().length() > 0 ) { - for ( String e : value.toString().trim().split("\\s*,\\s*") ) { + if (value != null && value.toString().trim().length() > 0) { + for (String e : value.toString().trim().split("\\s*,\\s*")) { exclude.add(e); } } @@ -82,32 +83,32 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa String name = RegistryUtils.getName(item); - if ( name != null && exclude.size() > 0 && exclude.contains(name) ) { + if (name != null && exclude.size() > 0 && exclude.contains(name)) { return false; } - if ( name == null && order.length > 0 ) { + if (name == null && order.length > 0) { throw new RuntimeException("getName() is null for [" + item + "]"); } int i = 0; - for ( String orderTest : order ) { - if ( orderTest.equals(name) ) { + for (String orderTest : order) { + if (orderTest.equals(name)) { registered.add(i, item); i = -1; break; } - if ( registered.size() <= i ) { + if (registered.size() <= i) { break; } - if ( RegistryUtils.getName(registered.get(i)).equals(orderTest) ) { + if (RegistryUtils.getName(registered.get(i)).equals(orderTest)) { i++; } } - if ( i != -1 ) { + if (i != -1) { registered.add(item); } @@ -135,20 +136,18 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa public ConfigKey[] getConfigKeys() { List> result = new ArrayList>(); - if ( orderConfigKey != null && orderConfigKeyObj == null ) { - orderConfigKeyObj = new ConfigKey("Advanced", String.class, orderConfigKey, orderConfigDefault, - "The order of precedence for the extensions", false); + if (orderConfigKey != null && orderConfigKeyObj == null) { + orderConfigKeyObj = new ConfigKey("Advanced", String.class, orderConfigKey, orderConfigDefault, "The order of precedence for the extensions", false); } - if ( orderConfigKeyObj != null ) + if (orderConfigKeyObj != null) result.add(orderConfigKeyObj); - if ( excludeKey != null && excludeKeyObj == null ) { - excludeKeyObj = new ConfigKey("Advanced", String.class, excludeKey, excludeDefault, - "Extensions to exclude from being registered", false); + if (excludeKey != null && excludeKeyObj == null) { + excludeKeyObj = new ConfigKey("Advanced", String.class, excludeKey, excludeDefault, "Extensions to exclude from being registered", false); } - if ( excludeKeyObj != null ) { + if (excludeKeyObj != null) { result.add(excludeKeyObj); } @@ -157,22 +156,22 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa @PostConstruct public void init() { - if ( name == null ) { - for ( String part : beanName.replaceAll("([A-Z])", " $1").split("\\s+") ) { - part = StringUtils.capitalize(part.toLowerCase());; + if (name == null) { + for (String part : beanName.replaceAll("([A-Z])", " $1").split("\\s+")) { + part = StringUtils.capitalize(part.toLowerCase()); + ; name = name == null ? part : name + " " + part; } } - if ( preRegistered != null ) { - for ( Object o : preRegistered ) { + if (preRegistered != null) { + for (Object o : preRegistered) { register(o); } } } - public String getOrderConfigKey() { return orderConfigKey; } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/PluggableServiceLifecycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/PluggableServiceLifecycle.java index 3eeeed83c7b..85b4e54057c 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/PluggableServiceLifecycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/PluggableServiceLifecycle.java @@ -29,7 +29,7 @@ public class PluggableServiceLifecycle extends RegistryLifecycle { for (Object obj : beans) { if (obj instanceof PluggableService) { - for (Class cmd : ((PluggableService) obj).getCommands()) { + for (Class cmd : ((PluggableService)obj).getCommands()) { ComponentContext.addDelegateContext(cmd, applicationContext); } } @@ -40,7 +40,7 @@ public class PluggableServiceLifecycle extends RegistryLifecycle { public void stop() { for (Object obj : beans) { if (obj instanceof PluggableService) { - for (Class cmd : ((PluggableService) obj).getCommands()) { + for (Class cmd : ((PluggableService)obj).getCommands()) { ComponentContext.removeDelegateContext(cmd); } } @@ -49,5 +49,4 @@ public class PluggableServiceLifecycle extends RegistryLifecycle { super.stop(); } - } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java index f2a040a05aa..337cfbdc52b 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java @@ -55,7 +55,7 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if ( typeClass.isAssignableFrom(bean.getClass()) && ! isExcluded(bean) ) { + if (typeClass.isAssignableFrom(bean.getClass()) && !isExcluded(bean)) { beans.add(bean); } @@ -65,12 +65,12 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App protected synchronized boolean isExcluded(Object bean) { String name = RegistryUtils.getName(bean); - if ( excludes == null ) { + if (excludes == null) { loadExcluded(); } boolean result = excludes.contains(name); - if ( result ) { + if (result) { log.info("Excluding extension [{}] based on configuration", name); } @@ -80,17 +80,17 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App protected synchronized void loadExcluded() { Properties props = applicationContext.getBean("DefaultConfigProperties", Properties.class); excludes = new HashSet(); - for ( String exclude : props.getProperty(EXTENSION_EXCLUDE, "").trim().split("\\s*,\\s*") ) { - if ( StringUtils.hasText(exclude) ) { + for (String exclude : props.getProperty(EXTENSION_EXCLUDE, "").trim().split("\\s*,\\s*")) { + if (StringUtils.hasText(exclude)) { excludes.add(exclude); } } - for ( String key : props.stringPropertyNames() ) { - if ( key.startsWith(EXTENSION_INCLUDE_PREFIX) ) { + for (String key : props.stringPropertyNames()) { + if (key.startsWith(EXTENSION_INCLUDE_PREFIX)) { String module = key.substring(EXTENSION_INCLUDE_PREFIX.length()); boolean include = props.getProperty(key).equalsIgnoreCase("true"); - if ( ! include ) { + if (!include) { excludes.add(module); } } @@ -107,9 +107,9 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App Iterator iter = beans.iterator(); Registry registry = lookupRegistry(); - while ( iter.hasNext() ) { + while (iter.hasNext()) { Object next = iter.next(); - if ( registry.register(next) ) { + if (registry.register(next)) { log.debug("Registered {}", next); } else { iter.remove(); @@ -121,7 +121,7 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App public void stop() { Registry registry = lookupRegistry(); - for ( Object bean : beans ) { + for (Object bean : beans) { registry.unregister(bean); } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryUtils.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryUtils.java index 8d7e9b68fb6..70b56574654 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryUtils.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryUtils.java @@ -23,9 +23,9 @@ import com.cloud.utils.component.Named; public class RegistryUtils { public static String getName(Object object) { - if ( object instanceof Named ) { + if (object instanceof Named) { String name = ((Named)object).getName(); - if ( name != null ) + if (name != null) return name; } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/context/ResourceApplicationContext.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/context/ResourceApplicationContext.java index 3a8cb6fca96..d33cf565892 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/context/ResourceApplicationContext.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/context/ResourceApplicationContext.java @@ -56,8 +56,7 @@ public class ResourceApplicationContext extends AbstractXmlApplicationContext { @Override public String toString() { - return "ResourceApplicationContext [applicationName=" + applicationName + ", configResources=" - + Arrays.toString(configResources) + "]"; + return "ResourceApplicationContext [applicationName=" + applicationName + ", configResources=" + Arrays.toString(configResources) + "]"; } } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java index e8dfbee9231..5f3abf97187 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java @@ -23,16 +23,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.cloudstack.spring.module.locator.ModuleDefinitionLocator; -import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator; -import org.apache.cloudstack.spring.module.model.ModuleDefinition; -import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.Resource; +import org.apache.cloudstack.spring.module.locator.ModuleDefinitionLocator; +import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator; +import org.apache.cloudstack.spring.module.model.ModuleDefinition; +import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; + public class CloudStackSpringContext { private static final Logger log = LoggerFactory.getLogger(CloudStackSpringContext.class); @@ -63,7 +64,7 @@ public class CloudStackSpringContext { public void init() throws IOException { Collection defs = loader.locateModules(contextName); - if ( defs.size() == 0 ) + if (defs.size() == 0) throw new RuntimeException("No modules found to load for Spring"); moduleDefinitionSet = factory.loadModules(defs, baseName); @@ -72,7 +73,7 @@ public class CloudStackSpringContext { public void registerShutdownHook() { ApplicationContext base = moduleDefinitionSet.getApplicationContext(baseName); - if ( base instanceof ConfigurableApplicationContext ) { + if (base instanceof ConfigurableApplicationContext) { ((ConfigurableApplicationContext)base).registerShutdownHook(); } } @@ -80,18 +81,18 @@ public class CloudStackSpringContext { public ModuleDefinition getModuleDefinitionForWeb(String name) { ModuleDefinition def = moduleDefinitionSet.getModuleDefinition(name); - if ( def != null ) { + if (def != null) { return def; } /* Grab farthest descendant that is deterministic */ def = moduleDefinitionSet.getModuleDefinition(baseName); - if ( def == null ) { + if (def == null) { throw new RuntimeException("Failed to find base spring module to extend for web"); } - while ( def.getChildren().size() == 1 ) { + while (def.getChildren().size() == 1) { def = def.getChildren().iterator().next(); } @@ -105,21 +106,21 @@ public class CloudStackSpringContext { } public String[] getConfigLocationsForWeb(String name, String[] configured) { - if ( configured == null ) + if (configured == null) configured = new String[] {}; ModuleDefinition def = getModuleDefinitionForWeb(name); List inherited = new ArrayList(); - while ( def != null ) { + while (def != null) { inherited.addAll(def.getInheritableContextLocations()); def = moduleDefinitionSet.getModuleDefinition(def.getParentName()); } List urlList = new ArrayList(); - for ( Resource r : inherited ) { + for (Resource r : inherited) { try { String urlString = r.getURL().toExternalForm(); urlList.add(urlString); diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java index 5a2a436f648..b990bae8b71 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java @@ -42,22 +42,22 @@ public class ModuleBasedContextFactory { protected Map wireUpModules(String root, Collection defs) throws IOException { Map modules = new HashMap(); - for ( ModuleDefinition def : defs ) { + for (ModuleDefinition def : defs) { modules.put(def.getName(), def); } ModuleDefinition rootDef = null; Map result = new HashMap(); - for ( ModuleDefinition def : modules.values() ) { - if ( def.getName().equals(root) ) { + for (ModuleDefinition def : modules.values()) { + if (def.getName().equals(root)) { rootDef = def; } - if ( def.getParentName() != null ) { + if (def.getParentName() != null) { ModuleDefinition parentDef = modules.get(def.getParentName()); - if ( parentDef != null ) + if (parentDef != null) parentDef.addChild(def); } } @@ -66,17 +66,16 @@ public class ModuleBasedContextFactory { } protected Map traverse(ModuleDefinition base, Map result) { - if ( base == null ) + if (base == null) return result; - if ( result.containsKey(base.getName()) ) { - throw new RuntimeException("Circular dependency to [" + base.getName() + "] from current set " + - result.keySet()); + if (result.containsKey(base.getName())) { + throw new RuntimeException("Circular dependency to [" + base.getName() + "] from current set " + result.keySet()); } result.put(base.getName(), base); - for ( ModuleDefinition childDef : base.getChildren() ) + for (ModuleDefinition childDef : base.getChildren()) traverse(childDef, result); return result; diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/QuietLoaderFactory.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/QuietLoaderFactory.java index 74fc068fa74..57a2a230522 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/QuietLoaderFactory.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/QuietLoaderFactory.java @@ -32,8 +32,8 @@ public class QuietLoaderFactory implements FactoryBean { public Resource[] getObject() throws Exception { List existing = new ArrayList(); - for ( Resource resource : resources ) { - if ( resource.exists() ) { + for (Resource resource : resources) { + if (resource.exists()) { existing.add(resource); } } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java index c68aa8a5292..d901c6f30ff 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java @@ -23,13 +23,14 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; + import org.apache.cloudstack.spring.module.locator.ModuleDefinitionLocator; import org.apache.cloudstack.spring.module.model.ModuleDefinition; import org.apache.cloudstack.spring.module.model.impl.DefaultModuleDefinition; import org.apache.cloudstack.spring.module.util.ModuleLocationUtils; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; public class ClasspathModuleDefinitionLocator implements ModuleDefinitionLocator { @@ -37,6 +38,7 @@ public class ClasspathModuleDefinitionLocator implements ModuleDefinitionLocator return new PathMatchingResourcePatternResolver(); } + @Override public Collection locateModules(String context) throws IOException { ResourcePatternResolver resolver = getResolver(); @@ -48,11 +50,11 @@ public class ClasspathModuleDefinitionLocator implements ModuleDefinitionLocator protected Map discoverModules(String baseDir, ResourcePatternResolver resolver) throws IOException { Map result = new HashMap(); - for ( Resource r : resolver.getResources(ModuleLocationUtils.getModulesLocation(baseDir)) ) { + for (Resource r : resolver.getResources(ModuleLocationUtils.getModulesLocation(baseDir))) { DefaultModuleDefinition def = new DefaultModuleDefinition(baseDir, r, resolver); def.init(); - if ( def.isValid() ) + if (def.isValid()) result.put(def.getName(), def); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java index abd04bde34d..2d12ac1c35c 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java @@ -27,13 +27,14 @@ import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import org.apache.cloudstack.spring.module.model.ModuleDefinition; -import org.apache.cloudstack.spring.module.util.ModuleLocationUtils; import org.apache.commons.io.IOUtils; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.util.StringUtils; +import org.apache.cloudstack.spring.module.model.ModuleDefinition; +import org.apache.cloudstack.spring.module.util.ModuleLocationUtils; + public class DefaultModuleDefinition implements ModuleDefinition { public static final String NAME = "name"; @@ -60,7 +61,7 @@ public class DefaultModuleDefinition implements ModuleDefinition { public void init() throws IOException { - if ( ! moduleProperties.exists() ) { + if (!moduleProperties.exists()) { return; } @@ -85,11 +86,11 @@ public class DefaultModuleDefinition implements ModuleDefinition { name = props.getProperty(NAME); parent = props.getProperty(PARENT); - if ( ! StringUtils.hasText(name) ) { + if (!StringUtils.hasText(name)) { throw new IOException("Missing name property in [" + location() + "]"); } - if ( ! StringUtils.hasText(parent) ) { + if (!StringUtils.hasText(parent)) { parent = null; } @@ -103,19 +104,16 @@ public class DefaultModuleDefinition implements ModuleDefinition { String expectedLocation = ModuleLocationUtils.getModuleLocation(baseDir, name); Resource self = resolver.getResource(expectedLocation); - if ( ! self.exists() ) { - throw new IOException("Resource [" + location() + "] is expected to exist at [" + - expectedLocation + "] please ensure the name property is correct"); + if (!self.exists()) { + throw new IOException("Resource [" + location() + "] is expected to exist at [" + expectedLocation + "] please ensure the name property is correct"); } String moduleUrl = moduleProperties.getURL().toExternalForm(); String selfUrl = self.getURL().toExternalForm(); - if ( ! moduleUrl.equals(selfUrl) ) { - throw new IOException("Resource [" + location() + "] and [" + - self.getURL() + "] do not appear to be the same resource, " + - "please ensure the name property is correct or that the " + - "module is not defined twice"); + if (!moduleUrl.equals(selfUrl)) { + throw new IOException("Resource [" + location() + "] and [" + self.getURL() + "] do not appear to be the same resource, " + + "please ensure the name property is correct or that the " + "module is not defined twice"); } } @@ -123,30 +121,37 @@ public class DefaultModuleDefinition implements ModuleDefinition { return moduleProperties.getURL().toString(); } + @Override public void addChild(ModuleDefinition def) { children.put(def.getName(), def); } + @Override public Collection getChildren() { return children.values(); } + @Override public String getName() { return name; } + @Override public String getParentName() { return parent; } + @Override public List getConfigLocations() { return configLocations; } + @Override public List getContextLocations() { return contextLocations; } + @Override public List getInheritableContextLocations() { return inheritableContextLocations; } @@ -156,13 +161,14 @@ public class DefaultModuleDefinition implements ModuleDefinition { return overrideContextLocations; } + @Override public boolean isValid() { return valid; } + @Override public ClassLoader getClassLoader() { return resolver.getClassLoader(); } - } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java index 8598c5e8eca..be92074d512 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java @@ -32,9 +32,6 @@ import java.util.Properties; import java.util.Set; import java.util.Stack; -import org.apache.cloudstack.spring.module.context.ResourceApplicationContext; -import org.apache.cloudstack.spring.module.model.ModuleDefinition; -import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +43,10 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.util.StringUtils; +import org.apache.cloudstack.spring.module.context.ResourceApplicationContext; +import org.apache.cloudstack.spring.module.model.ModuleDefinition; +import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; + public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { private static final Logger log = LoggerFactory.getLogger(DefaultModuleDefinitionSet.class); @@ -71,7 +72,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } public void load() throws IOException { - if ( ! loadRootContext() ) + if (!loadRootContext()) return; printHierarchy(); @@ -82,7 +83,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected boolean loadRootContext() { ModuleDefinition def = modules.get(root); - if ( def == null ) + if (def == null) return false; ApplicationContext defaultsContext = getDefaultsContext(); @@ -94,6 +95,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected void startContexts() { withModule(new WithModule() { + @Override public void with(ModuleDefinition def, Stack parents) { try { ApplicationContext context = getApplicationContext(def.getName()); @@ -101,10 +103,10 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { Runnable runnable = context.getBean("moduleStartup", Runnable.class); log.info("Starting module [{}]", def.getName()); runnable.run(); - } catch ( BeansException e ) { - // Ignore + } catch (BeansException e) { + // Ignore } - } catch ( EmptyStackException e ) { + } catch (EmptyStackException e) { // The root context is already loaded, so ignore the exception } } @@ -113,16 +115,18 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected void loadContexts() { withModule(new WithModule() { + @Override public void with(ModuleDefinition def, Stack parents) { try { ApplicationContext parent = getApplicationContext(parents.peek().getName()); loadContext(def, parent); - } catch ( EmptyStackException e ) { + } catch (EmptyStackException e) { // The root context is already loaded, so ignore the exception } } }); } + protected ApplicationContext loadContext(ModuleDefinition def, ApplicationContext parent) { ResourceApplicationContext context = new ResourceApplicationContext(); context.setApplicationName("/" + def.getName()); @@ -133,8 +137,8 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { context.setClassLoader(def.getClassLoader()); long start = System.currentTimeMillis(); - if ( log.isInfoEnabled() ) { - for ( Resource resource : resources ) { + if (log.isInfoEnabled()) { + for (Resource resource : resources) { log.info("Loading module context [{}] from {}", def.getName(), resource); } } @@ -147,7 +151,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } protected boolean shouldLoad(ModuleDefinition def) { - return ! excludes.contains(def.getName()); + return !excludes.contains(def.getName()); } protected ApplicationContext getDefaultsContext() { @@ -158,22 +162,23 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { context.refresh(); @SuppressWarnings("unchecked") - final List resources = (List) context.getBean(DEFAULT_CONFIG_RESOURCES); + final List resources = (List)context.getBean(DEFAULT_CONFIG_RESOURCES); withModule(new WithModule() { + @Override public void with(ModuleDefinition def, Stack parents) { - for ( Resource defaults : def.getConfigLocations() ) { + for (Resource defaults : def.getConfigLocations()) { resources.add(defaults); } } }); - configProperties = (Properties) context.getBean(DEFAULT_CONFIG_PROPERTIES); - for ( Resource resource : resources ) { + configProperties = (Properties)context.getBean(DEFAULT_CONFIG_PROPERTIES); + for (Resource resource : resources) { load(resource, configProperties); } - for ( Resource resource : (Resource[])context.getBean(MODULE_PROPERITES) ) { + for (Resource resource : (Resource[])context.getBean(MODULE_PROPERITES)) { load(resource, configProperties); } @@ -183,17 +188,17 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } protected void parseExcludes() { - for ( String exclude : configProperties.getProperty(MODULES_EXCLUDE, "").trim().split("\\s*,\\s*") ) { - if ( StringUtils.hasText(exclude) ) { + for (String exclude : configProperties.getProperty(MODULES_EXCLUDE, "").trim().split("\\s*,\\s*")) { + if (StringUtils.hasText(exclude)) { excludes.add(exclude); } } - for ( String key : configProperties.stringPropertyNames() ) { - if ( key.startsWith(MODULES_INCLUDE_PREFIX) ) { + for (String key : configProperties.stringPropertyNames()) { + if (key.startsWith(MODULES_INCLUDE_PREFIX)) { String module = key.substring(MODULES_INCLUDE_PREFIX.length()); boolean include = configProperties.getProperty(key).equalsIgnoreCase("true"); - if ( ! include ) { + if (!include) { excludes.add(module); } } @@ -203,7 +208,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected void load(Resource resource, Properties props) { InputStream is = null; try { - if ( resource.exists() ) { + if (resource.exists()) { is = resource.getInputStream(); props.load(is); } @@ -216,6 +221,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected void printHierarchy() { withModule(new WithModule() { + @Override public void with(ModuleDefinition def, Stack parents) { log.info(String.format("Module Hierarchy:%" + ((parents.size() * 2) + 1) + "s%s", "", def.getName())); } @@ -228,10 +234,10 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } protected void withModule(ModuleDefinition def, Stack parents, WithModule with) { - if ( def == null ) + if (def == null) return; - if ( ! shouldLoad(def) ) { + if (!shouldLoad(def)) { log.info("Excluding context [{}] based on configuration", def.getName()); return; } @@ -240,7 +246,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { parents.push(def); - for ( ModuleDefinition child : def.getChildren() ) { + for (ModuleDefinition child : def.getChildren()) { withModule(child, parents, with); } @@ -267,22 +273,24 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } } + @Override public ApplicationContext getApplicationContext(String name) { return contexts.get(name); } + @Override public Resource[] getConfigResources(String name) { Set resources = new LinkedHashSet(); ModuleDefinition original = null; ModuleDefinition def = original = modules.get(name); - if ( def == null ) + if (def == null) return new Resource[] {}; resources.addAll(def.getContextLocations()); - while ( def != null ) { + while (def != null) { resources.addAll(def.getInheritableContextLocations()); def = modules.get(def.getParentName()); } @@ -292,6 +300,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { return resources.toArray(new Resource[resources.size()]); } + @Override public ModuleDefinition getModuleDefinition(String name) { return modules.get(name); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java index a93c7c1f6a2..20a76e8072a 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java @@ -32,7 +32,7 @@ public class Main { CloudStackSpringContext context = new CloudStackSpringContext(); context.registerShutdownHook(); - if ( Boolean.getBoolean("force.exit") ) { + if (Boolean.getBoolean("force.exit")) { System.exit(0); } } @@ -41,14 +41,13 @@ public class Main { return System.currentTimeMillis() - start; } - public static void main(String... args) { Main main = new Main(); try { main.start(); System.out.println("STARTUP COMPLETE [" + main.getTime() + "] ms"); - } catch ( Exception e ) { + } catch (Exception e) { e.printStackTrace(); System.out.println("STARTUP FAILED [" + main.getTime() + "] ms"); System.err.println("STARTUP FAILED [" + main.getTime() + "] ms"); diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java index 596e019b6a1..6d0e17c0f20 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java @@ -23,13 +23,14 @@ import java.io.IOException; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; -import org.apache.cloudstack.spring.module.factory.CloudStackSpringContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.ContextLoaderListener; +import org.apache.cloudstack.spring.module.factory.CloudStackSpringContext; + public class CloudStackContextLoaderListener extends ContextLoaderListener { public static final String WEB_PARENT_MODULE = "parentModule"; @@ -56,7 +57,7 @@ public class CloudStackContextLoaderListener extends ContextLoaderListener { } configuredParentName = event.getServletContext().getInitParameter(WEB_PARENT_MODULE); - if ( configuredParentName == null ) { + if (configuredParentName == null) { configuredParentName = WEB_PARENT_MODULE_DEFAULT; } @@ -67,8 +68,7 @@ public class CloudStackContextLoaderListener extends ContextLoaderListener { protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) { super.customizeContext(servletContext, applicationContext); - String[] newLocations = cloudStackContext.getConfigLocationsForWeb(configuredParentName, - applicationContext.getConfigLocations()); + String[] newLocations = cloudStackContext.getConfigLocationsForWeb(configuredParentName, applicationContext.getConfigLocations()); applicationContext.setConfigLocations(newLocations); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java index 8b1d31471bf..b3648ab76e5 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java @@ -22,10 +22,11 @@ import javax.servlet.Filter; import javax.servlet.FilterConfig; import javax.servlet.ServletException; -import org.apache.cloudstack.spring.module.factory.CloudStackSpringContext; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ApplicationContext; +import org.apache.cloudstack.spring.module.factory.CloudStackSpringContext; + public abstract class ModuleBasedFilter implements Filter { boolean enabled = false; @@ -33,16 +34,15 @@ public abstract class ModuleBasedFilter implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { String module = filterConfig.getInitParameter("module"); - CloudStackSpringContext context = - (CloudStackSpringContext) filterConfig.getServletContext().getAttribute(CloudStackSpringContext.CLOUDSTACK_CONTEXT_SERVLET_KEY); + CloudStackSpringContext context = (CloudStackSpringContext)filterConfig.getServletContext().getAttribute(CloudStackSpringContext.CLOUDSTACK_CONTEXT_SERVLET_KEY); - if ( context == null ) + if (context == null) return; ApplicationContext applicationContext = context.getApplicationContextForWeb(module); - if ( applicationContext != null ) { + if (applicationContext != null) { AutowireCapableBeanFactory factory = applicationContext.getAutowireCapableBeanFactory(); - if ( factory != null ) { + if (factory != null) { factory.autowireBean(this); enabled = true; } diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java index 7c95c3f1e21..037fe1561c2 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java @@ -18,19 +18,24 @@ */ package org.apache.cloudstack.spring.module.factory; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.util.Collection; -import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator; -import org.apache.cloudstack.spring.module.model.ModuleDefinition; -import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; +import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator; +import org.apache.cloudstack.spring.module.model.ModuleDefinition; +import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet; + public class ModuleBasedContextFactoryTest { Collection defs; @@ -81,10 +86,10 @@ public class ModuleBasedContextFactoryTest { ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); ModuleDefinitionSet set = factory.loadModules(defs, "base"); - testBeansInContext(set, "base", 1, new String[] { "base" }, new String[] { "child1", "child2", "child1-1" }); - testBeansInContext(set, "child1", 2, new String[] { "base", "child1" }, new String[] { "child2", "child1-1" }); - testBeansInContext(set, "child2", 4, new String[] { "base", "child2" }, new String[] { "child1", "child1-1" }); - testBeansInContext(set, "child1-1", 3, new String[] { "base", "child1", "child1-1" }, new String[] { "child2" }); + testBeansInContext(set, "base", 1, new String[] {"base"}, new String[] {"child1", "child2", "child1-1"}); + testBeansInContext(set, "child1", 2, new String[] {"base", "child1"}, new String[] {"child2", "child1-1"}); + testBeansInContext(set, "child2", 4, new String[] {"base", "child2"}, new String[] {"child1", "child1-1"}); + testBeansInContext(set, "child1-1", 3, new String[] {"base", "child1", "child1-1"}, new String[] {"child2"}); } protected void testBeansInContext(ModuleDefinitionSet set, String name, int order, String[] parents, String[] notTheres) { @@ -93,16 +98,16 @@ public class ModuleBasedContextFactoryTest { String nameBean = context.getBean("name", String.class); assertEquals(name, nameBean); - for ( String parent : parents ) { + for (String parent : parents) { String parentBean = context.getBean(parent, String.class); assertEquals(parent, parentBean); } - for ( String notThere : notTheres ) { + for (String notThere : notTheres) { try { context.getBean(notThere, String.class); fail(); - } catch ( NoSuchBeanDefinitionException e ) { + } catch (NoSuchBeanDefinitionException e) { } } diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java index 6ab10eb5c0e..19fbe525707 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java @@ -18,14 +18,15 @@ */ package org.apache.cloudstack.spring.module.locator.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.Collection; -import org.apache.cloudstack.spring.module.model.ModuleDefinition; import org.junit.Test; +import org.apache.cloudstack.spring.module.model.ModuleDefinition; + public class ClasspathModuleDefinitionSetLocatorTest { @Test diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java index 78880913b18..c34e6ea9c81 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java @@ -18,25 +18,27 @@ */ package org.apache.cloudstack.spring.module.model.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.apache.cloudstack.spring.module.util.ModuleLocationUtils; import org.junit.Test; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; +import org.apache.cloudstack.spring.module.util.ModuleLocationUtils; + public class DefaultModuleDefinitionTest { ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); protected DefaultModuleDefinition createDef(String name) { - Resource resource = - resolver.getResource(ModuleLocationUtils.getModuleLocation("testfiles", name)); + Resource resource = resolver.getResource(ModuleLocationUtils.getModuleLocation("testfiles", name)); return new DefaultModuleDefinition("testfiles", resource, resolver); } @@ -48,7 +50,7 @@ public class DefaultModuleDefinitionTest { try { def.init(); fail(); - } catch ( IOException e ) { + } catch (IOException e) { assertTrue(e.getMessage().contains("Missing name property")); } @@ -61,7 +63,7 @@ public class DefaultModuleDefinitionTest { try { def.init(); fail(); - } catch ( IOException e ) { + } catch (IOException e) { assertTrue(e.getMessage().contains("Missing name property")); } @@ -74,7 +76,7 @@ public class DefaultModuleDefinitionTest { try { def.init(); fail(); - } catch ( IOException e ) { + } catch (IOException e) { assertTrue(e.getMessage().contains("is expected to exist at")); } } @@ -93,7 +95,7 @@ public class DefaultModuleDefinitionTest { try { def.init(); fail(); - } catch ( IOException e ) { + } catch (IOException e) { assertTrue(e.getMessage().contains("do not appear to be the same resource")); } } @@ -117,9 +119,9 @@ public class DefaultModuleDefinitionTest { protected void has(List resources, String... files) throws IOException { int count = 0; - for ( Resource r : resources ) { - for ( String file : files ) { - if ( r.getURL().toExternalForm().contains(file) ) { + for (Resource r : resources) { + for (String file : files) { + if (r.getURL().toExternalForm().contains(file)) { count++; break; } diff --git a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java index 22df943df61..de14007aaf1 100644 --- a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java +++ b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java @@ -26,9 +26,10 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.APICommand; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; + import com.cloud.exception.PermissionDeniedException; import com.cloud.user.Account; import com.cloud.user.AccountService; @@ -68,11 +69,13 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIC } RoleType roleType = _accountService.getRoleType(account); - boolean isAllowed = commandsPropertiesOverrides.contains(commandName) ? commandsPropertiesRoleBasedApisMap.get(roleType).contains(commandName) - : annotationRoleBasedApisMap.get(roleType).contains(commandName); + boolean isAllowed = + commandsPropertiesOverrides.contains(commandName) ? commandsPropertiesRoleBasedApisMap.get(roleType).contains(commandName) : annotationRoleBasedApisMap.get( + roleType).contains(commandName); if (!isAllowed) { - throw new PermissionDeniedException("The API does not exist or is blacklisted. Role type=" + roleType.toString() + " is not allowed to request the api: " + commandName); + throw new PermissionDeniedException("The API does not exist or is blacklisted. Role type=" + roleType.toString() + " is not allowed to request the api: " + + commandName); } return isAllowed; } diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java index 3dff72239c1..8c253ee1d31 100644 --- a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java +++ b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; @@ -243,7 +244,7 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement if (s_logger.isDebugEnabled()) { s_logger.debug("ExplicitDedicationProcessor returns Avoid List as: Deploy avoids pods: " + avoid.getPodsToAvoid() + ", clusters: " + - avoid.getClustersToAvoid() + ", hosts: " + avoid.getHostsToAvoid()); + avoid.getClustersToAvoid() + ", hosts: " + avoid.getHostsToAvoid()); } } } diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java index 5d8d12f4ad4..0504dc63e0d 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java +++ b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java @@ -23,14 +23,13 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.framework.messagebus.MessageSubscriber; - -import org.apache.log4j.Logger; import com.cloud.configuration.Config; import com.cloud.deploy.DeployDestination; @@ -39,8 +38,6 @@ import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.exception.AffinityConflictException; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @@ -96,7 +93,7 @@ public class HostAntiAffinityProcessor extends AffinityProcessorBase implements avoid.addHost(groupVM.getLastHostId()); if (s_logger.isDebugEnabled()) { s_logger.debug("Added host " + groupVM.getLastHostId() + " to avoid set, since VM " + groupVM.getId() + - " is present on the host, in Stopped state but has reserved capacity"); + " is present on the host, in Stopped state but has reserved capacity"); } } } @@ -136,8 +133,8 @@ public class HostAntiAffinityProcessor extends AffinityProcessorBase implements VMReservationVO vmReservation = _reservationDao.findByVmId(groupVMId); if (vmReservation != null && vmReservation.getHostId() != null && vmReservation.getHostId().equals(plannedHostId)) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Planned destination for VM " + vm.getId() + " conflicts with an existing VM " + vmReservation.getVmId() + " reserved on the same host " + - plannedHostId); + s_logger.debug("Planned destination for VM " + vm.getId() + " conflicts with an existing VM " + vmReservation.getVmId() + + " reserved on the same host " + plannedHostId); } return false; } diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java index 68a9f49c734..73fa7f68ba7 100644 --- a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java +++ b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayout.java @@ -17,12 +17,12 @@ package org.apache.cloudstack.alert.snmp; -import org.apache.log4j.EnhancedPatternLayout; -import org.apache.log4j.spi.LoggingEvent; - import java.util.Date; import java.util.StringTokenizer; +import org.apache.log4j.EnhancedPatternLayout; +import org.apache.log4j.spi.LoggingEvent; + public class SnmpEnhancedPatternLayout extends EnhancedPatternLayout { private String _pairDelimiter = "//"; private String _keyValueDelimiter = "::"; diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java index c922785e559..576abf3020f 100644 --- a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java +++ b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java @@ -17,7 +17,8 @@ package org.apache.cloudstack.alert.snmp; -import com.cloud.utils.exception.CloudRuntimeException; +import java.io.IOException; + import org.snmp4j.CommunityTarget; import org.snmp4j.PDU; import org.snmp4j.Snmp; @@ -29,7 +30,7 @@ import org.snmp4j.smi.UnsignedInteger32; import org.snmp4j.smi.VariableBinding; import org.snmp4j.transport.DefaultUdpTransportMapping; -import java.io.IOException; +import com.cloud.utils.exception.CloudRuntimeException; public class SnmpHelper { private Snmp _snmp; diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java index 61dbabaf415..3579e245c18 100644 --- a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java +++ b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpTrapAppender.java @@ -17,14 +17,15 @@ package org.apache.cloudstack.alert.snmp; -import com.cloud.utils.net.NetUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.spi.ErrorCode; import org.apache.log4j.spi.LoggingEvent; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; +import com.cloud.utils.net.NetUtils; public class SnmpTrapAppender extends AppenderSkeleton { private String _delimiter = ","; @@ -81,8 +82,8 @@ public class SnmpTrapAppender extends AppenderSkeleton { return; } - if (_oldSnmpManagerIpAddresses != null && _oldSnmpManagerIpAddresses.equals(_snmpManagerIpAddresses) && _oldSnmpManagerCommunities.equals(_snmpManagerCommunities) && - _oldSnmpManagerPorts.equals(_snmpManagerPorts)) { + if (_oldSnmpManagerIpAddresses != null && _oldSnmpManagerIpAddresses.equals(_snmpManagerIpAddresses) && + _oldSnmpManagerCommunities.equals(_snmpManagerCommunities) && _oldSnmpManagerPorts.equals(_snmpManagerPorts)) { return; } diff --git a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java b/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java index c8d00e7ec0a..7aa6adfc203 100644 --- a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java +++ b/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpEnhancedPatternLayoutTest.java @@ -17,18 +17,18 @@ package org.apache.cloudstack.alert.snmp; -import org.apache.log4j.spi.LoggingEvent; -import org.junit.Before; -import org.junit.Test; - -import javax.naming.ConfigurationException; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import javax.naming.ConfigurationException; + +import org.apache.log4j.spi.LoggingEvent; +import org.junit.Before; +import org.junit.Test; + public class SnmpEnhancedPatternLayoutTest { SnmpEnhancedPatternLayout _snmpEnhancedPatternLayout = new SnmpEnhancedPatternLayout(); @@ -42,7 +42,7 @@ public class SnmpEnhancedPatternLayoutTest { public void parseAlertTest() { LoggingEvent event = mock(LoggingEvent.class); setMessage(" alertType:: 14 // dataCenterId:: 1 // podId:: 1 // " + "clusterId:: null // message:: Management" - + " network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); + + " network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); SnmpTrapInfo info = _snmpEnhancedPatternLayout.parseEvent(event); commonAssertions(info, "Management network CIDR is not configured originally. Set it default to 10.102.192" + ".0/22"); } @@ -51,7 +51,7 @@ public class SnmpEnhancedPatternLayoutTest { public void ParseAlertWithPairDelimeterInMessageTest() { LoggingEvent event = mock(LoggingEvent.class); setMessage(" alertType:: 14 // dataCenterId:: 1 // podId:: 1 // " + "clusterId:: null // message:: Management" - + " //network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); + + " //network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); SnmpTrapInfo info = _snmpEnhancedPatternLayout.parseEvent(event); commonAssertions(info, "Management //network CIDR is not configured originally. Set it default to 10.102.192" + ".0/22"); } @@ -60,7 +60,7 @@ public class SnmpEnhancedPatternLayoutTest { public void ParseAlertWithKeyValueDelimeterInMessageTest() { LoggingEvent event = mock(LoggingEvent.class); setMessage(" alertType:: 14 // dataCenterId:: 1 // podId:: 1 // " + "clusterId:: null // message:: Management" - + " ::network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); + + " ::network CIDR is not configured originally. Set it default to 10.102.192.0/22", event); SnmpTrapInfo info = _snmpEnhancedPatternLayout.parseEvent(event); commonAssertions(info, "Management ::network CIDR is not configured originally. Set it default to 10.102.192" + ".0/22"); } diff --git a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java b/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java index 2a65d90acc2..7db30730071 100644 --- a/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java +++ b/plugins/alert-handlers/snmp-alerts/test/org/apache/cloudstack/alert/snmp/SnmpTrapAppenderTest.java @@ -17,16 +17,16 @@ package org.apache.cloudstack.alert.snmp; -import org.apache.log4j.spi.LoggingEvent; -import org.junit.Test; -import org.mockito.Mock; - -import java.util.List; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import static org.mockito.Mockito.mock; +import java.util.List; + +import org.apache.log4j.spi.LoggingEvent; +import org.junit.Test; +import org.mockito.Mock; + public class SnmpTrapAppenderTest { SnmpTrapAppender _appender = new SnmpTrapAppender(); LoggingEvent _event = mock(LoggingEvent.class); diff --git a/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java b/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java index 25da6311029..50ccbc16632 100644 --- a/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java +++ b/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java @@ -17,11 +17,6 @@ package org.apache.cloudstack.syslog; -import com.cloud.utils.net.NetUtils; -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.net.SyslogAppender; -import org.apache.log4j.spi.LoggingEvent; - import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; @@ -31,6 +26,12 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; +import org.apache.log4j.AppenderSkeleton; +import org.apache.log4j.net.SyslogAppender; +import org.apache.log4j.spi.LoggingEvent; + +import com.cloud.utils.net.NetUtils; + public class AlertsSyslogAppender extends AppenderSkeleton { String _syslogHosts = null; String _delimiter = ","; diff --git a/plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java b/plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java index a074a3ad949..57993483a25 100644 --- a/plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java +++ b/plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java @@ -17,14 +17,14 @@ package org.apache.cloudstack.syslog; -import org.apache.log4j.PatternLayout; -import org.junit.Before; -import org.junit.Test; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; import javax.naming.ConfigurationException; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import org.apache.log4j.PatternLayout; +import org.junit.Before; +import org.junit.Test; public class AlertsSyslogAppenderTest { AlertsSyslogAppender _appender = new AlertsSyslogAppender(); diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java b/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java index dabccb0929c..206d79322f3 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.discovery; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,8 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.discovery.ApiDiscoveryService; -import org.apache.log4j.Logger; - import com.cloud.user.User; @APICommand(name = "listApis", diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java index 7ee2fe20a79..64e6ef9105c 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiDiscoveryResponse.java @@ -16,14 +16,16 @@ // under the License. package org.apache.cloudstack.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.BaseResponse; - import java.util.HashSet; import java.util.Set; +import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; + +import com.cloud.serializer.Param; + @SuppressWarnings("unused") public class ApiDiscoveryResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java index 4f3c72c6bb1..7713f6b5d69 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiParameterResponse.java @@ -16,11 +16,13 @@ // under the License. package org.apache.cloudstack.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import com.cloud.serializer.Param; + public class ApiParameterResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) @Param(description = "the name of the api parameter") diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java index c307c7c69e2..ba1301b9ed9 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/api/response/ApiResponseResponse.java @@ -16,13 +16,15 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; +import java.util.HashSet; +import java.util.Set; + import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; -import java.util.HashSet; -import java.util.Set; +import com.cloud.serializer.Param; public class ApiResponseResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java index 6458c5619e8..ce8722e0182 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryService.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.discovery; -import com.cloud.user.User; -import com.cloud.utils.component.PluggableService; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.response.ListResponse; +import com.cloud.user.User; +import com.cloud.utils.component.PluggableService; + public interface ApiDiscoveryService extends PluggableService { ListResponse listApis(User user, String apiName); } diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java index 6266f67f267..39d965d810c 100755 --- a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java @@ -27,6 +27,11 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseAsyncCmd; @@ -39,8 +44,6 @@ import org.apache.cloudstack.api.response.ApiDiscoveryResponse; import org.apache.cloudstack.api.response.ApiParameterResponse; import org.apache.cloudstack.api.response.ApiResponseResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.serializer.Param; import com.cloud.user.User; @@ -48,7 +51,6 @@ import com.cloud.utils.ReflectUtil; import com.cloud.utils.StringUtils; import com.cloud.utils.component.ComponentLifecycleBase; import com.cloud.utils.component.PluggableService; -import com.google.gson.annotations.SerializedName; @Component @Local(value = ApiDiscoveryService.class) diff --git a/plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java b/plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java index 818443a85a3..f861ae986b0 100644 --- a/plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java +++ b/plugins/api/discovery/test/org/apache/cloudstack/discovery/ApiDiscoveryTest.java @@ -16,24 +16,34 @@ // under the License. package org.apache.cloudstack.discovery; -import com.cloud.user.User; -import com.cloud.user.UserVO; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; -import java.util.*; import javax.naming.ConfigurationException; -import com.cloud.utils.component.PluggableService; +import org.junit.BeforeClass; +import org.junit.Test; + import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.command.user.discovery.ListApisCmd; import org.apache.cloudstack.api.response.ApiDiscoveryResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.junit.BeforeClass; -import org.junit.Test; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import com.cloud.user.User; +import com.cloud.user.UserVO; +import com.cloud.utils.component.PluggableService; public class ApiDiscoveryTest { private static APIChecker _apiChecker = mock(APIChecker.class); @@ -55,8 +65,8 @@ public class ApiDiscoveryTest { testApiAsync = false; testUser = new UserVO(); - _discoveryService._apiAccessCheckers = (List)mock(List.class); - _discoveryService._services = (List)mock(List.class); + _discoveryService._apiAccessCheckers = mock(List.class); + _discoveryService._services = mock(List.class); when(_apiChecker.checkAccess(any(User.class), anyString())).thenReturn(true); when(_pluggableService.getCommands()).thenReturn(new ArrayList>()); diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java index a15bd2aaa0c..9e415e64510 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java @@ -16,6 +16,10 @@ // under the License. package org.apache.cloudstack.api.command.admin.ratelimit; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ACL; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -30,13 +34,9 @@ import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.ratelimit.ApiRateLimitService; -import org.apache.log4j.Logger; - import com.cloud.configuration.Config; import com.cloud.user.Account; -import javax.inject.Inject; - @APICommand(name = "resetApiLimit", responseObject = ApiLimitResponse.class, description = "Reset api count") public class ResetApiLimitCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(ResetApiLimitCmd.class.getName()); diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java index 914a4047fca..24288957563 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java @@ -16,40 +16,21 @@ // under the License. package org.apache.cloudstack.api.command.user.ratelimit; -import java.util.ArrayList; -import java.util.List; - -import org.apache.cloudstack.api.ACL; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.command.admin.ratelimit.ResetApiLimitCmd; -import org.apache.cloudstack.api.response.AccountResponse; -import org.apache.cloudstack.api.response.ApiLimitResponse; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import javax.inject.Inject; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ApiLimitResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.ratelimit.ApiRateLimitService; import com.cloud.configuration.Config; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -import com.cloud.utils.exception.CloudRuntimeException; - -import javax.inject.Inject; @APICommand(name = "getApiLimit", responseObject = ApiLimitResponse.class, description = "Get API limit count for the caller") public class GetApiLimitCmd extends BaseCmd { diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java b/plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java index 277d32beedb..ddd5fa3ded7 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/api/response/ApiLimitResponse.java @@ -16,11 +16,13 @@ // under the License. package org.apache.cloudstack.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import com.cloud.serializer.Param; + public class ApiLimitResponse extends BaseResponse { @SerializedName(ApiConstants.ACCOUNT_ID) @Param(description = "the account uuid of the api remaining count") diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java index b42d9373652..bb97f5a6ee0 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.ratelimit; import org.apache.cloudstack.api.response.ApiLimitResponse; + import com.cloud.user.Account; import com.cloud.utils.component.PluggableService; diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java index 266be3593d9..d7c6a551431 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java @@ -28,6 +28,7 @@ import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.api.command.admin.ratelimit.ResetApiLimitCmd; @@ -43,8 +44,6 @@ import com.cloud.user.AccountService; import com.cloud.user.User; import com.cloud.utils.component.AdapterBase; -import org.springframework.stereotype.Component; - @Component @Local(value = APIChecker.class) public class ApiRateLimitServiceImpl extends AdapterBase implements APIChecker, ApiRateLimitService { diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java index 373d9652ee9..f564b389df7 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.ratelimit; -import com.cloud.user.Account; - /** * Interface to define how an api limit store should work. * diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java index a46b334a560..c90704258e9 100644 --- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java +++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/ApiRateLimitTest.java @@ -16,6 +16,12 @@ // under the License. package org.apache.cloudstack.ratelimit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -23,14 +29,13 @@ import java.util.concurrent.Executors; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.response.ApiLimitResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cloudstack.api.response.ApiLimitResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.configuration.Config; import com.cloud.exception.RequestLimitException; import com.cloud.user.Account; @@ -39,9 +44,6 @@ import com.cloud.user.AccountVO; import com.cloud.user.User; import com.cloud.user.UserVO; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - public class ApiRateLimitTest { static ApiRateLimitServiceImpl _limitService = new ApiRateLimitServiceImpl(); diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java index efe8c53a51b..bfe3468de66 100644 --- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java +++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java @@ -28,11 +28,12 @@ import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Iterator; +import com.google.gson.Gson; + import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.api.ApiGsonHelper; import com.cloud.utils.exception.CloudRuntimeException; -import com.google.gson.Gson; /** * Base class for API Test diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java index 42c33540303..97cdccef8d6 100644 --- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java +++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.ratelimit.integration; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; /** * Login Response object diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java index 24d9804e0a6..aa816727347 100644 --- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java +++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java @@ -16,18 +16,20 @@ // under the License. package org.apache.cloudstack.ratelimit.integration; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.HashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.cloudstack.api.response.ApiLimitResponse; -import org.apache.cloudstack.api.response.SuccessResponse; import org.junit.Before; import org.junit.Test; +import org.apache.cloudstack.api.response.ApiLimitResponse; +import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.utils.exception.CloudRuntimeException; /** diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java index 6d0857129ff..4f8cd8ca570 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,11 +30,10 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.DedicateClusterResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.DedicateClusterResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; import com.cloud.event.EventTypes; @@ -49,7 +50,11 @@ public class DedicateClusterCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, required = true, description = "the ID of the Cluster") private Long clusterId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "the ID of the containing domain") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "the ID of the containing domain") private Long domainId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account which needs dedication. Must be used with domainId.") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java index 8d7c4b5e7c5..d3cce5ae5e7 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java @@ -21,18 +21,19 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DedicateHostResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.DedicateHostResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; import com.cloud.event.EventTypes; @@ -52,7 +53,11 @@ public class DedicateHostCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "the ID of the host to update") private Long hostId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "the ID of the containing domain") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "the ID of the containing domain") private Long domainId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account which needs dedication. Must be used with domainId.") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java index e58ba188bcf..e823fd55491 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java @@ -21,18 +21,19 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; import com.cloud.event.EventTypes; @@ -53,7 +54,11 @@ public class DedicatePodCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, required = true, description = "the ID of the Pod") private Long podId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "the ID of the containing domain") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "the ID of the containing domain") private Long domainId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account which needs dedication. Must be used with domainId.") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java index 040a88aa025..0e427aaa26d 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java @@ -21,18 +21,19 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; import com.cloud.event.EventTypes; @@ -53,7 +54,11 @@ public class DedicateZoneCmd extends BaseAsyncCmd { @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the ID of the zone") private Long zoneId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = true, description = "the ID of the containing domain") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + required = true, + description = "the ID of the containing domain") private Long domainId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account which needs dedication. Must be used with domainId.") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java index e5bdfc6b7bc..a2022a53e0b 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,11 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.DedicateClusterResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.DedicateClusterResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; @@ -54,13 +54,19 @@ public class ListDedicatedClustersCmd extends BaseListCmd { @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class, description = "the ID of the cluster") private Long clusterId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the ID of the domain associated with the cluster") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "the ID of the domain associated with the cluster") private Long domainId; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account associated with the cluster. Must be used with domainId.") private String accountName; - @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, type = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "list dedicated clusters by affinity group") + @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, + type = CommandType.UUID, + entityType = AffinityGroupResponse.class, + description = "list dedicated clusters by affinity group") private Long affinityGroupId; ///////////////////////////////////////////////////// diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java index 4e04c4740a5..d3b326d5a29 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,11 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.response.DedicateHostResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.DedicateHostResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; @@ -60,7 +60,10 @@ public class ListDedicatedHostsCmd extends BaseListCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account associated with the host. Must be used with domainId.") private String accountName; - @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, type = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "list dedicated hosts by affinity group") + @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, + type = CommandType.UUID, + entityType = AffinityGroupResponse.class, + description = "list dedicated hosts by affinity group") private Long affinityGroupId; ///////////////////////////////////////////////////// diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java index b60c76f62e2..d7cd4c26f16 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,11 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; @@ -60,7 +60,10 @@ public class ListDedicatedPodsCmd extends BaseListCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account associated with the pod. Must be used with domainId.") private String accountName; - @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, type = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "list dedicated pods by affinity group") + @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, + type = CommandType.UUID, + entityType = AffinityGroupResponse.class, + description = "list dedicated pods by affinity group") private Long affinityGroupId; ///////////////////////////////////////////////////// diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java index d9704cdadaf..07b8b19bb75 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -28,13 +30,11 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; @@ -60,7 +60,10 @@ public class ListDedicatedZonesCmd extends BaseListCmd { @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the name of the account associated with the zone. Must be used with domainId.") private String accountName; - @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, type = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "list dedicated zones by affinity group") + @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, + type = CommandType.UUID, + entityType = AffinityGroupResponse.class, + description = "list dedicated zones by affinity group") private Long affinityGroupId; ///////////////////////////////////////////////////// diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java index 7590dba02b7..e065da2c0c2 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -59,6 +60,7 @@ public class ReleaseDedicatedClusterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java index 4a022fbb653..41e668c0e41 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -59,6 +60,7 @@ public class ReleaseDedicatedHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java index cf86e274ee2..47ea475e0fc 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -59,6 +60,7 @@ public class ReleaseDedicatedPodCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java index b4a1a4ea638..69185d62dc9 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.dedicated.DedicatedService; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -59,6 +60,7 @@ public class ReleaseDedicatedZoneCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// + @Override public String getCommandName() { return s_name; } diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java index 1d7c967e343..ecc162c5ed8 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java @@ -16,12 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; -import javax.persistence.Column; +import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class DedicateClusterResponse extends BaseResponse { @SerializedName("id") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java index cb29dbdec51..2e11458dec8 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class DedicateHostResponse extends BaseResponse { @SerializedName("id") diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java index 6476d6e6007..6118074435c 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.DedicatedResources; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = DedicatedResources.class) public class DedicatePodResponse extends BaseResponse { diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java index 736ed3391c3..afbf42221f2 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java @@ -16,12 +16,13 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.dc.DedicatedResources; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = DedicatedResources.class) public class DedicateZoneResponse extends BaseResponse { diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java index 2b1722c6f64..b82b361f7e8 100755 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java @@ -24,9 +24,9 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.utils.component.AdapterBase; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; -import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.dao.AffinityGroupDao; @@ -48,8 +48,6 @@ import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.dc.ClusterVO; @@ -190,7 +188,8 @@ public class DedicatedResourceManagerImpl implements DedicatedService { clustersToRelease.add(dCluster); } else { s_logger.error("Cluster " + cluster.getName() + " under this Zone " + dc.getName() + " is dedicated to different account/domain"); - throw new CloudRuntimeException("Cluster " + cluster.getName() + " under this Zone " + dc.getName() + " is dedicated to different account/domain"); + throw new CloudRuntimeException("Cluster " + cluster.getName() + " under this Zone " + dc.getName() + + " is dedicated to different account/domain"); } } else { if (dCluster.getAccountId() == null && dCluster.getDomainId() == domainId) { @@ -325,7 +324,8 @@ public class DedicatedResourceManagerImpl implements DedicatedService { clustersToRelease.add(dCluster); } else { s_logger.error("Cluster " + cluster.getName() + " under this Pod " + pod.getName() + " is dedicated to different account/domain"); - throw new CloudRuntimeException("Cluster " + cluster.getName() + " under this Pod " + pod.getName() + " is dedicated to different account/domain"); + throw new CloudRuntimeException("Cluster " + cluster.getName() + " under this Pod " + pod.getName() + + " is dedicated to different account/domain"); } } else { if (dCluster.getAccountId() == null && dCluster.getDomainId() == domainId) { @@ -454,7 +454,8 @@ public class DedicatedResourceManagerImpl implements DedicatedService { DedicatedResourceVO dHost = _dedicatedDao.findByHostId(host.getId()); if (dHost != null) { if (!(childDomainIds.contains(dHost.getDomainId()))) { - throw new CloudRuntimeException("Host " + host.getName() + " under this Cluster " + cluster.getName() + " is dedicated to different account/domain"); + throw new CloudRuntimeException("Host " + host.getName() + " under this Cluster " + cluster.getName() + + " is dedicated to different account/domain"); } /*if all dedicated resources belongs to same account and domain then we should release dedication and make new entry for this cluster */ @@ -667,14 +668,16 @@ public class DedicatedResourceManagerImpl implements DedicatedService { for (UserVmVO vm : allVmsOnHost) { if (vm.getAccountId() != accountId) { s_logger.info("Host " + vm.getHostId() + " found to be unsuitable for explicit dedication as it is " + "running instances of another account"); - throw new CloudRuntimeException("Host " + hostId + " found to be unsuitable for explicit dedication as it is " + "running instances of another account"); + throw new CloudRuntimeException("Host " + hostId + " found to be unsuitable for explicit dedication as it is " + + "running instances of another account"); } } } else { for (UserVmVO vm : allVmsOnHost) { if (!domainIds.contains(vm.getDomainId())) { s_logger.info("Host " + vm.getHostId() + " found to be unsuitable for explicit dedication as it is " + "running instances of another domain"); - throw new CloudRuntimeException("Host " + hostId + " found to be unsuitable for explicit dedication as it is " + "running instances of another domain"); + throw new CloudRuntimeException("Host " + hostId + " found to be unsuitable for explicit dedication as it is " + + "running instances of another domain"); } } } diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java index 62cbc43283b..06a5273b8e8 100755 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java @@ -16,10 +16,8 @@ // under the License. package org.apache.cloudstack.dedicated; -import com.cloud.dc.DedicatedResourceVO; -import com.cloud.dc.DedicatedResources; -import com.cloud.utils.Pair; -import com.cloud.utils.component.PluggableService; +import java.util.List; + import org.apache.cloudstack.api.commands.ListDedicatedClustersCmd; import org.apache.cloudstack.api.commands.ListDedicatedHostsCmd; import org.apache.cloudstack.api.commands.ListDedicatedPodsCmd; @@ -29,7 +27,10 @@ import org.apache.cloudstack.api.response.DedicateHostResponse; import org.apache.cloudstack.api.response.DedicatePodResponse; import org.apache.cloudstack.api.response.DedicateZoneResponse; -import java.util.List; +import com.cloud.dc.DedicatedResourceVO; +import com.cloud.dc.DedicatedResources; +import com.cloud.utils.Pair; +import com.cloud.utils.component.PluggableService; public interface DedicatedService extends PluggableService { diff --git a/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java b/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java index 5c0f10331cb..213174b7cea 100644 --- a/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java +++ b/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java @@ -28,10 +28,6 @@ import javax.inject.Inject; import junit.framework.Assert; -import org.apache.cloudstack.affinity.AffinityGroupService; -import org.apache.cloudstack.affinity.dao.AffinityGroupDao; -import org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl; -import org.apache.cloudstack.test.utils.SpringUtils; import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; @@ -50,6 +46,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.apache.cloudstack.affinity.AffinityGroupService; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; diff --git a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java index 67d6c700595..bc3ff0ab575 100644 --- a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java +++ b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java @@ -29,8 +29,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import com.cloud.configuration.Config; -import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage; -import com.cloud.deploy.dao.PlannerHostReservationDao; import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.host.HostVO; import com.cloud.resource.ResourceManager; @@ -40,9 +38,7 @@ import com.cloud.service.dao.ServiceOfferingDetailsDao; import com.cloud.user.Account; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; -import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = DeploymentPlanner.class) @@ -169,7 +165,7 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements Deploy } else { if (!isImplicitPlannerUsedByOffering(vm.getServiceOfferingId())) { s_logger.info("Host " + vm.getHostId() + " found to be unsuitable for implicit dedication as it " + - "is running instances of this account which haven't been created using implicit dedication."); + "is running instances of this account which haven't been created using implicit dedication."); suitable = false; break; } diff --git a/plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java b/plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java index 8bed45de9d8..110fd7b4437 100644 --- a/plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java +++ b/plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.implicitplanner; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,7 +34,6 @@ import java.util.UUID; import javax.inject.Inject; -import com.cloud.hypervisor.Hypervisor; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -59,6 +57,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.test.utils.SpringUtils; +import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityManager; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; @@ -377,15 +376,15 @@ public class ImplicitPlannerTest { clustersWithEnoughCapacity.add(2L); clustersWithEnoughCapacity.add(3L); when( - capacityDao.listClustersInZoneOrPodByHostCapacities(dataCenterId, noOfCpusInOffering * cpuSpeedInOffering, ramInOffering * 1024L * 1024L, CapacityVO.CAPACITY_TYPE_CPU, - true)).thenReturn(clustersWithEnoughCapacity); + capacityDao.listClustersInZoneOrPodByHostCapacities(dataCenterId, noOfCpusInOffering * cpuSpeedInOffering, ramInOffering * 1024L * 1024L, + Capacity.CAPACITY_TYPE_CPU, true)).thenReturn(clustersWithEnoughCapacity); Map clusterCapacityMap = new HashMap(); clusterCapacityMap.put(1L, 2048D); clusterCapacityMap.put(2L, 2048D); clusterCapacityMap.put(3L, 2048D); Pair, Map> clustersOrderedByCapacity = new Pair, Map>(clustersWithEnoughCapacity, clusterCapacityMap); - when(capacityDao.orderClustersByAggregateCapacity(dataCenterId, CapacityVO.CAPACITY_TYPE_CPU, true)).thenReturn(clustersOrderedByCapacity); + when(capacityDao.orderClustersByAggregateCapacity(dataCenterId, Capacity.CAPACITY_TYPE_CPU, true)).thenReturn(clustersOrderedByCapacity); List disabledClusters = new ArrayList(); List clustersWithDisabledPods = new ArrayList(); diff --git a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java index e5407bbd393..df6531e8abd 100644 --- a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java +++ b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java @@ -25,7 +25,6 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import com.cloud.utils.Pair; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = DeploymentPlanner.class) @@ -41,7 +40,8 @@ public class UserConcentratedPodPlanner extends FirstFitPlanner implements Deplo * @return List ordered list of Cluster Ids */ @Override - protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, DeploymentPlan plan) { + protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, + DeploymentPlan plan) { List clusterIdsByCapacity = clusterCapacityInfo.first(); if (vmProfile.getOwner() == null || !isZone) { return clusterIdsByCapacity; diff --git a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java index 97fee883c24..5df4d13756d 100755 --- a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java +++ b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java @@ -31,7 +31,6 @@ import org.apache.log4j.Logger; import com.cloud.configuration.Config; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = DeploymentPlanner.class) @@ -46,7 +45,8 @@ public class UserDispersingPlanner extends FirstFitPlanner implements Deployment * @return List ordered list of Cluster Ids */ @Override - protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, DeploymentPlan plan) { + protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, + DeploymentPlan plan) { List clusterIdsByCapacity = clusterCapacityInfo.first(); if (vmProfile.getOwner() == null) { return clusterIdsByCapacity; diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index 4df18742b8e..c1a4ee2bb98 100644 --- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java @@ -19,18 +19,6 @@ package org.apache.cloudstack.mom.rabbitmq; -import com.rabbitmq.client.*; - -import org.apache.cloudstack.framework.events.*; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.log4j.Logger; - -import com.cloud.utils.Ternary; -import com.cloud.utils.component.ManagerBase; - -import javax.ejb.Local; -import javax.naming.ConfigurationException; - import java.io.IOException; import java.net.ConnectException; import java.util.Map; @@ -39,6 +27,32 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import javax.ejb.Local; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; + +import com.rabbitmq.client.AMQP; +import com.rabbitmq.client.AlreadyClosedException; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import com.rabbitmq.client.DefaultConsumer; +import com.rabbitmq.client.Envelope; +import com.rabbitmq.client.MessageProperties; +import com.rabbitmq.client.ShutdownListener; +import com.rabbitmq.client.ShutdownSignalException; + +import org.apache.cloudstack.framework.events.Event; +import org.apache.cloudstack.framework.events.EventBus; +import org.apache.cloudstack.framework.events.EventBusException; +import org.apache.cloudstack.framework.events.EventSubscriber; +import org.apache.cloudstack.framework.events.EventTopic; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + +import com.cloud.utils.Ternary; +import com.cloud.utils.component.ManagerBase; + @Local(value = EventBus.class) public class RabbitMQEventBus extends ManagerBase implements EventBus { @@ -108,31 +122,32 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus { } public void setServer(String amqpHost) { - this.amqpHost = amqpHost; + RabbitMQEventBus.amqpHost = amqpHost; } public void setUsername(String username) { - this.username = username; + RabbitMQEventBus.username = username; } public void setPassword(String password) { - this.password = password; + RabbitMQEventBus.password = password; } public void setPort(Integer port) { - this.port = port; + RabbitMQEventBus.port = port; } + @Override public void setName(String name) { this.name = name; } public void setExchange(String exchange) { - this.amqpExchangeName = exchange; + RabbitMQEventBus.amqpExchangeName = exchange; } public void setRetryInterval(Integer retryInterval) { - this.retryInterval = retryInterval; + RabbitMQEventBus.retryInterval = retryInterval; } /** Call to subscribe to interested set of events diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java index 6e3605a0058..b698daa876f 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java @@ -22,15 +22,15 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.AssociateLunCmdResponse; @APICommand(name = "associateLun", description = "Associate a LUN with a guest IQN", responseObject = AssociateLunCmdResponse.class) diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java index b768de67912..86b2497f942 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java @@ -22,19 +22,19 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.CreateLunCmdResponse; @APICommand(name = "createLunOnFiler", description = "Create a LUN from a pool", responseObject = CreateLunCmdResponse.class) @@ -64,7 +64,8 @@ public class CreateLunCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { CreateLunCmdResponse response = new CreateLunCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java index 0813b328959..e79aa14dbf7 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java @@ -21,19 +21,19 @@ import java.rmi.ServerException; import javax.inject.Inject; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.CreateVolumeOnFilerCmdResponse; @APICommand(name = "createVolumeOnFiler", description = "Create a volume", responseObject = CreateVolumeOnFilerCmdResponse.class) @@ -107,7 +107,8 @@ public class CreateVolumeOnFilerCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { //param checks if (snapshotReservation != null && (snapshotReservation < 0 || snapshotReservation > 100)) throw new InvalidParameterValueException("Invalid snapshot reservation"); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java index abc5b7bc893..ba7493305c7 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java @@ -20,19 +20,19 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.CreateVolumePoolCmdResponse; @APICommand(name = "createPool", description = "Create a pool", responseObject = CreateVolumePoolCmdResponse.class) @@ -57,7 +57,8 @@ public class CreateVolumePoolCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { CreateVolumePoolCmdResponse response = new CreateVolumePoolCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java index 124b3737bd5..1d221e9ebc6 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java @@ -20,12 +20,13 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -47,7 +48,8 @@ public class DeleteVolumePoolCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { netappMgr.deletePool(poolName); DeleteVolumePoolCmdResponse response = new DeleteVolumePoolCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java index 926ef9bfa01..e0c0eb7f064 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java @@ -22,19 +22,19 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.DeleteLUNCmdResponse; @APICommand(name = "destroyLunOnFiler", description = "Destroy a LUN", responseObject = DeleteLUNCmdResponse.class) @@ -50,7 +50,8 @@ public class DestroyLunCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { netappMgr.destroyLunOnFiler(path); DeleteLUNCmdResponse response = new DeleteLUNCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java index a20121fbbc1..680c4e51147 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java @@ -20,10 +20,15 @@ import java.rmi.ServerException; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -51,7 +56,8 @@ public class DestroyVolumeOnFilerCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { netappMgr.destroyVolumeOnFiler(ipAddr, aggrName, volumeName); DeleteVolumeOnFilerCmdResponse response = new DeleteVolumeOnFilerCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java index 9824289e1c0..4ea9684f0a1 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java @@ -20,17 +20,21 @@ import java.rmi.ServerException; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.DissociateLunCmdResponse; @APICommand(name = "dissociateLun", description = "Dissociate a LUN", responseObject = DissociateLunCmdResponse.class) @@ -48,7 +52,8 @@ public class DissociateLunCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { netappMgr.disassociateLun(guestIQN, path); DissociateLunCmdResponse response = new DissociateLunCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java index a3f6a3c5678..04e64f38514 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java @@ -23,13 +23,14 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -37,7 +38,6 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.LunVO; import com.cloud.netapp.NetappManager; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.ListLunsCmdResponse; @APICommand(name = "listLunsOnFiler", description = "List LUN", responseObject = ListLunsCmdResponse.class) @@ -52,7 +52,8 @@ public class ListLunsCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List lunList = netappMgr.listLunsOnFiler(poolName); ListResponse listResponse = new ListResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java index 5585321e2cd..9e650e035ee 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java @@ -23,11 +23,12 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -35,7 +36,6 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; import com.cloud.netapp.PoolVO; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.ListVolumePoolsCmdResponse; @APICommand(name = "listPools", description = "List Pool", responseObject = ListVolumePoolsCmdResponse.class) @@ -47,7 +47,8 @@ public class ListVolumePoolsCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List poolList = netappMgr.listPools(); ListResponse listResponse = new ListResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java index 655c87e05d8..38c91b75819 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java @@ -21,11 +21,16 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -33,7 +38,6 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.netapp.NetappManager; import com.cloud.netapp.NetappVolumeVO; -import com.cloud.server.ManagementService; import com.cloud.server.api.response.netapp.ListVolumesOnFilerCmdResponse; @APICommand(name = "listVolumesOnFiler", description = "List Volumes", responseObject = ListVolumesOnFilerCmdResponse.class) @@ -48,7 +52,8 @@ public class ListVolumesOnFilerCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List volumes = netappMgr.listVolumesOnFiler(poolName); ListResponse listResponse = new ListResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java index 2d2006ed573..94d5de593d7 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java @@ -20,11 +20,12 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; @@ -47,7 +48,8 @@ public class ModifyVolumePoolCmd extends BaseCmd { NetappManager netappMgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { netappMgr.modifyPool(poolName, algorithm); ModifyVolumePoolCmdResponse response = new ModifyVolumePoolCmdResponse(); diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java index 7801189c942..8c9a802f6c1 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.netapp; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "netapp_lun") public class LunVO implements InternalIdentity { @@ -86,6 +86,7 @@ public class LunVO implements InternalIdentity { this.targetIqn = targetIqn; } + @Override public long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java index ba478c38ed8..f42be33f27d 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java @@ -21,10 +21,10 @@ import java.rmi.ServerException; import java.util.HashMap; import java.util.List; -import org.apache.log4j.Logger; - import netapp.manage.NaException; +import org.apache.log4j.Logger; + public class NetappDefaultAllocatorImpl implements NetappAllocator { private static HashMap _poolNameToLastVolumeIdAllocated = new HashMap(); private NetappManager _netappMgr; @@ -34,6 +34,7 @@ public class NetappDefaultAllocatorImpl implements NetappAllocator { _netappMgr = netappMgr; } + @Override public synchronized NetappVolumeVO chooseLeastFullVolumeFromPool(String poolName, long lunSizeGb) { List volumesOnPoolAscending = _netappMgr.listVolumesAscending(poolName); @@ -69,6 +70,7 @@ public class NetappDefaultAllocatorImpl implements NetappAllocator { * @throws IOException * @throws NaException */ + @Override public synchronized NetappVolumeVO chooseVolumeFromPool(String poolName, long lunSizeGb) { int pos = 0; //0 by default List volumesOnPoolAscending = _netappMgr.listVolumesAscending(poolName); diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java index 0e0c186be1f..10a619c2f38 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java @@ -17,7 +17,6 @@ package com.cloud.netapp; import java.io.IOException; -import java.lang.Override; import java.net.UnknownHostException; import java.rmi.ServerException; import java.util.ArrayList; @@ -41,7 +40,18 @@ import netapp.manage.NaServer; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.api.commands.netapp.*; +import com.cloud.api.commands.netapp.AssociateLunCmd; +import com.cloud.api.commands.netapp.CreateLunCmd; +import com.cloud.api.commands.netapp.CreateVolumeOnFilerCmd; +import com.cloud.api.commands.netapp.CreateVolumePoolCmd; +import com.cloud.api.commands.netapp.DeleteVolumePoolCmd; +import com.cloud.api.commands.netapp.DestroyLunCmd; +import com.cloud.api.commands.netapp.DestroyVolumeOnFilerCmd; +import com.cloud.api.commands.netapp.DissociateLunCmd; +import com.cloud.api.commands.netapp.ListLunsCmd; +import com.cloud.api.commands.netapp.ListVolumePoolsCmd; +import com.cloud.api.commands.netapp.ListVolumesOnFilerCmd; +import com.cloud.api.commands.netapp.ModifyVolumePoolCmd; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceInUseException; @@ -298,8 +308,8 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { */ @Override @DB - public void createVolumeOnFiler(String ipAddress, String aggName, String poolName, String volName, String volSize, String snapshotPolicy, Integer snapshotReservation, - String username, String password) throws UnknownHostException, ServerException, InvalidParameterValueException { + public void createVolumeOnFiler(String ipAddress, String aggName, String poolName, String volName, String volSize, String snapshotPolicy, + Integer snapshotReservation, String username, String password) throws UnknownHostException, ServerException, InvalidParameterValueException { if (s_logger.isDebugEnabled()) s_logger.debug("Request --> createVolume " + "serverIp:" + ipAddress); @@ -421,12 +431,12 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { deleteRogueVolume(volName, s);//deletes created volume on filer } catch (NaException e) { s_logger.warn("Failed to cleanup created volume whilst rolling back on the netapp filer:", e); - throw new ServerException("Unable to create volume via cloudtools." + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", - e); + throw new ServerException("Unable to create volume via cloudtools." + + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", e); } catch (IOException e) { s_logger.warn("Failed to cleanup created volume whilst rolling back on the netapp filer:", e); - throw new ServerException("Unable to create volume via cloudtools." + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", - e); + throw new ServerException("Unable to create volume via cloudtools." + + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", e); } } throw new ServerException("Unable to create volume", nae); @@ -438,12 +448,12 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { deleteRogueVolume(volName, s);//deletes created volume on filer } catch (NaException e) { s_logger.warn("Failed to cleanup created volume whilst rolling back on the netapp filer:", e); - throw new ServerException("Unable to create volume via cloudtools." + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", - e); + throw new ServerException("Unable to create volume via cloudtools." + + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", e); } catch (IOException e) { s_logger.warn("Failed to cleanup created volume whilst rolling back on the netapp filer:", e); - throw new ServerException("Unable to create volume via cloudtools." + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", - e); + throw new ServerException("Unable to create volume via cloudtools." + + "Failed to cleanup created volume on netapp filer whilst rolling back on the cloud db:", e); } } throw new ServerException("Unable to create volume", ioe); @@ -520,7 +530,17 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { String whichMinutes = xo.getChildContent("which-minutes"); StringBuilder sB = new StringBuilder(); - sB.append(weeks).append(" ").append(days).append(" ").append(hours).append("@").append(whichHours).append(" ").append(minutes).append("@").append(whichMinutes); + sB.append(weeks) + .append(" ") + .append(days) + .append(" ") + .append(hours) + .append("@") + .append(whichHours) + .append(" ") + .append(minutes) + .append("@") + .append(whichMinutes); return sB.toString(); } catch (NaException nae) { s_logger.warn("Failed to get volume size ", nae); diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java index 7e7544f23ad..cfaced96c5e 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.netapp; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,6 +23,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "netapp_volume") public class NetappVolumeVO implements InternalIdentity { @@ -134,6 +134,7 @@ public class NetappVolumeVO implements InternalIdentity { this.volumeSize = volumeSize; } + @Override public long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java index 7c123f9a0d2..a045fecb290 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.netapp; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -25,10 +23,13 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = "netapp_pool") public class PoolVO implements InternalIdentity { + @Override public long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java index 583d68d0513..2bc95cf83f0 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDao.java @@ -19,8 +19,6 @@ package com.cloud.netapp.dao; import java.util.List; import com.cloud.netapp.LunVO; -import com.cloud.netapp.NetappVolumeVO; -import com.cloud.netapp.PoolVO; import com.cloud.utils.db.GenericDao; public interface LunDao extends GenericDao { diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java index 3f73ccd43b5..60a15b58789 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java @@ -24,8 +24,6 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.netapp.LunVO; -import com.cloud.netapp.NetappVolumeVO; -import com.cloud.netapp.PoolVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java index 8669260af6b..5b4a2c960f9 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java @@ -24,10 +24,6 @@ import org.springframework.stereotype.Component; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.GenericQueryBuilder; @Component @Local(value = BaremetalDhcpDao.class) diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java index 4b0ad0d54d4..6e3e167d8bc 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java @@ -22,8 +22,6 @@ import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java index 231c3ff6d26..da575a2a11e 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java @@ -19,7 +19,6 @@ package com.cloud.baremetal.database; import com.cloud.utils.db.GenericDao; -import com.cloud.utils.db.GenericDaoBase; public interface BaremetalPxeDao extends GenericDao { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java index 2a0def07d96..0122fa9c514 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java @@ -24,10 +24,6 @@ import org.springframework.stereotype.Component; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.GenericQueryBuilder; @Component @Local(value = {BaremetalPxeDao.class}) diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java index f6006cad8ac..76897f26d34 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java @@ -33,11 +33,11 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; - import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.baremetal.networkservice.BareMetalResourceBase; @@ -96,8 +96,8 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) throws DiscoveryException { /* Enable this after we decide to use addBaremetalHostCmd instead of addHostCmd String discoverName = _params.get(ApiConstants.BAREMETAL_DISCOVER_NAME); @@ -156,7 +156,8 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R command.add("password=" + password, ParamType.PASSWORD); final String result = command.execute(); if (result != null) { - s_logger.warn(String.format("Can not set up ipmi connection(ip=%1$s, username=%2$s, password=%3$s, args) because %4$s", ipmiIp, username, "******", result)); + s_logger.warn(String.format("Can not set up ipmi connection(ip=%1$s, username=%2$s, password=%3$s, args) because %4$s", ipmiIp, username, "******", + result)); return null; } @@ -221,8 +222,8 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R zone.setDhcpProvider(Network.Provider.ExternalDhcpServer.getName()); _dcDao.update(zone.getId(), zone); - s_logger.debug(String.format("Discover Bare Metal host successfully(ip=%1$s, username=%2$s, password=%3%s," + "cpuNum=%4$s, cpuCapacity-%5$s, memCapacity=%6$s)", - ipmiIp, username, "******", cpuNum, cpuCapacity, memCapacity)); + s_logger.debug(String.format("Discover Bare Metal host successfully(ip=%1$s, username=%2$s, password=%3%s," + + "cpuNum=%4$s, cpuCapacity-%5$s, memCapacity=%6$s)", ipmiIp, username, "******", cpuNum, cpuCapacity, memCapacity)); return resources; } catch (Exception e) { s_logger.warn("Can not set up bare metal agent", e); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java index c83e5724ce9..2f93ec7d819 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java @@ -129,7 +129,7 @@ public class BareMetalPlanner extends AdapterBase implements DeploymentPlanner { hosts = _resourceMgr.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, cluster.getId(), cluster.getPodId(), cluster.getDataCenterId()); } else { s_logger.warn("Cannot find HA host with tag " + haVmTag + " in cluster id=" + cluster.getId() + ", pod id=" + cluster.getPodId() + ", data center id=" + - cluster.getDataCenterId()); + cluster.getDataCenterId()); return null; } for (HostVO h : hosts) { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java index 94b72446227..3115a187145 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java @@ -28,11 +28,12 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; -import org.apache.log4j.Logger; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.DataCenterVO; @@ -44,14 +45,12 @@ import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.resource.ResourceManager; import com.cloud.storage.TemplateProfile; -import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateZoneVO; import com.cloud.template.TemplateAdapter; import com.cloud.template.TemplateAdapterBase; import com.cloud.user.Account; -import com.cloud.utils.UriUtils; import com.cloud.utils.db.DB; import com.cloud.utils.exception.CloudRuntimeException; @@ -97,8 +96,9 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem private void templateCreateUsage(VMTemplateVO template, long dcId) { if (template.getAccountId() != Account.ACCOUNT_ID_SYSTEM) { - UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, template.getAccountId(), dcId, template.getId(), template.getName(), null, - template.getSourceTemplateId(), 0L); + UsageEventVO usageEvent = + new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, template.getAccountId(), dcId, template.getId(), template.getName(), null, + template.getSourceTemplateId(), 0L); _usageEventDao.persist(usageEvent); } } @@ -109,7 +109,8 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem Long zoneId = profile.getZoneId(); // create an entry at template_store_ref with store_id = null to represent that this template is ready for use. - TemplateDataStoreVO vmTemplateHost = new TemplateDataStoreVO(null, template.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, null, template.getUrl()); + TemplateDataStoreVO vmTemplateHost = + new TemplateDataStoreVO(null, template.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null, null, template.getUrl()); this._tmpltStoreDao.persist(vmTemplateHost); if (zoneId == null || zoneId == -1) { @@ -125,6 +126,7 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem return template; } + @Override public TemplateProfile prepareDelete(DeleteIsoCmd cmd) { throw new CloudRuntimeException("Baremetal doesn't support ISO, how the delete get here???"); } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java index 86192ac0cd2..5db29d2fd69 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java @@ -18,7 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.manager; -import com.cloud.network.Network.Provider; import com.cloud.utils.component.Manager; import com.cloud.utils.component.PluggableService; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java index 9c5514495d4..f6a41133e3a 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java @@ -26,28 +26,18 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.AddBaremetalHostCmd; import org.apache.log4j.Logger; -import com.cloud.agent.api.StopAnswer; -import com.cloud.agent.manager.Commands; -import com.cloud.deploy.DeployDestination; -import com.cloud.exception.ResourceUnavailableException; +import org.apache.cloudstack.api.AddBaremetalHostCmd; + import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.fsm.StateListener; -import com.cloud.vm.ReservationContext; -import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachineGuru; -import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.VirtualMachineName; import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.VirtualMachineProfile; @Local(value = {BaremetalManager.class}) public class BaremetalManagerImpl extends ManagerBase implements BaremetalManager, StateListener { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java index 708f62a2391..8a87285bc3b 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java @@ -62,7 +62,6 @@ import com.cloud.uservm.UserVm; import com.cloud.utils.db.DB; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.NicVO; @@ -106,7 +105,8 @@ public class BareMetalPingServiceImpl extends BareMetalPxeServiceBase implements try { String tpl = profile.getTemplate().getUrl(); assert tpl != null : "How can a null template get here!!!"; - PreparePxeServerCommand cmd = new PreparePxeServerCommand(ip, mac, mask, gateway, dns, tpl, profile.getVirtualMachine().getInstanceName(), dest.getHost().getName()); + PreparePxeServerCommand cmd = + new PreparePxeServerCommand(ip, mac, mask, gateway, dns, tpl, profile.getVirtualMachine().getInstanceName(), dest.getHost().getName()); PreparePxeServerAnswer ans = (PreparePxeServerAnswer)_agentMgr.send(pxeServerId, cmd); if (!ans.getResult()) { s_logger.warn("Unable tot program PXE server: " + pxeVo.getId() + " because " + ans.getDetails()); @@ -175,14 +175,14 @@ public class BareMetalPingServiceImpl extends BareMetalPxeServiceBase implements } zoneId = pNetwork.getDataCenterId(); - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), - BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName() + - " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); + " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - cmd.getPhysicalNetworkId() + "to add this device"); + cmd.getPhysicalNetworkId() + "to add this device"); } HostPodVO pod = _podDao.findById(cmd.getPodId()); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java index 78e37934d0a..842f9c3f269 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java @@ -22,10 +22,7 @@ // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; -import java.util.Map; - import javax.inject.Inject; -import javax.naming.ConfigurationException; import com.cloud.agent.AgentManager; import com.cloud.dc.dao.DataCenterDao; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 2dbdd578278..70bdb6f62df 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -31,6 +31,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import com.cloud.agent.IAgentControl; @@ -134,8 +135,8 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource _cpuNum = Long.parseLong((String)params.get(ApiConstants.CPU_NUMBER)); } catch (NumberFormatException e) { throw new ConfigurationException(String.format("Unable to parse number of CPU or memory capacity " - + "or cpu capacity(cpu number = %1$s memCapacity=%2$s, cpuCapacity=%3$s", params.get(ApiConstants.CPU_NUMBER), - params.get(ApiConstants.MEMORY), params.get(ApiConstants.CPU_SPEED))); + + "or cpu capacity(cpu number = %1$s memCapacity=%2$s, cpuCapacity=%3$s", params.get(ApiConstants.CPU_NUMBER), params.get(ApiConstants.MEMORY), + params.get(ApiConstants.CPU_SPEED))); } _zone = (String)params.get("zone"); @@ -339,7 +340,8 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource vmDao = ComponentContext.getComponent(VMInstanceDao.class); final List vms = vmDao.listByHostId(hostId); for (VMInstanceVO vm : vms) { - states.put(vm.getInstanceName(), new HostVmStateReportEntry(vm.getState() == State.Running ? PowerState.PowerOn : PowerState.PowerOff, "host-" + hostId, null)); + states.put(vm.getInstanceName(), new HostVmStateReportEntry(vm.getState() == State.Running ? PowerState.PowerOn : PowerState.PowerOff, "host-" + hostId, + null)); } } /* diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java index b1591cbfb2e..808c61ecb66 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java @@ -22,6 +22,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java index bdc6b3b0dda..5f2c7466b0f 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java @@ -109,8 +109,8 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv @Override @DB - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { Host host = dest.getHost(); if (vm.getType() != Type.User || vm.getHypervisorType() != HypervisorType.BareMetal) { return false; @@ -125,7 +125,8 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -145,7 +146,8 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -160,8 +162,8 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv } @Override - public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { if (vm.getHypervisorType() != HypervisorType.BareMetal || !canHandle(dest, network.getTrafficType(), network.getGuestType())) { return false; } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java index 000aa7b5f3a..ce6e9b3440c 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java @@ -30,15 +30,12 @@ import org.apache.cloudstack.api.ListBaremetalDhcpCmd; import com.cloud.baremetal.database.BaremetalDhcpVO; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.host.Host; import com.cloud.network.Network; import com.cloud.network.Network.Provider; -import com.cloud.uservm.UserVm; import com.cloud.utils.component.Manager; import com.cloud.utils.component.PluggableService; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; public interface BaremetalDhcpManager extends Manager, PluggableService { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java index 8ac298c24ec..3299268f4d2 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java @@ -148,16 +148,18 @@ public class BaremetalDhcpManagerImpl extends ManagerBase implements BaremetalDh if (dns == null) { dns = nic.getDns2(); } - DhcpEntryCommand dhcpCommand = new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), profile.getVirtualMachine().getHostName(), null, dns, nic.getGateway(), null, - _ntwkModel.getExecuteInSeqNtwkElmtCmd()); - String errMsg = String.format("Set dhcp entry on external DHCP %1$s failed(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(), nic.getIp4Address(), - nic.getMacAddress(), profile.getVirtualMachine().getHostName()); + DhcpEntryCommand dhcpCommand = + new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), profile.getVirtualMachine().getHostName(), null, dns, nic.getGateway(), null, + _ntwkModel.getExecuteInSeqNtwkElmtCmd()); + String errMsg = + String.format("Set dhcp entry on external DHCP %1$s failed(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(), nic.getIp4Address(), + nic.getMacAddress(), profile.getVirtualMachine().getHostName()); // prepareBareMetalDhcpEntry(nic, dhcpCommand); try { Answer ans = _agentMgr.send(h.getId(), dhcpCommand); if (ans.getResult()) { - s_logger.debug(String.format("Set dhcp entry on external DHCP %1$s successfully(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(), nic.getIp4Address(), - nic.getMacAddress(), profile.getVirtualMachine().getHostName())); + s_logger.debug(String.format("Set dhcp entry on external DHCP %1$s successfully(ip=%2$s, mac=%3$s, vmname=%4$s)", h.getPrivateIpAddress(), + nic.getIp4Address(), nic.getMacAddress(), profile.getVirtualMachine().getHostName())); return true; } else { s_logger.debug(errMsg + " " + ans.getDetails()); @@ -208,14 +210,14 @@ public class BaremetalDhcpManagerImpl extends ManagerBase implements BaremetalDh zoneId = pNetwork.getDataCenterId(); DataCenterVO zone = _dcDao.findById(zoneId); - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), - BaremetalDhcpManager.BAREMETAL_DHCP_SERVICE_PROVIDER.getName()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), BaremetalDhcpManager.BAREMETAL_DHCP_SERVICE_PROVIDER.getName()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + BaremetalDhcpManager.BAREMETAL_DHCP_SERVICE_PROVIDER.getName() + - " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); + " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - cmd.getPhysicalNetworkId() + "to add this device"); + cmd.getPhysicalNetworkId() + "to add this device"); } List dhcps = _resourceMgr.listAllUpAndEnabledHosts(Host.Type.BaremetalDhcp, null, null, zoneId); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java index 75cddd5cf3f..8e7acdef7d9 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java @@ -39,14 +39,10 @@ import com.cloud.agent.api.ReadyAnswer; import com.cloud.agent.api.ReadyCommand; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupExternalDhcpCommand; -import com.cloud.agent.api.StartupPxeServerCommand; import com.cloud.host.Host.Type; import com.cloud.resource.ServerResource; import com.cloud.utils.component.ManagerBase; -import com.cloud.utils.script.Script; -import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class BaremetalDhcpResourceBase extends ManagerBase implements ServerResource { private static final Logger s_logger = Logger.getLogger(BaremetalDhcpResourceBase.class); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java index 3ee346d95cb..0a278ed15ea 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java @@ -18,14 +18,14 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; -import org.apache.cloudstack.api.APICommand; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.baremetal.database.BaremetalDhcpVO; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = BaremetalDhcpVO.class) public class BaremetalDhcpResponse extends BaseResponse { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java index 1000fffe30b..8e43d0c3c5e 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java @@ -29,6 +29,8 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import com.trilead.ssh2.SCPClient; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.HostVmStateReportEntry; @@ -38,11 +40,11 @@ import com.cloud.agent.api.routing.DhcpEntryCommand; import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class BaremetalDhcpdResource extends BaremetalDhcpResourceBase { private static final Logger s_logger = Logger.getLogger(BaremetalDhcpdResource.class); + @Override public boolean configure(String name, Map params) throws ConfigurationException { com.trilead.ssh2.Connection sshConnection = null; try { @@ -116,8 +118,9 @@ public class BaremetalDhcpdResource extends BaremetalDhcpResourceBase { if (sshConnection == null) { return new Answer(cmd, false, "ssh authenticate failed"); } - String addDhcp = String.format("python /usr/bin/dhcpd_edithosts.py %1$s %2$s %3$s %4$s %5$s %6$s", cmd.getVmMac(), cmd.getVmIpAddress(), cmd.getVmName(), cmd.getDns(), - cmd.getGateway(), cmd.getNextServer()); + String addDhcp = + String.format("python /usr/bin/dhcpd_edithosts.py %1$s %2$s %3$s %4$s %5$s %6$s", cmd.getVmMac(), cmd.getVmIpAddress(), cmd.getVmName(), cmd.getDns(), + cmd.getGateway(), cmd.getNextServer()); if (!SSHCmdHelper.sshExecuteCmd(sshConnection, addDhcp)) { return new Answer(cmd, false, "add Dhcp entry failed"); } else { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java index 6458cf49ffa..19c1f19021c 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java @@ -22,7 +22,6 @@ // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -30,6 +29,8 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import com.trilead.ssh2.SCPClient; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.HostVmStateReportEntry; @@ -39,11 +40,11 @@ import com.cloud.agent.api.routing.DhcpEntryCommand; import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class BaremetalDnsmasqResource extends BaremetalDhcpResourceBase { private static final Logger s_logger = Logger.getLogger(BaremetalDnsmasqResource.class); + @Override public boolean configure(String name, Map params) throws ConfigurationException { com.trilead.ssh2.Connection sshConnection = null; try { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java index def1d28c10e..6fc6a28ddbb 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java @@ -27,6 +27,8 @@ import javax.naming.ConfigurationException; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import com.trilead.ssh2.SCPClient; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.HostVmStateReportEntry; @@ -37,7 +39,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class BaremetalKickStartPxeResource extends BaremetalPxeResourceBase { private static final Logger s_logger = Logger.getLogger(BaremetalKickStartPxeResource.class); @@ -181,7 +182,9 @@ public class BaremetalKickStartPxeResource extends BaremetalPxeResourceBase { String kernelPath = String.format("%s/vmlinuz", cmd.getTemplateUuid()); String initrdPath = String.format("%s/initrd.img", cmd.getTemplateUuid()); - script = String.format("python /usr/bin/prepare_kickstart_bootfile.py %s %s %s %s %s %s", _tftpDir, cmd.getMac(), kernelPath, initrdPath, cmd.getKsFile(), cmd.getMac()); + script = + String.format("python /usr/bin/prepare_kickstart_bootfile.py %s %s %s %s %s %s", _tftpDir, cmd.getMac(), kernelPath, initrdPath, cmd.getKsFile(), + cmd.getMac()); if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { return new Answer(cmd, false, "prepare kickstart at pxe server " + _ip + " failed, command:" + script); } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java index 31456a9aea4..62b312398f3 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java @@ -27,10 +27,11 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd; import org.apache.cloudstack.api.AddBaremetalPxeCmd; import org.apache.cloudstack.api.ListBaremetalPxeServersCmd; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; @@ -96,10 +97,11 @@ public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase imple String tpl = profile.getTemplate().getUrl(); assert tpl != null : "How can a null template get here!!!"; String[] tpls = tpl.split(";"); - CloudRuntimeException err = new CloudRuntimeException( - String.format( - "template url[%s] is not correctly encoded. it must be in format of ks=http_link_to_kickstartfile;kernel=nfs_path_to_pxe_kernel;initrd=nfs_path_to_pxe_initrd", - tpl)); + CloudRuntimeException err = + new CloudRuntimeException( + String.format( + "template url[%s] is not correctly encoded. it must be in format of ks=http_link_to_kickstartfile;kernel=nfs_path_to_pxe_kernel;initrd=nfs_path_to_pxe_initrd", + tpl)); if (tpls.length != 3) { throw err; } @@ -172,14 +174,14 @@ public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase imple } zoneId = pNetwork.getDataCenterId(); - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), - BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName() + - " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); + " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - cmd.getPhysicalNetworkId() + "to add this device"); + cmd.getPhysicalNetworkId() + "to add this device"); } List pxes = _resourceMgr.listAllHostsInOneZoneByType(Host.Type.BaremetalPxe, zoneId); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java index 6318435907a..ddad9b6dbb2 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java @@ -30,6 +30,8 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import com.trilead.ssh2.SCPClient; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.HostVmStateReportEntry; @@ -42,7 +44,6 @@ import com.cloud.agent.api.routing.VmDataCommand; import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class BaremetalPingPxeResource extends BaremetalPxeResourceBase { private static final Logger s_logger = Logger.getLogger(BaremetalPingPxeResource.class); @@ -155,8 +156,9 @@ public class BaremetalPingPxeResource extends BaremetalPxeResourceBase { throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password)); } - String script = String.format("python /usr/bin/prepare_tftp_bootfile.py restore %1$s %2$s %3$s %4$s %5$s %6$s %7$s %8$s %9$s %10$s %11$s", _tftpDir, cmd.getMac(), - _storageServer, _share, _dir, cmd.getTemplate(), _cifsUserName, _cifsPassword, cmd.getIp(), cmd.getNetMask(), cmd.getGateWay()); + String script = + String.format("python /usr/bin/prepare_tftp_bootfile.py restore %1$s %2$s %3$s %4$s %5$s %6$s %7$s %8$s %9$s %10$s %11$s", _tftpDir, cmd.getMac(), + _storageServer, _share, _dir, cmd.getTemplate(), _cifsUserName, _cifsPassword, cmd.getIp(), cmd.getNetMask(), cmd.getGateWay()); if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { return new PreparePxeServerAnswer(cmd, "prepare PING at " + _ip + " failed, command:" + script); } @@ -182,8 +184,9 @@ public class BaremetalPingPxeResource extends BaremetalPxeResourceBase { throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, _password)); } - String script = String.format("python /usr/bin/prepare_tftp_bootfile.py backup %1$s %2$s %3$s %4$s %5$s %6$s %7$s %8$s %9$s %10$s %11$s", _tftpDir, cmd.getMac(), - _storageServer, _share, _dir, cmd.getTemplate(), _cifsUserName, _cifsPassword, cmd.getIp(), cmd.getNetMask(), cmd.getGateWay()); + String script = + String.format("python /usr/bin/prepare_tftp_bootfile.py backup %1$s %2$s %3$s %4$s %5$s %6$s %7$s %8$s %9$s %10$s %11$s", _tftpDir, cmd.getMac(), + _storageServer, _share, _dir, cmd.getTemplate(), _cifsUserName, _cifsPassword, cmd.getIp(), cmd.getNetMask(), cmd.getGateWay()); if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { return new Answer(cmd, false, "prepare for creating template failed, command:" + script); } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java index 9c10ae47233..5da52a5c73e 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java @@ -111,8 +111,8 @@ public class BaremetalPxeElement extends AdapterBase implements NetworkElement { @Override @DB - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (vm.getType() != Type.User || vm.getHypervisorType() != HypervisorType.BareMetal) { return false; } @@ -135,7 +135,8 @@ public class BaremetalPxeElement extends AdapterBase implements NetworkElement { } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -150,7 +151,8 @@ public class BaremetalPxeElement extends AdapterBase implements NetworkElement { } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java index d061710c077..6f55636ed54 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java @@ -18,12 +18,13 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.EntityReference; import com.cloud.baremetal.database.BaremetalPxeVO; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = BaremetalPxeVO.class) public class BaremetalPxeKickStartResponse extends BaremetalPxeResponse { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java index b317a7baae0..ca2f8fe7032 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java @@ -223,8 +223,8 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe throw new CloudRuntimeException(String.format("Cannot find physical network in zone %s", vm.getDataCenterId())); } if (phys.size() > 1) { - throw new CloudRuntimeException(String.format("Baremetal only supports one physical network in zone, but zone %s has %s physical networks", vm.getDataCenterId(), - phys.size())); + throw new CloudRuntimeException(String.format("Baremetal only supports one physical network in zone, but zone %s has %s physical networks", + vm.getDataCenterId(), phys.size())); } PhysicalNetworkVO phy = phys.get(0); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java index 13f4d79b1bd..79d7e8a2b40 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java @@ -18,12 +18,13 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.EntityReference; import com.cloud.baremetal.database.BaremetalPxeVO; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = BaremetalPxeVO.class) public class BaremetalPxePingResponse extends BaremetalPxeResponse { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java index 296a3757675..4a1c7ba1beb 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java @@ -18,11 +18,12 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class BaremetalPxeResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java index 141158a110a..b60a67bea55 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java @@ -19,15 +19,12 @@ package com.cloud.baremetal.networkservice; import java.util.HashMap; - -import java.util.List; import java.util.Map; import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.baremetal.manager.BaremetalManager; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; @@ -36,16 +33,12 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; import com.cloud.network.Network.Capability; -import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.element.IpDeployer; import com.cloud.network.element.NetworkElement; import com.cloud.network.element.UserDataServiceProvider; import com.cloud.offering.NetworkOffering; -import com.cloud.uservm.UserVm; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; @@ -82,7 +75,7 @@ public class BaremetalUserdataElement extends AdapterBase implements NetworkElem return false; } - return pxeMgr.addUserData(nic, (VirtualMachineProfile)vm); + return pxeMgr.addUserData(nic, vm); } @Override @@ -115,14 +108,15 @@ public class BaremetalUserdataElement extends AdapterBase implements NetworkElem } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { // TODO Auto-generated method stub return false; } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return false; } @@ -139,7 +133,8 @@ public class BaremetalUserdataElement extends AdapterBase implements NetworkElem } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return false; } diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java index d0299e0cbe1..529f988b519 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java @@ -20,20 +20,11 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.context.CallContext; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.context.CallContext; + import com.cloud.baremetal.database.BaremetalDhcpVO; import com.cloud.baremetal.networkservice.BaremetalDhcpManager; import com.cloud.baremetal.networkservice.BaremetalDhcpResponse; @@ -85,8 +76,8 @@ public class AddBaremetalDhcpCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { BaremetalDhcpVO vo = mgr.addDchpServer(this); BaremetalDhcpResponse response = mgr.generateApiResponse(vo); diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java index 8a84eef5e94..40ee6ded923 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java @@ -18,9 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.admin.host.AddHostCmd; import org.apache.cloudstack.api.response.HostResponse; diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java index bbe6f0eee12..ac8d9c7c0cc 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java @@ -18,11 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.Parameter; - import com.cloud.baremetal.networkservice.BaremetalPxeKickStartResponse; @APICommand(name = "addBaremetalPxeKickStartServer", description = "add a baremetal pxe server", responseObject = BaremetalPxeKickStartResponse.class) diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java index 8b21f072f31..19854a981b5 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java @@ -20,23 +20,15 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import com.cloud.baremetal.networkservice.BaremetalPxeResponse; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.baremetal.database.BaremetalPxeVO; import com.cloud.baremetal.networkservice.BaremetalPxeManager; +import com.cloud.baremetal.networkservice.BaremetalPxeResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -86,8 +78,8 @@ public class AddBaremetalPxeCmd extends BaseAsyncCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { BaremetalPxeVO vo = pxeMgr.addPxeServer(this); BaremetalPxeResponse rsp = pxeMgr.getApiResponse(vo); diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java index 2ec75f56864..b128a62410d 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java @@ -18,10 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.Parameter; - import com.cloud.baremetal.networkservice.BaremetalPxePingResponse; @APICommand(name = "addBaremetalPxePingServer", description = "add a baremetal ping pxe server", responseObject = BaremetalPxePingResponse.class) diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java index 23a5b640b89..7d0aba387d4 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java @@ -22,17 +22,10 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.baremetal.networkservice.BaremetalDhcpManager; import com.cloud.baremetal.networkservice.BaremetalDhcpResponse; import com.cloud.exception.ConcurrentOperationException; @@ -74,8 +67,8 @@ public class ListBaremetalDhcpCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { ListResponse response = new ListResponse(); List dhcpResponses = _dhcpMgr.listBaremetalDhcps(this); diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java index 5b294c88223..437fa3f2cd8 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java @@ -22,12 +22,11 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.ListResponse; + import com.cloud.baremetal.networkservice.BaremetalPxeManager; -import com.cloud.baremetal.networkservice.BaremetalPxePingResponse; import com.cloud.baremetal.networkservice.BaremetalPxeResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -58,8 +57,8 @@ public class ListBaremetalPxeServersCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { ListResponse response = new ListResponse(); List pxeResponses = _pxeMgr.listPxeServers(this); diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java index 159350b243d..e3dcd8f634f 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java @@ -33,10 +33,11 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -90,8 +91,7 @@ import com.cloud.utils.script.Script; * hypervisor and manages its lifecycle. */ @Local(value = Discoverer.class) -public class HypervServerDiscoverer extends DiscovererBase implements - Discoverer, Listener, ResourceStateAdapter { +public class HypervServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(HypervServerDiscoverer.class); private String _instance; @@ -127,33 +127,28 @@ public class HypervServerDiscoverer extends DiscovererBase implements // Listener interface methods @Override - public final boolean processAnswers(final long agentId, final long seq, - final Answer[] answers) { + public final boolean processAnswers(final long agentId, final long seq, final Answer[] answers) { return false; } @Override - public final boolean processCommands(final long agentId, final long seq, - final Command[] commands) { + public final boolean processCommands(final long agentId, final long seq, final Command[] commands) { return false; } @Override - public final AgentControlAnswer processControlCommand(final long agentId, - final AgentControlCommand cmd) { + public final AgentControlAnswer processControlCommand(final long agentId, final AgentControlCommand cmd) { return null; } @Override - public final void processConnect(final Host agent, - final StartupCommand cmd, final boolean forRebalance) - throws ConnectionException { + public final void processConnect(final Host agent, final StartupCommand cmd, final boolean forRebalance) throws ConnectionException { // Limit the commands we can process if (!(cmd instanceof StartupRoutingCommand)) { return; } - StartupRoutingCommand startup = (StartupRoutingCommand) cmd; + StartupRoutingCommand startup = (StartupRoutingCommand)cmd; // assert if (startup.getHypervisorType() != HypervisorType.Hyperv) { @@ -193,15 +188,14 @@ public class HypervServerDiscoverer extends DiscovererBase implements } try { - SetupAnswer answer = (SetupAnswer) _agentMgr.send(agentId, setup); + SetupAnswer answer = (SetupAnswer)_agentMgr.send(agentId, setup); if (answer != null && answer.getResult()) { host.setSetup(true); // TODO: clean up magic numbers below host.setLastPinged((System.currentTimeMillis() >> 10) - 5 * 60); _hostDao.update(host.getId(), host); if (answer.needReconnect()) { - throw new ConnectionException(false, - "Reinitialize agent after setup."); + throw new ConnectionException(false, "Reinitialize agent after setup."); } return; } else { @@ -209,24 +203,20 @@ public class HypervServerDiscoverer extends DiscovererBase implements if (reason == null) { reason = " details were null"; } - s_logger.warn("Unable to setup agent " + agentId + " due to " - + reason); + s_logger.warn("Unable to setup agent " + agentId + " due to " + reason); } // Error handling borrowed from XcpServerDiscoverer, may need to be // updated. } catch (AgentUnavailableException e) { - s_logger.warn("Unable to setup agent " + agentId - + " because it became unavailable.", e); + s_logger.warn("Unable to setup agent " + agentId + " because it became unavailable.", e); } catch (OperationTimedoutException e) { - s_logger.warn("Unable to setup agent " + agentId - + " because it timed out", e); + s_logger.warn("Unable to setup agent " + agentId + " because it timed out", e); } throw new ConnectionException(true, "Reinitialize agent after setup."); } @Override - public final boolean processDisconnect(final long agentId, - final Status state) { + public final boolean processDisconnect(final long agentId, final Status state) { return false; } @@ -252,22 +242,17 @@ public class HypervServerDiscoverer extends DiscovererBase implements // ServerResource is // ignored in favour of another created in response to @Override - public final Map> find( - final long dcId, final Long podId, final Long clusterId, - final URI uri, final String username, final String password, - final List hostTags) throws DiscoveryException { + public final Map> find(final long dcId, final Long podId, final Long clusterId, final URI uri, final String username, + final String password, final List hostTags) throws DiscoveryException { if (s_logger.isInfoEnabled()) { - s_logger.info("Discover host. dc(zone): " + dcId + ", pod: " - + podId + ", cluster: " + clusterId + ", uri host: " - + uri.getHost()); + s_logger.info("Discover host. dc(zone): " + dcId + ", pod: " + podId + ", cluster: " + clusterId + ", uri host: " + uri.getHost()); } // Assertions if (podId == null) { if (s_logger.isInfoEnabled()) { - s_logger.info("No pod is assigned, skipping the discovery in" - + " Hyperv discoverer"); + s_logger.info("No pod is assigned, skipping the discovery in" + " Hyperv discoverer"); } return null; } @@ -276,21 +261,18 @@ public class HypervServerDiscoverer extends DiscovererBase implements // database if (cluster == null) { if (s_logger.isInfoEnabled()) { - s_logger.info("No cluster in database for cluster id " - + clusterId); + s_logger.info("No cluster in database for cluster id " + clusterId); } return null; } if (cluster.getHypervisorType() != HypervisorType.Hyperv) { if (s_logger.isInfoEnabled()) { - s_logger.info("Cluster " + clusterId - + "is not for Hyperv hypervisors"); + s_logger.info("Cluster " + clusterId + "is not for Hyperv hypervisors"); } return null; } if (!uri.getScheme().equals("http")) { - String msg = "urlString is not http so we're not taking care of" - + " the discovery for this: " + uri; + String msg = "urlString is not http so we're not taking care of" + " the discovery for this: " + uri; s_logger.debug(msg); return null; } @@ -300,19 +282,15 @@ public class HypervServerDiscoverer extends DiscovererBase implements InetAddress ia = InetAddress.getByName(hostname); String agentIp = ia.getHostAddress(); String uuidSeed = agentIp; - String guidWithTail = calcServerResourceGuid(uuidSeed) - + "-HypervResource"; + String guidWithTail = calcServerResourceGuid(uuidSeed) + "-HypervResource"; if (_resourceMgr.findHostByGuid(guidWithTail) != null) { - s_logger.debug("Skipping " + agentIp + " because " - + guidWithTail + " is already in the database."); + s_logger.debug("Skipping " + agentIp + " because " + guidWithTail + " is already in the database."); return null; } - s_logger.info("Creating" - + HypervDirectConnectResource.class.getName() - + " HypervDummyResourceBase for zone/pod/cluster " + dcId - + "/" + podId + "/" + clusterId); + s_logger.info("Creating" + HypervDirectConnectResource.class.getName() + " HypervDummyResourceBase for zone/pod/cluster " + dcId + "/" + podId + "/" + + clusterId); // Some Hypervisors organise themselves in pools. // The startup command tells us what pool they are using. @@ -320,8 +298,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements // pool in the database // This GUID may change. if (cluster.getGuid() == null) { - cluster.setGuid(UUID.nameUUIDFromBytes( - String.valueOf(clusterId).getBytes()).toString()); + cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes()).toString()); _clusterDao.update(clusterId, cluster); } @@ -343,8 +320,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements params.putAll(details); - HypervDirectConnectResource resource = - new HypervDirectConnectResource(); + HypervDirectConnectResource resource = new HypervDirectConnectResource(); resource.configure(agentIp, params); // Assert @@ -352,49 +328,39 @@ public class HypervServerDiscoverer extends DiscovererBase implements ReadyCommand ping = new ReadyCommand(); Answer pingAns = resource.executeRequest(ping); if (pingAns == null || !pingAns.getResult()) { - String errMsg = - "Agent not running, or no route to agent on at " - + uri; + String errMsg = "Agent not running, or no route to agent on at " + uri; s_logger.debug(errMsg); throw new DiscoveryException(errMsg); } - Map> resources = - new HashMap>(); + Map> resources = new HashMap>(); resources.put(resource, details); // TODO: does the resource have to create a connection? return resources; } catch (ConfigurationException e) { - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, - "Unable to add " + uri.getHost(), - "Error is " + e.getMessage()); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, "Unable to add " + uri.getHost(), "Error is " + e.getMessage()); s_logger.warn("Unable to instantiate " + uri.getHost(), e); } catch (UnknownHostException e) { - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, - "Unable to add " + uri.getHost(), - "Error is " + e.getMessage()); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, "Unable to add " + uri.getHost(), "Error is " + e.getMessage()); s_logger.warn("Unable to instantiate " + uri.getHost(), e); } catch (Exception e) { - String msg = " can't setup agent, due to " + e.toString() + " - " - + e.getMessage(); + String msg = " can't setup agent, due to " + e.toString() + " - " + e.getMessage(); s_logger.warn(msg); } return null; } - private void prepareSecondaryStorageStore(String storageUrl) { String mountPoint = getMountPoint(storageUrl); GlobalLock lock = GlobalLock.getInternLock("prepare.systemvm"); try { - if(lock.lock(3600)) { + if (lock.lock(3600)) { try { File patchFolder = new File(mountPoint + "/systemvm"); - if(!patchFolder.exists()) { - if(!patchFolder.mkdirs()) { + if (!patchFolder.exists()) { + if (!patchFolder.mkdirs()) { String msg = "Unable to create systemvm folder on secondary storage. location: " + patchFolder.toString(); s_logger.error(msg); throw new CloudRuntimeException(msg); @@ -403,12 +369,12 @@ public class HypervServerDiscoverer extends DiscovererBase implements File srcIso = getSystemVMPatchIsoFile(); File destIso = new File(mountPoint + "/systemvm/" + getSystemVMIsoFileNameOnDatastore()); - if(!destIso.exists()) { - s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + - srcIso.getAbsolutePath() + ", destination: " + destIso.getAbsolutePath()); + if (!destIso.exists()) { + s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() + ", destination: " + + destIso.getAbsolutePath()); try { FileUtil.copyfile(srcIso, destIso); - } catch(IOException e) { + } catch (IOException e) { s_logger.error("Unexpected exception ", e); String msg = "Unable to copy systemvm ISO on secondary storage. src location: " + srcIso.toString() + ", dest location: " + destIso; @@ -416,7 +382,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements throw new CloudRuntimeException(msg); } } else { - if(s_logger.isTraceEnabled()) { + if (s_logger.isTraceEnabled()) { s_logger.trace("SystemVM ISO file " + destIso.getPath() + " already exists"); } } @@ -431,9 +397,9 @@ public class HypervServerDiscoverer extends DiscovererBase implements private String getMountPoint(String storageUrl) { String mountPoint = null; - synchronized(_storageMounts) { + synchronized (_storageMounts) { mountPoint = _storageMounts.get(storageUrl); - if(mountPoint != null) { + if (mountPoint != null) { return mountPoint; } @@ -445,9 +411,8 @@ public class HypervServerDiscoverer extends DiscovererBase implements throw new CloudRuntimeException("Unable to create mount point due to invalid storage URL format " + storageUrl); } - mountPoint = mount(File.separator + File.separator + uri.getHost() + uri.getPath(), _mountParent, - uri.getScheme(), uri.getQuery()); - if(mountPoint == null) { + mountPoint = mount(File.separator + File.separator + uri.getHost() + uri.getPath(), _mountParent, uri.getScheme(), uri.getQuery()); + if (mountPoint == null) { s_logger.error("Unable to create mount point for " + storageUrl); return "/mnt/sec"; } @@ -530,12 +495,12 @@ public class HypervServerDiscoverer extends DiscovererBase implements isoFile = new File(url.getPath()); } - if(isoFile == null || !isoFile.exists()) { + if (isoFile == null || !isoFile.exists()) { isoFile = new File("/usr/share/cloudstack-common/vms/systemvm.iso"); } - assert(isoFile != null); - if(!isoFile.exists()) { + assert (isoFile != null); + if (!isoFile.exists()) { s_logger.error("Unable to locate systemvm.iso in your setup at " + isoFile.toString()); } return isoFile; @@ -580,7 +545,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements public final boolean configure(final String name, final Map params) throws ConfigurationException { super.configure(name, params); - _mountParent = (String) params.get(Config.MountParent.key()); + _mountParent = (String)params.get(Config.MountParent.key()); if (_mountParent == null) { _mountParent = File.separator + "mnt"; } @@ -600,16 +565,14 @@ public class HypervServerDiscoverer extends DiscovererBase implements // TODO: allow timeout on we HTTPRequests to be configured _agentMgr.registerForHostEvents(this, true, false, true); - _resourceMgr.registerResourceStateAdapter(this.getClass() - .getSimpleName(), this); + _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this); return true; } // end of Adapter @Override - public void postDiscovery(final List hosts, final long msId) - throws DiscoveryException { + public void postDiscovery(final List hosts, final long msId) throws DiscoveryException { } @Override @@ -623,56 +586,46 @@ public class HypervServerDiscoverer extends DiscovererBase implements if (hypervisor == null) { return true; } - return Hypervisor.HypervisorType.Hyperv.toString().equalsIgnoreCase( - hypervisor); + return Hypervisor.HypervisorType.Hyperv.toString().equalsIgnoreCase(hypervisor); } // end of Discoverer // ResourceStateAdapter @Override - public final HostVO createHostVOForConnectedAgent(final HostVO host, - final StartupCommand[] cmd) { + public final HostVO createHostVOForConnectedAgent(final HostVO host, final StartupCommand[] cmd) { return null; } // TODO: add test for method @Override - public final HostVO createHostVOForDirectConnectAgent(final HostVO host, - final StartupCommand[] startup, final ServerResource resource, - final Map details, final List hostTags) { + public final HostVO createHostVOForDirectConnectAgent(final HostVO host, final StartupCommand[] startup, final ServerResource resource, + final Map details, final List hostTags) { StartupCommand firstCmd = startup[0]; if (!(firstCmd instanceof StartupRoutingCommand)) { return null; } - StartupRoutingCommand ssCmd = ((StartupRoutingCommand) firstCmd); + StartupRoutingCommand ssCmd = ((StartupRoutingCommand)firstCmd); if (ssCmd.getHypervisorType() != HypervisorType.Hyperv) { return null; } - s_logger.info("Host: " + host.getName() - + " connected with hypervisor type: " + HypervisorType.Hyperv - + ". Checking CIDR..."); + s_logger.info("Host: " + host.getName() + " connected with hypervisor type: " + HypervisorType.Hyperv + ". Checking CIDR..."); HostPodVO pod = _podDao.findById(host.getPodId()); DataCenterVO dc = _dcDao.findById(host.getDataCenterId()); - _resourceMgr.checkCIDR(pod, dc, ssCmd.getPrivateIpAddress(), - ssCmd.getPrivateNetmask()); + _resourceMgr.checkCIDR(pod, dc, ssCmd.getPrivateIpAddress(), ssCmd.getPrivateNetmask()); - return _resourceMgr.fillRoutingHostVO(host, ssCmd, - HypervisorType.Hyperv, details, hostTags); + return _resourceMgr.fillRoutingHostVO(host, ssCmd, HypervisorType.Hyperv, details, hostTags); } // TODO: add test for method @Override - public final DeleteHostAnswer deleteHost(final HostVO host, - final boolean isForced, final boolean isForceDeleteStorage) - throws UnableDeleteHostException { + public final DeleteHostAnswer deleteHost(final HostVO host, final boolean isForced, final boolean isForceDeleteStorage) throws UnableDeleteHostException { // assert - if (host.getType() != Host.Type.Routing - || host.getHypervisorType() != HypervisorType.Hyperv) { + if (host.getType() != Host.Type.Routing || host.getHypervisorType() != HypervisorType.Hyperv) { return null; } _resourceMgr.deleteRoutingHost(host, isForced, isForceDeleteStorage); @@ -681,8 +634,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements @Override public final boolean stop() { - _resourceMgr.unregisterResourceStateAdapter(this.getClass() - .getSimpleName()); + _resourceMgr.unregisterResourceStateAdapter(this.getClass().getSimpleName()); return super.stop(); } // end of ResourceStateAdapter diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java index 8b79cae3f7d..5845038bbff 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java @@ -20,12 +20,11 @@ import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; -import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.GuestOSVO; import com.cloud.storage.dao.GuestOSDao; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** @@ -41,6 +40,7 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru { public final HypervisorType getHypervisorType() { return HypervisorType.Hyperv; } + /** * Prevent direct creation. */ @@ -49,13 +49,11 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru { } @Override - public final VirtualMachineTO implement( - VirtualMachineProfile vm) { + public final VirtualMachineTO implement(VirtualMachineProfile vm) { VirtualMachineTO to = toVirtualMachineTO(vm); // Determine the VM's OS description - GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine() - .getGuestOSId()); + GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); return to; diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java index 2594a1a1ecd..e6a5f62a33a 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java @@ -42,6 +42,7 @@ import org.apache.http.util.EntityUtils; import org.apache.log4j.Logger; import com.google.gson.Gson; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckRouterAnswer; import com.cloud.agent.api.CheckRouterCommand; @@ -112,8 +113,7 @@ import com.cloud.vm.VirtualMachineName; @Local(value = ServerResource.class) public class HypervDirectConnectResource extends ServerResourceBase implements ServerResource { public static final int DEFAULT_AGENT_PORT = 8250; - private static final Logger s_logger = Logger - .getLogger(HypervDirectConnectResource.class.getName()); + private static final Logger s_logger = Logger.getLogger(HypervDirectConnectResource.class.getName()); private static final Gson s_gson = GsonHelper.getGson(); private String _zoneId; @@ -146,20 +146,14 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S public final StartupCommand[] initialize() { // assert if (!_configureCalled) { - String errMsg = - this.getClass().getName() - + " requires configure() be called before" - + " initialize()"; + String errMsg = this.getClass().getName() + " requires configure() be called before" + " initialize()"; s_logger.error(errMsg); } // Create default StartupRoutingCommand, then customise StartupRoutingCommand defaultStartRoutCmd = - new StartupRoutingCommand(0, 0, 0, 0, null, - Hypervisor.HypervisorType.Hyperv, - RouterPrivateIpStrategy.HostLocal, - new HashMap(), - new HashMap()); + new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal, new HashMap(), + new HashMap()); // Identity within the data centre is decided by CloudStack kernel, // and passed via ServerResource.configure() @@ -172,8 +166,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S defaultStartRoutCmd.setStorageIpAddress(_agentIp); defaultStartRoutCmd.setPool(_clusterGuid); - s_logger.debug("Generated StartupRoutingCommand for _agentIp \"" - + _agentIp + "\""); + s_logger.debug("Generated StartupRoutingCommand for _agentIp \"" + _agentIp + "\""); // TODO: does version need to be hard coded. defaultStartRoutCmd.setVersion("4.2.0"); @@ -182,79 +175,55 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S // comes from the host itself. CloudStack sanity checks network // configuration // and uses capacity info for resource allocation. - Command[] startCmds = - requestStartupCommand(new Command[] {defaultStartRoutCmd}); + Command[] startCmds = requestStartupCommand(new Command[] {defaultStartRoutCmd}); // TODO: may throw, is this okay? - StartupRoutingCommand startCmd = (StartupRoutingCommand) startCmds[0]; + StartupRoutingCommand startCmd = (StartupRoutingCommand)startCmds[0]; // Assert that host identity is consistent with existing values. if (startCmd == null) { - String errMsg = - String.format("Host %s (IP %s)" - + "did not return a StartupRoutingCommand", - _name, _agentIp); + String errMsg = String.format("Host %s (IP %s)" + "did not return a StartupRoutingCommand", _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } - if (!startCmd.getDataCenter().equals( - defaultStartRoutCmd.getDataCenter())) { + if (!startCmd.getDataCenter().equals(defaultStartRoutCmd.getDataCenter())) { String errMsg = - String.format( - "Host %s (IP %s) changed zone/data center. Was " - + defaultStartRoutCmd.getDataCenter() - + " NOW its " + startCmd.getDataCenter(), - _name, _agentIp); + String.format("Host %s (IP %s) changed zone/data center. Was " + defaultStartRoutCmd.getDataCenter() + " NOW its " + startCmd.getDataCenter(), _name, + _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } if (!startCmd.getPod().equals(defaultStartRoutCmd.getPod())) { - String errMsg = - String.format("Host %s (IP %s) changed pod. Was " - + defaultStartRoutCmd.getPod() + " NOW its " - + startCmd.getPod(), _name, _agentIp); + String errMsg = String.format("Host %s (IP %s) changed pod. Was " + defaultStartRoutCmd.getPod() + " NOW its " + startCmd.getPod(), _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } if (!startCmd.getCluster().equals(defaultStartRoutCmd.getCluster())) { String errMsg = - String.format("Host %s (IP %s) changed cluster. Was " - + defaultStartRoutCmd.getCluster() + " NOW its " - + startCmd.getCluster(), _name, _agentIp); + String.format("Host %s (IP %s) changed cluster. Was " + defaultStartRoutCmd.getCluster() + " NOW its " + startCmd.getCluster(), _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } if (!startCmd.getGuid().equals(defaultStartRoutCmd.getGuid())) { - String errMsg = - String.format("Host %s (IP %s) changed guid. Was " - + defaultStartRoutCmd.getGuid() + " NOW its " - + startCmd.getGuid(), _name, _agentIp); + String errMsg = String.format("Host %s (IP %s) changed guid. Was " + defaultStartRoutCmd.getGuid() + " NOW its " + startCmd.getGuid(), _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } - if (!startCmd.getPrivateIpAddress().equals( - defaultStartRoutCmd.getPrivateIpAddress())) { + if (!startCmd.getPrivateIpAddress().equals(defaultStartRoutCmd.getPrivateIpAddress())) { String errMsg = - String.format("Host %s (IP %s) IP address. Was " - + defaultStartRoutCmd.getPrivateIpAddress() - + " NOW its " + startCmd.getPrivateIpAddress(), - _name, _agentIp); + String.format("Host %s (IP %s) IP address. Was " + defaultStartRoutCmd.getPrivateIpAddress() + " NOW its " + startCmd.getPrivateIpAddress(), _name, + _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } if (!startCmd.getName().equals(defaultStartRoutCmd.getName())) { - String errMsg = - String.format( - "Host %s (IP %s) name. Was " + startCmd.getName() - + " NOW its " - + defaultStartRoutCmd.getName(), _name, - _agentIp); + String errMsg = String.format("Host %s (IP %s) name. Was " + startCmd.getName() + " NOW its " + defaultStartRoutCmd.getName(), _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; @@ -270,24 +239,18 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S // type. StartupStorageCommand storePoolCmd = null; if (startCmds.length > 1) { - storePoolCmd = (StartupStorageCommand) startCmds[1]; + storePoolCmd = (StartupStorageCommand)startCmds[1]; // TODO: is this assertion required? if (storePoolCmd == null) { - String frmtStr = - "Host %s (IP %s) sent incorrect Command, " - + "second parameter should be a " - + "StartupStorageCommand"; + String frmtStr = "Host %s (IP %s) sent incorrect Command, " + "second parameter should be a " + "StartupStorageCommand"; String errMsg = String.format(frmtStr, _name, _agentIp); s_logger.error(errMsg); // TODO: valid to return null, or should we throw? return null; } - s_logger.info("Host " + _name + " (IP " + _agentIp - + ") already configured with a storeage pool, details " - + s_gson.toJson(startCmds[1])); + s_logger.info("Host " + _name + " (IP " + _agentIp + ") already configured with a storeage pool, details " + s_gson.toJson(startCmds[1])); } else { - s_logger.info("Host " + _name + " (IP " + _agentIp - + ") already configured with a storeage pool, details "); + s_logger.info("Host " + _name + " (IP " + _agentIp + ") already configured with a storeage pool, details "); } return new StartupCommand[] {startCmd, storePoolCmd}; } @@ -304,8 +267,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S Answer pingAns = executeRequest(pingCmd); if (pingAns == null || !pingAns.getResult()) { - s_logger.info("Cannot ping host " + _name + " (IP " + _agentIp - + "), pingAns (blank means null) is:" + pingAns); + s_logger.info("Cannot ping host " + _name + " (IP " + _agentIp + "), pingAns (blank means null) is:" + pingAns); return null; } return pingCmd; @@ -321,9 +283,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S URI agentUri = null; try { String cmdName = StartupCommand.class.getName(); - agentUri = - new URI("http", null, _agentIp, _port, - "/api/HypervResource/" + cmdName, null, null); + agentUri = new URI("http", null, _agentIp, _port, "/api/HypervResource/" + cmdName, null, null); } catch (URISyntaxException e) { // TODO add proper logging String errMsg = "Could not generate URI for Hyper-V agent"; @@ -342,8 +302,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S String errMsg = "Failed to deserialize Command[] " + incomingCmd; s_logger.error(errMsg, ex); } - s_logger.debug("requestStartupCommand received response " - + s_gson.toJson(result)); + s_logger.debug("requestStartupCommand received response " + s_gson.toJson(result)); if (result.length > 0) { return result; } @@ -361,9 +320,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S Answer answer = null; try { String cmdName = cmd.getClass().getName(); - agentUri = - new URI("http", null, _agentIp, _port, - "/api/HypervResource/" + cmdName, null, null); + agentUri = new URI("http", null, _agentIp, _port, "/api/HypervResource/" + cmdName, null, null); } catch (URISyntaxException e) { // TODO add proper logging String errMsg = "Could not generate URI for Hyper-V agent"; @@ -372,47 +329,46 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S } if (clazz == CheckSshCommand.class) { - answer = execute((CheckSshCommand) cmd); + answer = execute((CheckSshCommand)cmd); } else if (clazz == GetDomRVersionCmd.class) { answer = execute((GetDomRVersionCmd)cmd); } else if (cmd instanceof NetworkUsageCommand) { - answer = execute((NetworkUsageCommand) cmd); + answer = execute((NetworkUsageCommand)cmd); } else if (clazz == IpAssocCommand.class) { - answer = execute((IpAssocCommand) cmd); + answer = execute((IpAssocCommand)cmd); } else if (clazz == DnsMasqConfigCommand.class) { - return execute((DnsMasqConfigCommand) cmd); + return execute((DnsMasqConfigCommand)cmd); } else if (clazz == CreateIpAliasCommand.class) { - return execute((CreateIpAliasCommand) cmd); + return execute((CreateIpAliasCommand)cmd); } else if (clazz == DhcpEntryCommand.class) { - answer = execute((DhcpEntryCommand) cmd); + answer = execute((DhcpEntryCommand)cmd); } else if (clazz == VmDataCommand.class) { - answer = execute((VmDataCommand) cmd); + answer = execute((VmDataCommand)cmd); } else if (clazz == SavePasswordCommand.class) { - answer = execute((SavePasswordCommand) cmd); + answer = execute((SavePasswordCommand)cmd); } else if (clazz == SetFirewallRulesCommand.class) { answer = execute((SetFirewallRulesCommand)cmd); } else if (clazz == LoadBalancerConfigCommand.class) { - answer = execute((LoadBalancerConfigCommand) cmd); + answer = execute((LoadBalancerConfigCommand)cmd); } else if (clazz == DeleteIpAliasCommand.class) { - return execute((DeleteIpAliasCommand) cmd); + return execute((DeleteIpAliasCommand)cmd); } else if (clazz == PingTestCommand.class) { - answer = execute((PingTestCommand) cmd); + answer = execute((PingTestCommand)cmd); } else if (clazz == SetStaticNatRulesCommand.class) { - answer = execute((SetStaticNatRulesCommand) cmd); - } else if (clazz == CheckRouterCommand.class) { - answer = execute((CheckRouterCommand) cmd); + answer = execute((SetStaticNatRulesCommand)cmd); + } else if (clazz == CheckRouterCommand.class) { + answer = execute((CheckRouterCommand)cmd); } else if (clazz == SetPortForwardingRulesCommand.class) { - answer = execute((SetPortForwardingRulesCommand) cmd); + answer = execute((SetPortForwardingRulesCommand)cmd); } else if (clazz == SetSourceNatCommand.class) { - answer = execute((SetSourceNatCommand) cmd); + answer = execute((SetSourceNatCommand)cmd); } else if (clazz == Site2SiteVpnCfgCommand.class) { - answer = execute((Site2SiteVpnCfgCommand) cmd); + answer = execute((Site2SiteVpnCfgCommand)cmd); } else if (clazz == CheckS2SVpnConnectionsCommand.class) { - answer = execute((CheckS2SVpnConnectionsCommand) cmd); + answer = execute((CheckS2SVpnConnectionsCommand)cmd); } else if (clazz == SetStaticRouteCommand.class) { - answer = execute((SetStaticRouteCommand) cmd); - } - else { + answer = execute((SetStaticRouteCommand)cmd); + } else { // Else send the cmd to hyperv agent. String ansStr = postHttpRequest(s_gson.toJson(cmd), agentUri); if (ansStr == null) { @@ -421,8 +377,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S // Only Answer instances are returned by remote agents. // E.g. see Response.getAnswers() Answer[] result = s_gson.fromJson(ansStr, Answer[].class); - s_logger.debug("executeRequest received response " - + s_gson.toJson(result)); + s_logger.debug("executeRequest received response " + s_gson.toJson(result)); if (result.length > 0) { return result[0]; } @@ -453,8 +408,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S // Send over the command for execution, via ssh, to the VR. try { - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/opt/cloud/bin/vpc_staticroute.sh " + args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_staticroute.sh " + args); if (s_logger.isDebugEnabled()) s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/vpc_staticroute.sh " + args); @@ -493,8 +448,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, cmdline.toString()); if (!result.first()) { - s_logger.error("check site-to-site vpn connections command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " - + result.second()); + s_logger.error("check site-to-site vpn connections command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " + + result.second()); return new CheckS2SVpnConnectionsAnswer(cmd, false, result.second()); } @@ -558,8 +513,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S Pair result; try { - result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/opt/cloud/bin/ipsectunnel.sh " + args); + result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/ipsectunnel.sh " + args); if (!result.first()) { s_logger.error("Setup site2site VPN " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " + result.second()); @@ -596,8 +550,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S args += " -c "; args += "eth" + ethDeviceNum; - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/opt/cloud/bin/vpc_snat.sh " + args); + Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_snat.sh " + args); if (!result.first()) { String msg = "SetupGuestNetworkCommand on domain router " + routerIp + " failed. message: " + result.second(); @@ -635,8 +588,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S s_logger.info("findRouterEthDeviceIndex. mac: " + mac); // TODO : this is a temporary very inefficient solution, will refactor it later - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "ls /proc/sys/net/ipv4/conf"); + Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "ls /proc/sys/net/ipv4/conf"); // when we dynamically plug in a new NIC into virtual router, it may take time to show up in guest OS // we use a waiting loop here as a workaround to synchronize activities in systems @@ -651,8 +603,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S if (s_logger.isDebugEnabled()) s_logger.debug("Run domr script " + cmd); Pair result2 = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - // TODO need to find the dev index inside router based on IP address - cmd); + // TODO need to find the dev index inside router based on IP address + cmd); if (s_logger.isDebugEnabled()) s_logger.debug("result: " + result2.first() + ", output: " + result2.second()); @@ -665,7 +617,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S s_logger.warn("can not find intereface associated with mac: " + mac + ", guest OS may still at loading state, retry..."); try { - Thread.currentThread().sleep(1000); + Thread.currentThread(); + Thread.sleep(1000); } catch (InterruptedException e) { } } @@ -725,8 +678,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { String controlIp = getRouterSshControlIp(cmd); - result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/opt/cloud/bin/checkrouter.sh "); + result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/checkrouter.sh "); if (!result.first()) { s_logger.error("check router command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " + result.second()); @@ -807,8 +759,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S if (result.first()) return new Answer(cmd); } catch (Exception e) { - s_logger.error("Unable to execute ping command on DomR (" + controlIp + "), domR may not be ready yet. failure due to " - + e.getMessage()); + s_logger.error("Unable to execute ping command on DomR (" + controlIp + "), domR may not be ready yet. failure due to " + e.getMessage()); } return new Answer(cmd, false, "PingTestCommand failed"); } @@ -844,8 +795,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { String controlIp = getRouterSshControlIp(cmd); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/root/deleteIpAlias.sh " + args); + Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/deleteIpAlias.sh " + args); if (!result.first()) { s_logger.error("deleteIpAlias command on domr " + controlIp + " failed, message: " + result.second()); @@ -891,7 +841,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S } try { - SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", keyFile, null, "/tmp/", tmpCfgFileContents.toString().getBytes(), routerIp.replace('.', '_') + ".cfg", null); + SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", keyFile, null, "/tmp/", tmpCfgFileContents.toString().getBytes(), routerIp.replace('.', '_') + + ".cfg", null); try { String[] addRules = rules[LoadBalancerConfigurator.ADD]; @@ -929,8 +880,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S args += " -s " + sb.toString(); } - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "scp " + tmpCfgFilePath - + " /etc/haproxy/haproxy.cfg.new"); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "scp " + tmpCfgFilePath + " /etc/haproxy/haproxy.cfg.new"); if (!result.first()) { s_logger.error("Unable to copy haproxy configuration file"); @@ -967,8 +918,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S protected Answer execute(SavePasswordCommand cmd) { if (s_logger.isInfoEnabled()) { - s_logger.info("Executing resource SavePasswordCommand. vmName: " + cmd.getVmName() + ", vmIp: " + cmd.getVmIpAddress() + ", password: " - + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); + s_logger.info("Executing resource SavePasswordCommand. vmName: " + cmd.getVmName() + ", vmIp: " + cmd.getVmIpAddress() + ", password: " + + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); } String controlIp = getRouterSshControlIp(cmd); @@ -979,7 +930,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S String args = " -v " + vmIpAddress; if (s_logger.isDebugEnabled()) { - s_logger.debug("Run command on domain router " + controlIp + ", /root/savepassword.sh " + args + " -p " + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); + s_logger.debug("Run command on domain router " + controlIp + ", /root/savepassword.sh " + args + " -p " + + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); } args += " -p " + password; @@ -1016,14 +968,14 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S String[][] rules = cmd.generateFwRules(); String args = ""; args += " -F "; - if (trafficType == FirewallRule.TrafficType.Egress){ - args+= " -E "; + if (trafficType == FirewallRule.TrafficType.Egress) { + args += " -E "; if (egressDefault.equals("true")) { - args+= " -P 1 "; + args += " -P 1 "; } else if (egressDefault.equals("System")) { - args+= " -P 2 "; + args += " -P 2 "; } else { - args+= " -P 0 "; + args += " -P 0 "; } } @@ -1039,43 +991,33 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { Pair result = null; - if (trafficType == FirewallRule.TrafficType.Egress){ - result = SshHelper.sshExecute(controlIp, - DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), - null, "/root/firewallRule_egress.sh " + args); + if (trafficType == FirewallRule.TrafficType.Egress) { + result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/firewallRule_egress.sh " + args); } else { - result = SshHelper.sshExecute(controlIp, - DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), - null, "/root/firewall_rule.sh " + args); + result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/firewall_rule.sh " + args); } if (s_logger.isDebugEnabled()) { - if (trafficType == FirewallRule.TrafficType.Egress){ - s_logger.debug("Executing script on domain router " + controlIp - + ": /root/firewallRule_egress.sh " + args); + if (trafficType == FirewallRule.TrafficType.Egress) { + s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewallRule_egress.sh " + args); } else { - s_logger.debug("Executing script on domain router " + controlIp - + ": /root/firewall_rule.sh " + args); + s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewall_rule.sh " + args); } } - if (!result.first()) { - s_logger.error("SetFirewallRulesCommand failure on setting one rule. args: " - + args); + s_logger.error("SetFirewallRulesCommand failure on setting one rule. args: " + args); //FIXME - in the future we have to process each rule separately; now we temporarily set every rule to be false if single rule fails - for (int i=0; i < results.length; i++) { + for (int i = 0; i < results.length; i++) { results[i] = "Failed"; } return new SetFirewallRulesAnswer(cmd, false, results); } } catch (Throwable e) { - s_logger.error("SetFirewallRulesCommand(args: " + args - + ") failed on setting one rule due to " - ,e); + s_logger.error("SetFirewallRulesCommand(args: " + args + ") failed on setting one rule due to ", e); //FIXME - in the future we have to process each rule separately; now we temporarily set every rule to be false if single rule fails - for (int i=0; i < results.length; i++) { + for (int i = 0; i < results.length; i++) { results[i] = "Failed"; } return new SetFirewallRulesAnswer(cmd, false, results); @@ -1084,7 +1026,6 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return new SetFirewallRulesAnswer(cmd, true, results); } - protected Answer execute(VmDataCommand cmd) { if (s_logger.isInfoEnabled()) { s_logger.info("Executing resource VmDataCommand: " + s_gson.toJson(cmd)); @@ -1122,8 +1063,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/tmp", content.getBytes(), tmpFileName, null); try { - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/root/userdata.py " + tmpFileName); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/userdata.py " + tmpFileName); if (!result.first()) { s_logger.error("vm_data command on domain router " + controlIp + " failed. messge: " + result.second()); @@ -1157,7 +1098,6 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return sb.toString(); } - protected Answer execute(DhcpEntryCommand cmd) { if (s_logger.isInfoEnabled()) { s_logger.info("Executing resource DhcpEntryCommand: " + s_gson.toJson(cmd)); @@ -1198,8 +1138,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { String controlIp = getRouterSshControlIp(cmd); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/root/edithosts.sh " + args); + Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/edithosts.sh " + args); if (!result.first()) { s_logger.error("dhcp_entry command on domR " + controlIp + " failed, message: " + result.second()); @@ -1241,8 +1180,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S try { String controlIp = getRouterSshControlIp(cmd); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/root/createIpAlias.sh " + args); + Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/root/createIpAlias.sh " + args); if (!result.first()) { s_logger.error("CreateIpAlias command on domr " + controlIp + " failed, message: " + result.second()); @@ -1270,11 +1208,11 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); String controlIp = getRouterSshControlIp(cmd); - assert(controlIp != null); + assert (controlIp != null); List dhcpTos = cmd.getIps(); StringBuilder args = new StringBuilder(); - for(DhcpTO dhcpTo : dhcpTos) { + for (DhcpTO dhcpTo : dhcpTos) { args.append(dhcpTo.getRouterIp()); args.append(":"); args.append(dhcpTo.getGateway()); @@ -1299,7 +1237,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S if (s_logger.isDebugEnabled()) { s_logger.debug("dnsmasq config command on domain router " + routerIp + " completed"); } - }catch (Throwable e) { + } catch (Throwable e) { String msg = "Dnsmasqconfig command failed due to " + e.getMessage(); s_logger.error(msg, e); return new Answer(cmd, false, msg); @@ -1322,7 +1260,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME); String controlIp = getRouterSshControlIp(cmd); for (IpAddressTO ip : ips) { - assignPublicIpAddress(routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), ip.getVlanNetmask(),ip.getVifMacAddress()); + assignPublicIpAddress(routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), + ip.getVlanNetmask(), ip.getVifMacAddress()); results[i++] = ip.getPublicIp() + " - success"; } @@ -1341,7 +1280,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S } protected void assignPublicIpAddress(final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP, - final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception { + final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception { boolean addVif = false; if (add) { @@ -1371,7 +1310,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S args += publicIpAddress + "/" + cidrSize; args += " -c "; - args += "eth" +"2"; // currently hardcoding to eth 2 (which is default public ipd)//publicNicInfo.first(); + args += "eth" + "2"; // currently hardcoding to eth 2 (which is default public ipd)//publicNicInfo.first(); args += " -g "; args += vlanGateway; @@ -1384,7 +1323,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S s_logger.debug("Run command on domain router " + privateIpAddress + ", /opt/cloud/bin/ipassoc.sh " + args); } - Pair result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args); + Pair result = + SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args); if (!result.first()) { s_logger.error("ipassoc command on domain router " + privateIpAddress + " failed. message: " + result.second()); @@ -1405,8 +1345,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S Pair result; try { String controlIp = getRouterSshControlIp(cmd); - result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, - "/opt/cloud/bin/get_template_version.sh "); + result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/get_template_version.sh "); if (!result.first()) { s_logger.error("GetDomRVersionCmd on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " + result.second()); @@ -1429,32 +1368,31 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return new GetDomRVersionAnswer(cmd, result.second(), lines[0], lines[1]); } - private static String getRouterSshControlIp(NetworkElementCommand cmd) { String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); String routerGuestIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP); String zoneNetworkType = cmd.getAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE); - if(routerGuestIp != null && zoneNetworkType != null && NetworkType.valueOf(zoneNetworkType) == NetworkType.Basic) { - if(s_logger.isDebugEnabled()) + if (routerGuestIp != null && zoneNetworkType != null && NetworkType.valueOf(zoneNetworkType) == NetworkType.Basic) { + if (s_logger.isDebugEnabled()) s_logger.debug("In Basic zone mode, use router's guest IP for SSH control. guest IP : " + routerGuestIp); return routerGuestIp; } - if(s_logger.isDebugEnabled()) + if (s_logger.isDebugEnabled()) s_logger.debug("Use router's private IP for SSH control. IP : " + routerIp); return routerIp; } protected Answer execute(NetworkUsageCommand cmd) { - if ( cmd.isForVpc() ) { + if (cmd.isForVpc()) { //return VPCNetworkUsage(cmd); } if (s_logger.isInfoEnabled()) { - s_logger.info("Executing resource NetworkUsageCommand "+ s_gson.toJson(cmd)); + s_logger.info("Executing resource NetworkUsageCommand " + s_gson.toJson(cmd)); } - if(cmd.getOption()!=null && cmd.getOption().equals("create") ){ + if (cmd.getOption() != null && cmd.getOption().equals("create")) { networkUsage(cmd.getPrivateIP(), "create", null); NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, "true", 0L, 0L); return answer; @@ -1464,6 +1402,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, "", stats[0], stats[1]); return answer; } + private long[] getNetworkStats(String privateIP) { String result = networkUsage(privateIP, "get", null); long[] stats = new long[2]; @@ -1482,7 +1421,6 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return stats; } - protected CheckSshAnswer execute(CheckSshCommand cmd) { String vmName = cmd.getName(); String privateIp = cmd.getIp(); @@ -1517,7 +1455,6 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return new CheckSshAnswer(cmd); } - protected String networkUsage(final String privateIpAddress, final String option, final String ethName) { String args = null; if (option.equals("get")) { @@ -1539,7 +1476,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S s_logger.trace("Executing /opt/cloud/bin/netusage.sh " + args + " on DomR " + privateIpAddress); } - Pair result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + args); + Pair result = + SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + args); if (!result.first()) { return null; @@ -1547,8 +1485,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S return result.second(); } catch (Throwable e) { - s_logger.error("Unable to execute NetworkUsage command on DomR (" + privateIpAddress + "), domR may not be ready yet. failure due to " - + e); + s_logger.error("Unable to execute NetworkUsage command on DomR (" + privateIpAddress + "), domR may not be ready yet. failure due to " + e); } return null; @@ -1557,29 +1494,26 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S public File getSystemVMKeyFile() { URL url = this.getClass().getClassLoader().getResource("scripts/vm/systemvm/id_rsa.cloud"); File keyFile = null; - if ( url != null ){ + if (url != null) { keyFile = new File(url.getPath()); } if (keyFile == null || !keyFile.exists()) { keyFile = new File("/usr/share/cloudstack-common/scripts/vm/systemvm/id_rsa.cloud"); } - assert(keyFile != null); - if(!keyFile.exists()) { + assert (keyFile != null); + if (!keyFile.exists()) { s_logger.error("Unable to locate id_rsa.cloud in your setup at " + keyFile.toString()); } return keyFile; } - - public static String postHttpRequest(final String jsonCmd, - final URI agentUri) { + public static String postHttpRequest(final String jsonCmd, final URI agentUri) { // Using Apache's HttpClient for HTTP POST // Java-only approach discussed at on StackOverflow concludes with // comment to use Apache HttpClient // http://stackoverflow.com/a/2793153/939250, but final comment is to // use Apache. - s_logger.debug("POST request to" + agentUri.toString() - + " with contents" + jsonCmd); + s_logger.debug("POST request to" + agentUri.toString() + " with contents" + jsonCmd); // Create request HttpClient httpClient = new DefaultHttpClient(); @@ -1595,31 +1529,19 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S StringEntity cmdJson = new StringEntity(jsonCmd); request.addHeader("content-type", "application/json"); request.setEntity(cmdJson); - s_logger.debug("Sending cmd to " + agentUri.toString() - + " cmd data:" + jsonCmd); + s_logger.debug("Sending cmd to " + agentUri.toString() + " cmd data:" + jsonCmd); HttpResponse response = httpClient.execute(request); // Unsupported commands will not route. - if (response.getStatusLine().getStatusCode() - == HttpStatus.SC_NOT_FOUND) { - String errMsg = - "Failed to send : HTTP error code : " - + response.getStatusLine().getStatusCode(); + if (response.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_FOUND) { + String errMsg = "Failed to send : HTTP error code : " + response.getStatusLine().getStatusCode(); s_logger.error(errMsg); - String unsupportMsg = - "Unsupported command " - + agentUri.getPath() - + ". Are you sure you got the right type of" - + " server?"; + String unsupportMsg = "Unsupported command " + agentUri.getPath() + ". Are you sure you got the right type of" + " server?"; Answer ans = new UnsupportedAnswer(null, unsupportMsg); s_logger.error(ans); result = s_gson.toJson(new Answer[] {ans}); - } else if (response.getStatusLine().getStatusCode() - != HttpStatus.SC_OK) { - String errMsg = - "Failed send to " + agentUri.toString() - + " : HTTP error code : " - + response.getStatusLine().getStatusCode(); + } else if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { + String errMsg = "Failed send to " + agentUri.toString() + " : HTTP error code : " + response.getStatusLine().getStatusCode(); s_logger.error(errMsg); return null; } else { @@ -1653,20 +1575,19 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S // the custom keys go by the variable name 'details'. // Thus, in find(), you see that 'details' are added to the params Map. @Override - public final boolean configure(final String name, - final Map params) throws ConfigurationException { + public final boolean configure(final String name, final Map params) throws ConfigurationException { /* todo: update, make consistent with the xen server equivalent. */ - _guid = (String) params.get("guid"); - _zoneId = (String) params.get("zone"); - _podId = (String) params.get("pod"); - _clusterId = (String) params.get("cluster"); - _agentIp = (String) params.get("ipaddress"); // was agentIp + _guid = (String)params.get("guid"); + _zoneId = (String)params.get("zone"); + _podId = (String)params.get("pod"); + _clusterId = (String)params.get("cluster"); + _agentIp = (String)params.get("ipaddress"); // was agentIp _name = name; - _clusterGuid = (String) params.get("cluster.guid"); - _username = (String) params.get("url"); - _password = (String) params.get("password"); - _username = (String) params.get("username"); + _clusterGuid = (String)params.get("cluster.guid"); + _username = (String)params.get("url"); + _password = (String)params.get("password"); + _username = (String)params.get("username"); _configureCalled = true; return true; diff --git a/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java b/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java index 0d772cd0eb8..d4f1c9fd551 100644 --- a/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java +++ b/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java @@ -88,38 +88,27 @@ import com.cloud.utils.exception.CloudRuntimeException; **/ public class HypervDirectConnectResourceTest { - private static final Logger s_logger = Logger - .getLogger(HypervDirectConnectResourceTest.class.getName()); + private static final Logger s_logger = Logger.getLogger(HypervDirectConnectResourceTest.class.getName()); // TODO: make this a config parameter private static final String sampleLegitDiskImageURL = "http://s3-eu-west-1.amazonaws.com/cshv3eu/SmallDisk.vhdx"; private static final Gson s_gson = GsonHelper.getGson(); - private static final HypervDirectConnectResource s_hypervresource = - new HypervDirectConnectResource(); + private static final HypervDirectConnectResource s_hypervresource = new HypervDirectConnectResource(); - private static String s_testLocalStoreUUID = - "5fe2bad3-d785-394e-9949-89786b8a63d2"; - private static String s_testLocalStorePath = "." + File.separator - + "var" + File.separator + "test" + File.separator + "storagepool"; - private static String s_testSecondaryStoreLocalPath = "." - + File.separator - + "var" + File.separator + "test" + File.separator + "secondary"; + private static String s_testLocalStoreUUID = "5fe2bad3-d785-394e-9949-89786b8a63d2"; + private static String s_testLocalStorePath = "." + File.separator + "var" + File.separator + "test" + File.separator + "storagepool"; + private static String s_testSecondaryStoreLocalPath = "." + File.separator + "var" + File.separator + "test" + File.separator + "secondary"; // TODO: differentiate between NFS and HTTP template URLs. - private static String s_testSampleTemplateUUID = - "TestCopiedLocalTemplate.vhdx"; + private static String s_testSampleTemplateUUID = "TestCopiedLocalTemplate.vhdx"; private static String s_testSampleTemplateURL = s_testSampleTemplateUUID; // test volumes are both a minimal size vhdx. Changing the extension to .vhd // makes on corrupt. - private static String s_testSampleVolumeWorkingUUID = - "TestVolumeLegit.vhdx"; - private static String s_testSampleVolumeWorkingUUIDNoExt = - "TestVolumeLegit"; - private static String s_testSampleVolumeCorruptUUID = - "TestVolumeCorrupt.vhd"; - private static String s_testSampleVolumeTempUUID = - "TestVolumeTemp.vhdx"; + private static String s_testSampleVolumeWorkingUUID = "TestVolumeLegit.vhdx"; + private static String s_testSampleVolumeWorkingUUIDNoExt = "TestVolumeLegit"; + private static String s_testSampleVolumeCorruptUUID = "TestVolumeCorrupt.vhd"; + private static String s_testSampleVolumeTempUUID = "TestVolumeTemp.vhdx"; private static String s_testSampleVolumeWorkingURIJSON; private static String s_testSampleVolumeCorruptURIJSON; private static String s_testSampleVolumeTempURIJSON; @@ -139,8 +128,7 @@ public class HypervDirectConnectResourceTest { @Before public final void setUp() throws ConfigurationException { // Obtain script locations from agent.properties - final Map params = - PropertiesUtil.toMap(loadProperties()); + final Map params = PropertiesUtil.toMap(loadProperties()); // Used to create existing StoragePool in preparation for the // ModifyStoragePool params.put("local.storage.uuid", s_testLocalStoreUUID); @@ -150,16 +138,12 @@ public class HypervDirectConnectResourceTest { if (!testSecondarStoreDir.exists()) { testSecondarStoreDir.mkdirs(); } - Assert.assertTrue("Need to be able to create the folder " - + s_testSecondaryStoreLocalPath, - testSecondarStoreDir.exists()); + Assert.assertTrue("Need to be able to create the folder " + s_testSecondaryStoreLocalPath, testSecondarStoreDir.exists()); try { - params.put("local.secondary.storage.path", - testSecondarStoreDir.getCanonicalPath()); + params.put("local.secondary.storage.path", testSecondarStoreDir.getCanonicalPath()); } catch (IOException e1) { // TODO Auto-generated catch block - Assert.fail("No canonical path for " - + testSecondarStoreDir.getAbsolutePath()); + Assert.fail("No canonical path for " + testSecondarStoreDir.getAbsolutePath()); } // Clean up old test files in local storage folder: @@ -167,22 +151,16 @@ public class HypervDirectConnectResourceTest { if (!testPoolDir.exists()) { testPoolDir.mkdirs(); } - Assert.assertTrue( - "To simulate local file system Storage Pool, " - + " you need folder at " - + testPoolDir.getPath(), testPoolDir.exists() - && testPoolDir.isDirectory()); + Assert.assertTrue("To simulate local file system Storage Pool, " + " you need folder at " + testPoolDir.getPath(), + testPoolDir.exists() && testPoolDir.isDirectory()); try { s_testLocalStorePath = testPoolDir.getCanonicalPath(); } catch (IOException e) { - Assert.fail("No canonical path for " - + testPoolDir.getAbsolutePath()); + Assert.fail("No canonical path for " + testPoolDir.getAbsolutePath()); } params.put("local.storage.path", s_testLocalStorePath); - File testVolWorks = - new File(s_testLocalStorePath + File.separator - + s_testSampleVolumeWorkingUUID); + File testVolWorks = new File(s_testLocalStorePath + File.separator + s_testSampleVolumeWorkingUUID); if (!testVolWorks.exists()) { ReadableByteChannel rbc; try { @@ -195,15 +173,11 @@ public class HypervDirectConnectResourceTest { e.printStackTrace(); } } - Assert.assertTrue( - "Need to put a sample working virtual disk at " - + testVolWorks.getPath(), testVolWorks.exists()); + Assert.assertTrue("Need to put a sample working virtual disk at " + testVolWorks.getPath(), testVolWorks.exists()); try { - s_testSampleVolumeWorkingURIJSON = - s_gson.toJson(testVolWorks.getCanonicalPath()); + s_testSampleVolumeWorkingURIJSON = s_gson.toJson(testVolWorks.getCanonicalPath()); } catch (IOException e) { - Assert.fail("No canonical path for " - + testPoolDir.getAbsolutePath()); + Assert.fail("No canonical path for " + testPoolDir.getAbsolutePath()); } FilenameFilter vhdsFilt = new FilenameFilter() { @@ -216,53 +190,38 @@ public class HypervDirectConnectResourceTest { if (file.getName().equals(testVolWorks.getName())) { continue; } - Assert.assertTrue("Should have deleted file " + file.getPath(), - file.delete()); + Assert.assertTrue("Should have deleted file " + file.getPath(), file.delete()); s_logger.info("Cleaned up by delete file " + file.getPath()); } - s_testSampleVolumeTempURIJSON = - createTestDiskImageFromExistingImage(testVolWorks, - s_testLocalStorePath, s_testSampleVolumeTempUUID); + s_testSampleVolumeTempURIJSON = createTestDiskImageFromExistingImage(testVolWorks, s_testLocalStorePath, s_testSampleVolumeTempUUID); s_logger.info("Created " + s_testSampleVolumeTempURIJSON); - s_testSampleVolumeCorruptURIJSON = - createTestDiskImageFromExistingImage(testVolWorks, - s_testLocalStorePath, s_testSampleVolumeCorruptUUID); + s_testSampleVolumeCorruptURIJSON = createTestDiskImageFromExistingImage(testVolWorks, s_testLocalStorePath, s_testSampleVolumeCorruptUUID); s_logger.info("Created " + s_testSampleVolumeCorruptURIJSON); - createTestDiskImageFromExistingImage(testVolWorks, - s_testLocalStorePath, - s_testSampleTemplateUUID); + createTestDiskImageFromExistingImage(testVolWorks, s_testLocalStorePath, s_testSampleTemplateUUID); s_testSampleTemplateURLJSON = s_testSampleTemplateUUID; - s_logger.info("Created " + s_testSampleTemplateURLJSON - + " in local storage."); + s_logger.info("Created " + s_testSampleTemplateURLJSON + " in local storage."); // Create secondary storage template: - createTestDiskImageFromExistingImage(testVolWorks, - testSecondarStoreDir.getAbsolutePath(), - "af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx"); - s_logger.info("Created " + "af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx" - + " in secondary (NFS) storage."); + createTestDiskImageFromExistingImage(testVolWorks, testSecondarStoreDir.getAbsolutePath(), "af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx"); + s_logger.info("Created " + "af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx" + " in secondary (NFS) storage."); s_testLocalStorePathJSON = s_gson.toJson(s_testLocalStorePath); - String agentIp = (String) params.get("ipaddress"); + String agentIp = (String)params.get("ipaddress"); s_logger.info("Test using agent IP address " + agentIp); params.put("agentIp", agentIp); setTestJsonResult(params); s_hypervresource.configure("hypervresource", params); // Verify sample template is in place storage pool - s_logger.info("setUp complete, sample StoragePool at " - + s_testLocalStorePathJSON - + " sample template at " + s_testSampleTemplateURLJSON); + s_logger.info("setUp complete, sample StoragePool at " + s_testLocalStorePathJSON + " sample template at " + s_testSampleTemplateURLJSON); - s_agentExecutable = (String) params.get("agent.executable"); - s_testPrimaryDataStoreHost = (String) params.get("ipaddress"); + s_agentExecutable = (String)params.get("agent.executable"); + s_testPrimaryDataStoreHost = (String)params.get("ipaddress"); agentCreation(); } - private String createTestDiskImageFromExistingImage(final File srcFile, - final String dstPath, - final String dstFileName) { + private String createTestDiskImageFromExistingImage(final File srcFile, final String dstPath, final String dstFileName) { String newFileURIJSON = null; File testVolTemp = new File(dstPath + File.separator + dstFileName); try { @@ -270,9 +229,7 @@ public class HypervDirectConnectResourceTest { } catch (IOException e) { ; // NOP } - Assert.assertTrue( - "Should be a temporary file created from the valid volume) at " - + testVolTemp.getPath(), testVolTemp.exists()); + Assert.assertTrue("Should be a temporary file created from the valid volume) at " + testVolTemp.getPath(), testVolTemp.exists()); try { newFileURIJSON = s_gson.toJson(testVolTemp.getCanonicalPath()); } catch (IOException e) { @@ -286,20 +243,16 @@ public class HypervDirectConnectResourceTest { // Sample GetVmStatsCommand List vmNames = new ArrayList(); vmNames.add("i-2-11-VM"); - GetVmStatsCommand cmd = - new GetVmStatsCommand(vmNames, "1", "localhost"); + GetVmStatsCommand cmd = new GetVmStatsCommand(vmNames, "1", "localhost"); s_hypervresource.executeRequest(cmd); - GetVmStatsAnswer ans = - (GetVmStatsAnswer) s_hypervresource.executeRequest(cmd); + GetVmStatsAnswer ans = (GetVmStatsAnswer)s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getDetails(), ans.getResult()); } public final void testStartupCommand() { - StartupRoutingCommand defaultStartRoutCmd = new StartupRoutingCommand( - 0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, - RouterPrivateIpStrategy.HostLocal, - new HashMap(), + StartupRoutingCommand defaultStartRoutCmd = + new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal, new HashMap(), new HashMap()); // Identity within the data centre is decided by CloudStack kernel, @@ -324,25 +277,20 @@ public class HypervDirectConnectResourceTest { Command[] result = s_gson.fromJson(cmdsStr, Command[].class); s_logger.debug("Commands[] fromJson is " + s_gson.toJson(result)); - s_logger.debug("Commands[] first element has type" - + result[0].toString()); + s_logger.debug("Commands[] first element has type" + result[0].toString()); } // @Test public final void testJson() { StartupStorageCommand sscmd = null; - com.cloud.agent.api.StoragePoolInfo pi = - new com.cloud.agent.api.StoragePoolInfo( - "test123", "192.168.0.1", "c:\\", "c:\\", - StoragePoolType.Filesystem, 100L, 50L); + com.cloud.agent.api.StoragePoolInfo pi = new com.cloud.agent.api.StoragePoolInfo("test123", "192.168.0.1", "c:\\", "c:\\", StoragePoolType.Filesystem, 100L, 50L); sscmd = new StartupStorageCommand(); sscmd.setPoolInfo(pi); sscmd.setGuid(pi.getUuid()); sscmd.setDataCenter("foo"); sscmd.setResourceType(Storage.StorageResourceType.STORAGE_POOL); - s_logger.debug("StartupStorageCommand fromJson is " - + s_gson.toJson(sscmd)); + s_logger.debug("StartupStorageCommand fromJson is " + s_gson.toJson(sscmd)); } @Test @@ -350,10 +298,8 @@ public class HypervDirectConnectResourceTest { // Sample GetVmStatsCommand List vmNames = new ArrayList(); vmNames.add("FakeVM"); - GetVmStatsCommand vmStatsCmd = - new GetVmStatsCommand(vmNames, "1", "localhost"); - GetVmStatsAnswer ans = - (GetVmStatsAnswer) s_hypervresource.executeRequest(vmStatsCmd); + GetVmStatsCommand vmStatsCmd = new GetVmStatsCommand(vmNames, "1", "localhost"); + GetVmStatsAnswer ans = (GetVmStatsAnswer)s_hypervresource.executeRequest(vmStatsCmd); Assert.assertTrue(ans.getDetails(), ans.getResult()); } @@ -363,8 +309,7 @@ public class HypervDirectConnectResourceTest { StoragePoolVO pool = createTestStoragePoolVO(folderName); CreateStoragePoolCommand cmd = new CreateStoragePoolCommand(true, pool); - s_logger.debug("TestCreateStoragePoolCommand sending " - + s_gson.toJson(cmd)); + s_logger.debug("TestCreateStoragePoolCommand sending " + s_gson.toJson(cmd)); Answer ans = s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getResult()); @@ -376,13 +321,11 @@ public class HypervDirectConnectResourceTest { String folderName = "." + File.separator + "Dummy"; StoragePoolVO pool = createTestStoragePoolVO(folderName); - ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand( - true, pool, folderName); + ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, folderName); Answer ans = s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getResult()); - DeleteStoragePoolCommand delCmd = - new DeleteStoragePoolCommand(pool, folderName); + DeleteStoragePoolCommand delCmd = new DeleteStoragePoolCommand(pool, folderName); Answer ans2 = s_hypervresource.executeRequest(delCmd); Assert.assertTrue(ans2.getResult()); } @@ -403,23 +346,19 @@ public class HypervDirectConnectResourceTest { // Use same spec for pool s_logger.info("Createing pool at : " + folderName); - StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, - "127.0.0.1", -1, folderName); + StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, "127.0.0.1", -1, folderName); pool.setUuid(s_testLocalStoreUUID); - ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand( - true, pool, folderName); + ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, folderName); Answer ans = s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getResult()); - DeleteStoragePoolCommand delCmd = - new DeleteStoragePoolCommand(pool, folderName); + DeleteStoragePoolCommand delCmd = new DeleteStoragePoolCommand(pool, folderName); Answer ans2 = s_hypervresource.executeRequest(delCmd); Assert.assertTrue(ans2.getResult()); } - public final StoragePoolVO createTestStoragePoolVO( - final String folderName) { + public final StoragePoolVO createTestStoragePoolVO(final String folderName) { File folder = new File(folderName); if (!folder.exists()) { if (!folder.mkdir()) { @@ -430,8 +369,7 @@ public class HypervDirectConnectResourceTest { // Use same spec for pool s_logger.info("Createing pool at : " + folderName); - StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, - "127.0.0.1", -1, folderName); + StoragePoolVO pool = new StoragePoolVO(StoragePoolType.Filesystem, "127.0.0.1", -1, folderName); return pool; } @@ -445,8 +383,7 @@ public class HypervDirectConnectResourceTest { } s_logger.debug("TestInitialize returned " + result); s_logger.debug("TestInitialize expected " + _setTestJsonResultStr); - Assert.assertTrue("StartupCommand[] not what we expected", - _setTestJsonResultStr.equals(result)); + Assert.assertTrue("StartupCommand[] not what we expected", _setTestJsonResultStr.equals(result)); return; } @@ -457,11 +394,8 @@ public class HypervDirectConnectResourceTest { corePrimaryStorageDownloadCommandTestCycle(cmd); } - private void corePrimaryStorageDownloadCommandTestCycle( - final PrimaryStorageDownloadCommand cmd) { - PrimaryStorageDownloadAnswer ans = - (PrimaryStorageDownloadAnswer) s_hypervresource - .executeRequest(cmd); + private void corePrimaryStorageDownloadCommandTestCycle(final PrimaryStorageDownloadCommand cmd) { + PrimaryStorageDownloadAnswer ans = (PrimaryStorageDownloadAnswer)s_hypervresource.executeRequest(cmd); if (!ans.getResult()) { s_logger.error(ans.getDetails()); } else { @@ -481,41 +415,20 @@ public class HypervDirectConnectResourceTest { private PrimaryStorageDownloadCommand samplePrimaryDownloadCommand() { String cmdJson = - "{\"localPath\":" - + s_testLocalStorePathJSON - + ",\"poolUuid\":\"" - + s_testLocalStoreUUID - + "\",\"poolId\":201," - + "\"secondaryStorageUrl\":" - + "\"nfs://10.70.176.36/mnt/cshv3/secondarystorage\"," - + "\"primaryStorageUrl\":" - + "\"nfs://10.70.176.29E:\\\\Disks\\\\Disks\"," - + "\"url\":" - + "\"nfs://10.70.176.36/mnt/cshv3/secondarystorage/template/tmpl//2/204//af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx\"," - + "\"format\":\"VHDX\",\"accountId\":2," - + "\"name\":" - + "\"204-2-5a1db1ac-932b-3e7e-a0e8-5684c72cb862\"" - + ",\"contextMap\":{},\"wait\":10800}"; - PrimaryStorageDownloadCommand cmd = s_gson.fromJson(cmdJson, - PrimaryStorageDownloadCommand.class); + "{\"localPath\":" + s_testLocalStorePathJSON + ",\"poolUuid\":\"" + s_testLocalStoreUUID + "\",\"poolId\":201," + "\"secondaryStorageUrl\":" + + "\"nfs://10.70.176.36/mnt/cshv3/secondarystorage\"," + "\"primaryStorageUrl\":" + "\"nfs://10.70.176.29E:\\\\Disks\\\\Disks\"," + "\"url\":" + + "\"nfs://10.70.176.36/mnt/cshv3/secondarystorage/template/tmpl//2/204//af39aa7f-2b12-37e1-86d3-e23f2f005101.vhdx\"," + + "\"format\":\"VHDX\",\"accountId\":2," + "\"name\":" + "\"204-2-5a1db1ac-932b-3e7e-a0e8-5684c72cb862\"" + ",\"contextMap\":{},\"wait\":10800}"; + PrimaryStorageDownloadCommand cmd = s_gson.fromJson(cmdJson, PrimaryStorageDownloadCommand.class); return cmd; } public final CreateCommand createCommandSample() { String sample = - "{\"volId\":17,\"pool\":{\"id\":201,\"uuid\":\"" - + s_testLocalStoreUUID - + "\",\"host\":\"10.70.176.29\"" - + ",\"path\":" - + s_testLocalStorePathJSON - + ",\"port\":0,\"type\":\"Filesystem\"}," - + "\"diskCharacteristics\":{\"size\":0," - + "\"tags\":[],\"type\":\"ROOT\",\"name\":\"ROOT-15\"," - + "\"useLocalStorage\":true,\"recreatable\":true," - + "\"diskOfferingId\":11," - + "\"volumeId\":17,\"hyperType\":\"Hyperv\"}," - + "\"templateUrl\":" - + s_testSampleTemplateURLJSON + ",\"wait\":0}"; + "{\"volId\":17,\"pool\":{\"id\":201,\"uuid\":\"" + s_testLocalStoreUUID + "\",\"host\":\"10.70.176.29\"" + ",\"path\":" + s_testLocalStorePathJSON + + ",\"port\":0,\"type\":\"Filesystem\"}," + "\"diskCharacteristics\":{\"size\":0," + "\"tags\":[],\"type\":\"ROOT\",\"name\":\"ROOT-15\"," + + "\"useLocalStorage\":true,\"recreatable\":true," + "\"diskOfferingId\":11," + "\"volumeId\":17,\"hyperType\":\"Hyperv\"}," + "\"templateUrl\":" + + s_testSampleTemplateURLJSON + ",\"wait\":0}"; CreateCommand cmd = s_gson.fromJson(sample, CreateCommand.class); return cmd; } @@ -523,98 +436,68 @@ public class HypervDirectConnectResourceTest { @Test public final void testCreateCommand() { String sample = - "{\"volId\":10,\"pool\":{\"id\":201,\"uuid\":\"" - + s_testLocalStoreUUID - + "\",\"host\":\"10.70.176.29\"" - + ",\"path\":" - + s_testLocalStorePathJSON - + ",\"port\":0,\"type\":\"Filesystem\"}," - + "\"diskCharacteristics\":{\"size\":0," - + "\"tags\":[],\"type\":\"ROOT\",\"name\":\"ROOT-9\"," - + "\"useLocalStorage\":true,\"recreatable\":true," - + "\"diskOfferingId\":11," - + "\"volumeId\":10,\"hyperType\":\"Hyperv\"}," - + "\"templateUrl\":" - + s_testSampleTemplateURLJSON - + ",\"contextMap\":{},\"wait\":0}"; + "{\"volId\":10,\"pool\":{\"id\":201,\"uuid\":\"" + s_testLocalStoreUUID + "\",\"host\":\"10.70.176.29\"" + ",\"path\":" + s_testLocalStorePathJSON + + ",\"port\":0,\"type\":\"Filesystem\"}," + "\"diskCharacteristics\":{\"size\":0," + "\"tags\":[],\"type\":\"ROOT\",\"name\":\"ROOT-9\"," + + "\"useLocalStorage\":true,\"recreatable\":true," + "\"diskOfferingId\":11," + "\"volumeId\":10,\"hyperType\":\"Hyperv\"}," + "\"templateUrl\":" + + s_testSampleTemplateURLJSON + ",\"contextMap\":{},\"wait\":0}"; File destDir = new File(s_testLocalStorePath); Assert.assertTrue(destDir.isDirectory()); - File testSampleTemplateURLFile = - new File(s_testLocalStorePath - + File.separator - + s_gson.fromJson(s_testSampleTemplateURLJSON, - String.class)); - Assert.assertTrue( - "The template that create should make" - + " volumes from is missing from path " - + testSampleTemplateURLFile.getPath(), - testSampleTemplateURLFile.exists()); + File testSampleTemplateURLFile = new File(s_testLocalStorePath + File.separator + s_gson.fromJson(s_testSampleTemplateURLJSON, String.class)); + Assert.assertTrue("The template that create should make" + " volumes from is missing from path " + testSampleTemplateURLFile.getPath(), + testSampleTemplateURLFile.exists()); int fileCount = destDir.listFiles().length; s_logger.debug(" test local store has " + fileCount + "files"); // Test requires there to be a template at the tempalteUrl, which is its // location in the local file system. CreateCommand cmd = s_gson.fromJson(sample, CreateCommand.class); - CreateAnswer ans = (CreateAnswer) s_hypervresource.executeRequest(cmd); + CreateAnswer ans = (CreateAnswer)s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getDetails(), ans.getResult()); - Assert.assertTrue("CreateCommand should add a file to the folder", - fileCount + 1 == destDir.listFiles().length); + Assert.assertTrue("CreateCommand should add a file to the folder", fileCount + 1 == destDir.listFiles().length); File newFile = new File(ans.getVolume().getPath()); - Assert.assertTrue("The new file should have a size greater than zero", - newFile.length() > 0); + Assert.assertTrue("The new file should have a size greater than zero", newFile.length() > 0); newFile.delete(); } @Test public final void testStartCommandCorruptDiskImage() { String sampleStart = - "{\"vm\":{\"id\":16,\"name\":\"i-3-17-VM\"," - + "\"type\":\"User\",\"cpus\":1,\"speed\":500," - + "\"minRam\":536870912,\"maxRam\":536870912," - + "\"arch\":\"x86_64\"," - + "\"os\":\"CentOS 6.0 (64-bit)\"," - + "\"bootArgs\":\"\",\"rebootOnCrash\":false," - + "\"enableHA\":false," - + "\"limitCpuUse\":false," - + "\"vncPassword\":\"31f82f29aff646eb\"," - + "\"params\":{}," - + "\"uuid\":\"8b030b6a-0243-440a-8cc5-45d08815ca11\"" - + ",\"disks\":[" - + "{\"id\":18,\"name\":\"" - + s_testSampleVolumeCorruptUUID - + "\"," - + "\"mountPoint\":" - + s_testSampleVolumeCorruptURIJSON - + "," - + "\"path\":" - + s_testSampleVolumeCorruptURIJSON - + ",\"size\":0," - + "\"type\":\"ROOT\"," - + "\"storagePoolType\":\"Filesystem\"," - + "\"storagePoolUuid\":\"" - + s_testLocalStoreUUID - + "\"" - + ",\"deviceId\":0}," - + "{\"id\":16,\"name\":\"Hyper-V Sample2\",\"size\":0," - + "\"type\":\"ISO\",\"storagePoolType\":\"ISO\"," - + "\"deviceId\":3}]," - + "\"nics\":[" - + "{\"deviceId\":0,\"networkRateMbps\":100," - + "\"defaultNic\":true," - + "\"uuid\":\"99cb4813-23af-428c-a87a-2d1899be4f4b\"," - + "\"ip\":\"10.1.1.67\",\"netmask\":\"255.255.255.0\"," - + "\"gateway\":\"10.1.1.1\"," - + "\"mac\":\"02:00:51:2c:00:0e\",\"dns1\":\"4.4.4.4\"," - + "\"broadcastType\":\"Vlan\",\"type\":\"Guest\"," - + "\"broadcastUri\":\"vlan://261\"," - + "\"isolationUri\":\"vlan://261\"," - + "\"isSecurityGroupEnabled\":false}" - + "]},\"contextMap\":{},\"wait\":0}"; + "{\"vm\":{\"id\":16,\"name\":\"i-3-17-VM\"," + "\"type\":\"User\",\"cpus\":1,\"speed\":500," + "\"minRam\":536870912,\"maxRam\":536870912," + + "\"arch\":\"x86_64\"," + "\"os\":\"CentOS 6.0 (64-bit)\"," + "\"bootArgs\":\"\",\"rebootOnCrash\":false," + "\"enableHA\":false," + + "\"limitCpuUse\":false," + "\"vncPassword\":\"31f82f29aff646eb\"," + "\"params\":{}," + "\"uuid\":\"8b030b6a-0243-440a-8cc5-45d08815ca11\"" + + ",\"disks\":[" + "{\"id\":18,\"name\":\"" + + s_testSampleVolumeCorruptUUID + + "\"," + + "\"mountPoint\":" + + s_testSampleVolumeCorruptURIJSON + + "," + + "\"path\":" + + s_testSampleVolumeCorruptURIJSON + + ",\"size\":0," + + "\"type\":\"ROOT\"," + + "\"storagePoolType\":\"Filesystem\"," + + "\"storagePoolUuid\":\"" + + s_testLocalStoreUUID + + "\"" + + ",\"deviceId\":0}," + + "{\"id\":16,\"name\":\"Hyper-V Sample2\",\"size\":0," + + "\"type\":\"ISO\",\"storagePoolType\":\"ISO\"," + + "\"deviceId\":3}]," + + "\"nics\":[" + + "{\"deviceId\":0,\"networkRateMbps\":100," + + "\"defaultNic\":true," + + "\"uuid\":\"99cb4813-23af-428c-a87a-2d1899be4f4b\"," + + "\"ip\":\"10.1.1.67\",\"netmask\":\"255.255.255.0\"," + + "\"gateway\":\"10.1.1.1\"," + + "\"mac\":\"02:00:51:2c:00:0e\",\"dns1\":\"4.4.4.4\"," + + "\"broadcastType\":\"Vlan\",\"type\":\"Guest\"," + + "\"broadcastUri\":\"vlan://261\"," + + "\"isolationUri\":\"vlan://261\"," + + "\"isSecurityGroupEnabled\":false}" + "]},\"contextMap\":{},\"wait\":0}"; StartCommand cmd = s_gson.fromJson(sampleStart, StartCommand.class); - StartAnswer ans = - (StartAnswer) s_hypervresource.executeRequest(cmd); + StartAnswer ans = (StartAnswer)s_hypervresource.executeRequest(cmd); Assert.assertFalse(ans.getDetails(), ans.getResult()); } @@ -640,19 +523,16 @@ public class HypervDirectConnectResourceTest { } private StopAnswer simpleVmStop() { - String sampleStop = - "{\"isProxy\":false,\"vmName\":\"i-2-17-VM\"," - + "\"contextMap\":{},\"wait\":0}"; + String sampleStop = "{\"isProxy\":false,\"vmName\":\"i-2-17-VM\"," + "\"contextMap\":{},\"wait\":0}"; StopCommand cmd = s_gson.fromJson(sampleStop, StopCommand.class); - StopAnswer ans = (StopAnswer) s_hypervresource.executeRequest(cmd); + StopAnswer ans = (StopAnswer)s_hypervresource.executeRequest(cmd); return ans; } private StartAnswer simpleVmStart(final String sample) { StartCommand cmd = s_gson.fromJson(sample, StartCommand.class); s_logger.info("StartCommand sample " + s_gson.toJson(cmd)); - StartAnswer ans = - (StartAnswer) s_hypervresource.executeRequest(cmd); + StartAnswer ans = (StartAnswer)s_hypervresource.executeRequest(cmd); return ans; } @@ -664,14 +544,8 @@ public class HypervDirectConnectResourceTest { // String sample2 = "{\"volume\":" + getSampleVolumeObjectTO() + "}"; String sample2 = - "{\"volume\":{\"name\":\"" + s_testSampleVolumeWorkingUUIDNoExt - + "\",\"storagePoolType\":\"Filesystem\"," - + "\"mountPoint\":" - + s_testLocalStorePathJSON - + ",\"path\":" + s_testSampleVolumeTempURIJSON - + ",\"storagePoolUuid\":\"" + s_testLocalStoreUUID - + "\"," - + "\"type\":\"ROOT\",\"id\":9,\"size\":0}}"; + "{\"volume\":{\"name\":\"" + s_testSampleVolumeWorkingUUIDNoExt + "\",\"storagePoolType\":\"Filesystem\"," + "\"mountPoint\":" + s_testLocalStorePathJSON + + ",\"path\":" + s_testSampleVolumeTempURIJSON + ",\"storagePoolUuid\":\"" + s_testLocalStoreUUID + "\"," + "\"type\":\"ROOT\",\"id\":9,\"size\":0}}"; DestroyCommand cmd = s_gson.fromJson(sample2, DestroyCommand.class); Answer ans = s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getDetails(), ans.getResult()); @@ -681,21 +555,13 @@ public class HypervDirectConnectResourceTest { public final void testGetStorageStatsCommand() { // TODO: Update sample data to unsure it is using correct info. String sample = - "{\"id\":\"" - + s_testLocalStoreUUID - + "\",\"localPath\":" - + s_testLocalStorePathJSON - + "," - + "\"pooltype\":\"Filesystem\"," - + "\"contextMap\":{},\"wait\":0}"; + "{\"id\":\"" + s_testLocalStoreUUID + "\",\"localPath\":" + s_testLocalStorePathJSON + "," + "\"pooltype\":\"Filesystem\"," + "\"contextMap\":{},\"wait\":0}"; s_logger.info("Sample JSON: " + sample); - GetStorageStatsCommand cmd = - s_gson.fromJson(sample, GetStorageStatsCommand.class); + GetStorageStatsCommand cmd = s_gson.fromJson(sample, GetStorageStatsCommand.class); s_hypervresource.executeRequest(cmd); - GetStorageStatsAnswer ans = - (GetStorageStatsAnswer) s_hypervresource.executeRequest(cmd); + GetStorageStatsAnswer ans = (GetStorageStatsAnswer)s_hypervresource.executeRequest(cmd); Assert.assertTrue(ans.getDetails(), ans.getResult()); Assert.assertTrue(ans.getByteUsed() != ans.getCapacityBytes()); } @@ -711,8 +577,7 @@ public class HypervDirectConnectResourceTest { writer.flush(); writer.close(); } catch (IOException ex) { - s_logger.debug("Error closing agent at " + s_agentExecutable - + " message " + ex.getMessage()); + s_logger.debug("Error closing agent at " + s_agentExecutable + " message " + ex.getMessage()); } } @@ -731,9 +596,7 @@ public class HypervDirectConnectResourceTest { s_agentProc = builder.start(); Thread.sleep(4000); } catch (Exception ex) { - s_logger.debug("Error calling starting aget at " - + s_agentExecutable - + " message " + ex.getMessage()); + s_logger.debug("Error calling starting aget at " + s_agentExecutable + " message " + ex.getMessage()); } } @@ -741,12 +604,10 @@ public class HypervDirectConnectResourceTest { public final void testGetHostStatsCommand() { // Arrange long hostIdVal = 123; - GetHostStatsCommand cmd = new GetHostStatsCommand("1", "testHost", - hostIdVal); + GetHostStatsCommand cmd = new GetHostStatsCommand("1", "testHost", hostIdVal); // Act - GetHostStatsAnswer ans = (GetHostStatsAnswer) s_hypervresource - .executeRequest(cmd); + GetHostStatsAnswer ans = (GetHostStatsAnswer)s_hypervresource.executeRequest(cmd); // Assert Assert.assertTrue(ans.getResult()); @@ -764,8 +625,7 @@ public class HypervDirectConnectResourceTest { Properties properties = new Properties(); final File file = PropertiesUtil.findConfigFile("agent.properties"); if (file == null) { - throw new ConfigurationException( - "Unable to find agent.properties."); + throw new ConfigurationException("Unable to find agent.properties."); } s_logger.info("agent.properties found at " + file.getAbsolutePath()); @@ -773,11 +633,9 @@ public class HypervDirectConnectResourceTest { try { properties.load(new FileInputStream(file)); } catch (final FileNotFoundException ex) { - throw new CloudRuntimeException("Cannot find the file: " - + file.getAbsolutePath(), ex); + throw new CloudRuntimeException("Cannot find the file: " + file.getAbsolutePath(), ex); } catch (final IOException ex) { - throw new CloudRuntimeException("IOException in reading " - + file.getAbsolutePath(), ex); + throw new CloudRuntimeException("IOException in reading " + file.getAbsolutePath(), ex); } return properties; } @@ -785,156 +643,61 @@ public class HypervDirectConnectResourceTest { private String _setTestJsonResultStr = null; public final void setTestJsonResult(final Map params) { - File dir = new File((String) params.get("DefaultVirtualDiskFolder")); + File dir = new File((String)params.get("DefaultVirtualDiskFolder")); long usableCapacity = dir.getUsableSpace() - 4294967296L; long totalSpace = dir.getTotalSpace() - 4294967296L; // TODO: add test to verify capacity statistics change _setTestJsonResultStr = - String.format( - "[{\"com.cloud.agent.api.StartupRoutingCommand\":{" - + "\"cpus\":%s," - + "\"speed\":%s," - + "\"memory\":%s," - + "\"dom0MinMemory\":%s," - + "\"poolSync\":false," - + "\"vms\":{}," - + "\"caps\":\"hvm\"," - + "\"hypervisorType\":\"Hyperv\"," - + "\"hostDetails\":{" - + "\"com.cloud.network.Networks.RouterPrivateIpStrategy\":" - + "\"HostLocal\"" - + "}," - + "\"type\":\"Routing\"," - + "\"dataCenter\":%s," - + "\"pod\":%s," - + "\"cluster\":%s," - + "\"guid\":\"16f85622-4508-415e-b13a-49a39bb14e4d\"," - + "\"name\":\"hypervresource\"," - + "\"version\":\"4.2.0\"," - + "\"privateIpAddress\":%s," - + "\"privateMacAddress\":%s," - + "\"privateNetmask\":%s," - + "\"storageIpAddress\":%s," - + "\"storageNetmask\":%s," - + "\"storageMacAddress\":%s," - + "\"gatewayIpAddress\":%s," - + "\"contextMap\":{}," - + "\"wait\":0" - + "}}," - + "{\"com.cloud.agent.api.StartupStorageCommand\":{" - + "\"totalSize\":0," - + "\"poolInfo\":{" - + "\"uuid\":\"16f85622-4508-415e-b13a-49a39bb14e4d\"," - + "\"host\":%s," - + "\"localPath\":%s," - + "\"hostPath\":%s," - + "\"poolType\":\"Filesystem\"," - + "\"capacityBytes\":%s," - + "\"availableBytes\":%s" - + "}," - + "\"resourceType\":\"STORAGE_POOL\"," - + "\"hostDetails\":{}," - + "\"type\":\"Storage\"," - + "\"dataCenter\":\"1\"," - + "\"guid\":" - + "\"16f85622-4508-415e-b13a-49a39bb14e4d\"," - + "\"contextMap\":{}," - + "\"wait\":0" - + "}}]", - params.get("TestCoreCount"), - params.get("TestCoreMhz"), - params.get("TestMemoryMb"), - params.get("TestDom0MinMemoryMb"), - s_gson.toJson(params.get("zone")), - s_gson.toJson(params.get("pod")), - s_gson.toJson(params.get("cluster")), - s_gson.toJson(params.get("ipaddress")), - s_gson.toJson(params - .get("private.mac.address")), - s_gson.toJson(params.get( - "private.ip.netmask")), - s_gson.toJson(params.get("ipaddress")), - s_gson.toJson(params.get( - "private.ip.netmask")), - s_gson.toJson(params - .get("private.mac.address")), - s_gson.toJson(params.get( - "gateway.ip.address")), - s_gson.toJson(params.get("ipaddress")), - s_gson.toJson(params - .get("DefaultVirtualDiskFolder")), - s_gson.toJson(params - .get("DefaultVirtualDiskFolder")), - s_gson.toJson(totalSpace), - s_gson.toJson(usableCapacity) - ); + String.format("[{\"com.cloud.agent.api.StartupRoutingCommand\":{" + "\"cpus\":%s," + "\"speed\":%s," + "\"memory\":%s," + "\"dom0MinMemory\":%s," + + "\"poolSync\":false," + "\"vms\":{}," + "\"caps\":\"hvm\"," + "\"hypervisorType\":\"Hyperv\"," + "\"hostDetails\":{" + + "\"com.cloud.network.Networks.RouterPrivateIpStrategy\":" + "\"HostLocal\"" + "}," + "\"type\":\"Routing\"," + "\"dataCenter\":%s," + "\"pod\":%s," + + "\"cluster\":%s," + "\"guid\":\"16f85622-4508-415e-b13a-49a39bb14e4d\"," + "\"name\":\"hypervresource\"," + "\"version\":\"4.2.0\"," + + "\"privateIpAddress\":%s," + "\"privateMacAddress\":%s," + "\"privateNetmask\":%s," + "\"storageIpAddress\":%s," + "\"storageNetmask\":%s," + + "\"storageMacAddress\":%s," + "\"gatewayIpAddress\":%s," + "\"contextMap\":{}," + "\"wait\":0" + "}}," + + "{\"com.cloud.agent.api.StartupStorageCommand\":{" + "\"totalSize\":0," + "\"poolInfo\":{" + "\"uuid\":\"16f85622-4508-415e-b13a-49a39bb14e4d\"," + + "\"host\":%s," + "\"localPath\":%s," + "\"hostPath\":%s," + "\"poolType\":\"Filesystem\"," + "\"capacityBytes\":%s," + "\"availableBytes\":%s" + "}," + + "\"resourceType\":\"STORAGE_POOL\"," + "\"hostDetails\":{}," + "\"type\":\"Storage\"," + "\"dataCenter\":\"1\"," + "\"guid\":" + + "\"16f85622-4508-415e-b13a-49a39bb14e4d\"," + "\"contextMap\":{}," + "\"wait\":0" + "}}]", params.get("TestCoreCount"), params.get("TestCoreMhz"), + params.get("TestMemoryMb"), params.get("TestDom0MinMemoryMb"), s_gson.toJson(params.get("zone")), s_gson.toJson(params.get("pod")), + s_gson.toJson(params.get("cluster")), s_gson.toJson(params.get("ipaddress")), s_gson.toJson(params.get("private.mac.address")), + s_gson.toJson(params.get("private.ip.netmask")), s_gson.toJson(params.get("ipaddress")), s_gson.toJson(params.get("private.ip.netmask")), + s_gson.toJson(params.get("private.mac.address")), s_gson.toJson(params.get("gateway.ip.address")), s_gson.toJson(params.get("ipaddress")), + s_gson.toJson(params.get("DefaultVirtualDiskFolder")), s_gson.toJson(params.get("DefaultVirtualDiskFolder")), s_gson.toJson(totalSpace), + s_gson.toJson(usableCapacity)); } public static String getSamplePrimaryDataStoreInfo() { String samplePrimaryDataStoreInfo = - "{\"org.apache.cloudstack.storage.to.PrimaryDataStoreTO\":" - + "{\"uuid\":\"" + s_testLocalStoreUUID + "\"," - + "\"id\":201," - + "\"host\":\"" + s_testPrimaryDataStoreHost + "\"," - + "\"type\":\"Filesystem\"," // Not used in - // PrimaryDataStoreTO - + "\"poolType\":\"Filesystem\"," // Not used in - // PrimaryDataStoreTO - + "\"path\":" + s_testLocalStorePathJSON + "," - + "\"port\":0}" - + "}"; + "{\"org.apache.cloudstack.storage.to.PrimaryDataStoreTO\":" + "{\"uuid\":\"" + s_testLocalStoreUUID + "\"," + "\"id\":201," + "\"host\":\"" + + s_testPrimaryDataStoreHost + "\"," + "\"type\":\"Filesystem\"," // Not used in + // PrimaryDataStoreTO + + "\"poolType\":\"Filesystem\"," // Not used in + // PrimaryDataStoreTO + + "\"path\":" + s_testLocalStorePathJSON + "," + "\"port\":0}" + "}"; return samplePrimaryDataStoreInfo; } public static String getSampleVolumeObjectTO() { String sampleVolumeObjectTO = - "{\"org.apache.cloudstack.storage.to.VolumeObjectTO\":" - + "{\"uuid\":\"19ae8e67-cb2c-4ab4-901e-e0b864272b59\"," - + "\"volumeType\":\"ROOT\"," - + "\"format\":\"VHDX\"," - + "\"dataStore\":" + getSamplePrimaryDataStoreInfo() - + "," - + "\"name\":\"" + s_testSampleVolumeWorkingUUIDNoExt + "\"," - + "\"size\":52428800," - + "\"volumeId\":10," - // "\"vmName\":\"i-3-5-VM\"," + // TODO: required? - + "\"accountId\":3,\"id\":10}" - + "}"; // end of destTO + "{\"org.apache.cloudstack.storage.to.VolumeObjectTO\":" + "{\"uuid\":\"19ae8e67-cb2c-4ab4-901e-e0b864272b59\"," + "\"volumeType\":\"ROOT\"," + + "\"format\":\"VHDX\"," + "\"dataStore\":" + getSamplePrimaryDataStoreInfo() + "," + "\"name\":\"" + s_testSampleVolumeWorkingUUIDNoExt + "\"," + + "\"size\":52428800," + "\"volumeId\":10," + // "\"vmName\":\"i-3-5-VM\"," + // TODO: required? + + "\"accountId\":3,\"id\":10}" + "}"; // end of destTO return sampleVolumeObjectTO; } public static String getSampleStartCommand() { String sample = - "{\"vm\":{\"id\":17,\"name\":\"i-2-17-VM\"," - + "\"type\":\"User\",\"cpus\":1,\"speed\":500," - + "\"minRam\":536870912,\"maxRam\":536870912," - + "\"arch\":\"x86_64\"," - + "\"os\":\"CentOS 6.0 (64-bit)\"," - + "\"bootArgs\":\"\",\"rebootOnCrash\":false," - + "\"enableHA\":false,\"limitCpuUse\":false," - + "\"vncPassword\":\"31f82f29aff646eb\"," - + "\"params\":{}," - + "\"uuid\":\"8b030b6a-0243-440a-8cc5-45d08815ca11\"" - + ",\"disks\":[" - + "{\"data\":" - + getSampleVolumeObjectTO() - + ",\"diskSeq\":0,\"type\":\"ROOT\"}," - + "{\"diskSeq\":1,\"type\":\"ISO\"}" - + "]," - + "\"nics\":[" - + "{\"deviceId\":0,\"networkRateMbps\":100," - + "\"defaultNic\":true," - + "\"uuid\":\"99cb4813-23af-428c-a87a-2d1899be4f4b\"," - + "\"ip\":\"10.1.1.67\"," - + "\"netmask\":\"255.255.255.0\"," - + "\"gateway\":\"10.1.1.1\"," - + "\"mac\":\"02:00:51:2c:00:0e\",\"dns1\":\"4.4.4.4\"," - + "\"broadcastType\":\"Vlan\",\"type\":\"Guest\"," - + "\"broadcastUri\":\"vlan://261\"," - + "\"isolationUri\":\"vlan://261\"," - + "\"isSecurityGroupEnabled\":false}" - + "]},\"contextMap\":{},\"wait\":0}"; + "{\"vm\":{\"id\":17,\"name\":\"i-2-17-VM\"," + "\"type\":\"User\",\"cpus\":1,\"speed\":500," + "\"minRam\":536870912,\"maxRam\":536870912," + + "\"arch\":\"x86_64\"," + "\"os\":\"CentOS 6.0 (64-bit)\"," + "\"bootArgs\":\"\",\"rebootOnCrash\":false," + "\"enableHA\":false,\"limitCpuUse\":false," + + "\"vncPassword\":\"31f82f29aff646eb\"," + "\"params\":{}," + "\"uuid\":\"8b030b6a-0243-440a-8cc5-45d08815ca11\"" + ",\"disks\":[" + "{\"data\":" + + getSampleVolumeObjectTO() + ",\"diskSeq\":0,\"type\":\"ROOT\"}," + "{\"diskSeq\":1,\"type\":\"ISO\"}" + "]," + "\"nics\":[" + + "{\"deviceId\":0,\"networkRateMbps\":100," + "\"defaultNic\":true," + "\"uuid\":\"99cb4813-23af-428c-a87a-2d1899be4f4b\"," + "\"ip\":\"10.1.1.67\"," + + "\"netmask\":\"255.255.255.0\"," + "\"gateway\":\"10.1.1.1\"," + "\"mac\":\"02:00:51:2c:00:0e\",\"dns1\":\"4.4.4.4\"," + + "\"broadcastType\":\"Vlan\",\"type\":\"Guest\"," + "\"broadcastUri\":\"vlan://261\"," + "\"isolationUri\":\"vlan://261\"," + + "\"isSecurityGroupEnabled\":false}" + "]},\"contextMap\":{},\"wait\":0}"; return sample; } } diff --git a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java index 59f7e1636a3..184053b9c85 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java +++ b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java @@ -18,6 +18,13 @@ */ package com.cloud.ha; +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostCommand; @@ -28,11 +35,6 @@ import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; -import org.apache.log4j.Logger; - -import javax.ejb.Local; -import javax.inject.Inject; -import java.util.List; @Local(value = Investigator.class) public class KVMInvestigator extends AdapterBase implements Investigator { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 7d29bdcb814..48c789dac51 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -23,7 +23,6 @@ import java.io.File; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.net.URI; import javax.naming.ConfigurationException; @@ -102,7 +101,8 @@ public class BridgeVifDriver extends VifDriverBase { String trafficLabel = nic.getName(); if (nic.getType() == Networks.TrafficType.Guest) { Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0; - if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vNetId.equalsIgnoreCase("untagged") || nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan) { + if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vNetId.equalsIgnoreCase("untagged") || + nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan) { if (trafficLabel != null && !trafficLabel.isEmpty()) { s_logger.debug("creating a vNet dev and bridge for guest traffic per traffic label " + trafficLabel); String brName = createVnetBr(vNetId, trafficLabel, protocol); @@ -273,7 +273,7 @@ public class BridgeVifDriver extends VifDriverBase { } if (!foundLinkLocalBr) { Script.runSimpleBashScript("ifconfig " + linkLocalBr + " 169.254.0.1;" + "ip route add " + NetUtils.getLinkLocalCIDR() + " dev " + linkLocalBr + " src " + - NetUtils.getLinkLocalGateway()); + NetUtils.getLinkLocalGateway()); } } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java index 29c584a5a09..4e1633a99fd 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java @@ -19,14 +19,12 @@ package com.cloud.hypervisor.kvm.resource; -import com.cloud.agent.api.to.NicTO; -import com.cloud.exception.InternalErrorException; -import com.cloud.network.Networks; import org.apache.log4j.Logger; import org.libvirt.LibvirtException; -import javax.naming.ConfigurationException; -import java.util.Map; +import com.cloud.agent.api.to.NicTO; +import com.cloud.exception.InternalErrorException; +import com.cloud.network.Networks; public class DirectVifDriver extends VifDriverBase { @@ -42,6 +40,7 @@ public class DirectVifDriver extends VifDriverBase { * @throws InternalErrorException * @throws LibvirtException */ + @Override public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType) throws InternalErrorException, LibvirtException { LibvirtVMDef.InterfaceDef intf = new LibvirtVMDef.InterfaceDef(); @@ -59,6 +58,7 @@ public class DirectVifDriver extends VifDriverBase { return intf; } + @Override public void unplug(LibvirtVMDef.InterfaceDef iface) { // not needed, libvirt will cleanup } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java index aac57f6846d..6f6fbc3d4ca 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java @@ -17,11 +17,6 @@ package com.cloud.hypervisor.kvm.resource; import java.io.File; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import org.apache.log4j.Logger; import org.libvirt.LibvirtException; diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java index e2e8c2bb41f..58ba808372c 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java @@ -21,19 +21,15 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.log4j.Logger; - -import com.cloud.utils.script.Script; - import org.libvirt.Connect; import org.libvirt.LibvirtException; -import org.libvirt.Secret; import org.libvirt.StoragePool; -import org.libvirt.StoragePoolInfo; import org.libvirt.StoragePoolInfo.StoragePoolState; -import com.cloud.hypervisor.kvm.resource.LibvirtConnection; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; + +import com.cloud.utils.script.Script; public class KVMHAMonitor extends KVMHABase implements Runnable { private static final Logger s_logger = Logger.getLogger(KVMHAMonitor.class); @@ -46,7 +42,7 @@ public class KVMHAMonitor extends KVMHABase implements Runnable { this._storagePool.put(pool._poolUUID, pool); } this._hostIP = host; - this._heartBeatPath = scriptPath; + KVMHABase._heartBeatPath = scriptPath; } public void addStoragePool(NfsStoragePool pool) { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index e50c94d52fd..ad3adf9c01f 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -16,11 +16,11 @@ // under the License. package com.cloud.hypervisor.kvm.resource; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.BufferedOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; @@ -51,15 +51,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.regex.Pattern; import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.ejb.Local; import javax.naming.ConfigurationException; -import com.cloud.agent.api.CheckOnHostCommand; -import com.cloud.agent.api.routing.*; - import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.libvirt.Connect; @@ -70,6 +67,14 @@ import org.libvirt.DomainInterfaceStats; import org.libvirt.DomainSnapshot; import org.libvirt.LibvirtException; import org.libvirt.NodeInfo; + +import com.ceph.rados.IoCTX; +import com.ceph.rados.Rados; +import com.ceph.rados.RadosException; +import com.ceph.rbd.Rbd; +import com.ceph.rbd.RbdException; +import com.ceph.rbd.RbdImage; + import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; @@ -88,6 +93,7 @@ import com.cloud.agent.api.CheckHealthAnswer; import com.cloud.agent.api.CheckHealthCommand; import com.cloud.agent.api.CheckNetworkAnswer; import com.cloud.agent.api.CheckNetworkCommand; +import com.cloud.agent.api.CheckOnHostCommand; import com.cloud.agent.api.CheckStateCommand; import com.cloud.agent.api.CheckVirtualMachineAnswer; import com.cloud.agent.api.CheckVirtualMachineCommand; @@ -161,6 +167,15 @@ import com.cloud.agent.api.check.CheckSshCommand; import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand; import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer; import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand; +import com.cloud.agent.api.routing.IpAssocAnswer; +import com.cloud.agent.api.routing.IpAssocCommand; +import com.cloud.agent.api.routing.IpAssocVpcCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.SetMonitorServiceCommand; +import com.cloud.agent.api.routing.SetNetworkACLAnswer; +import com.cloud.agent.api.routing.SetNetworkACLCommand; +import com.cloud.agent.api.routing.SetSourceNatAnswer; +import com.cloud.agent.api.routing.SetSourceNatCommand; import com.cloud.agent.api.storage.CopyVolumeAnswer; import com.cloud.agent.api.storage.CopyVolumeCommand; import com.cloud.agent.api.storage.CreateAnswer; @@ -239,12 +254,6 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; import com.cloud.vm.VirtualMachine.State; -import com.ceph.rados.Rados; -import com.ceph.rados.RadosException; -import com.ceph.rados.IoCTX; -import com.ceph.rbd.Rbd; -import com.ceph.rbd.RbdImage; -import com.ceph.rbd.RbdException; /** * LibvirtComputingResource execute requests on the computing/routing host using @@ -337,8 +346,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return null; } - protected static MessageFormat SnapshotXML = new MessageFormat(" " + " {0}" + " " + " {1}" - + " " + " "); + protected static MessageFormat SnapshotXML = new MessageFormat(" " + " {0}" + " " + + " {1}" + " " + " "); protected HypervisorType _hypervisorType; protected String _hypervisorURI; @@ -722,7 +731,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv /* Does node support HVM guest? If not, exit */ if (!IsHVMEnabled(conn)) { throw new ConfigurationException("NO HVM support on this machine, please make sure: " + "1. VT/SVM is supported by your CPU, or is enabled in BIOS. " - + "2. kvm modules are loaded (kvm, kvm_amd|kvm_intel)"); + + "2. kvm modules are loaded (kvm, kvm_amd|kvm_intel)"); } } @@ -741,7 +750,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv _guestCpuModel = (String)params.get("guest.cpu.model"); if (_hypervisorLibvirtVersion < (9 * 1000 + 10)) { - s_logger.warn("LibVirt version 0.9.10 required for guest cpu mode, but version " + prettyVersion(_hypervisorLibvirtVersion) + " detected, so it will be disabled"); + s_logger.warn("LibVirt version 0.9.10 required for guest cpu mode, but version " + prettyVersion(_hypervisorLibvirtVersion) + + " detected, so it will be disabled"); _guestCpuMode = ""; _guestCpuModel = ""; } @@ -1311,8 +1321,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv primaryPool = _storagePoolMgr.getStoragePool(pool.getType(), pool.getUuid()); } catch (CloudRuntimeException e) { if (e.getMessage().contains("not found")) { - primaryPool = _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), - cmd.getPool().getUserInfo(), cmd.getPool().getType()); + primaryPool = + _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), + cmd.getPool().getUserInfo(), cmd.getPool().getType()); } else { return new CopyVolumeAnswer(cmd, false, e.getMessage(), null, null); } @@ -1425,7 +1436,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } else { vol = primaryPool.createPhysicalDisk(dskch.getPath(), dskch.getSize()); } - VolumeTO volume = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), pool.getPath(), vol.getName(), vol.getName(), disksize, null); + VolumeTO volume = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), pool.getPath(), vol.getName(), vol.getName(), disksize, null); volume.setBytesReadRate(dskch.getBytesReadRate()); volume.setBytesWriteRate(dskch.getBytesWriteRate()); volume.setIopsReadRate(dskch.getIopsReadRate()); @@ -1493,7 +1505,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv if (pool.getType() == StoragePoolType.CLVM && volFormat == PhysicalDiskFormat.RAW) { return "CLVM"; } else if ((poolType == StoragePoolType.NetworkFilesystem || poolType == StoragePoolType.SharedMountPoint || poolType == StoragePoolType.Filesystem) && - volFormat == PhysicalDiskFormat.QCOW2) { + volFormat == PhysicalDiskFormat.QCOW2) { return "QCOW2"; } return null; @@ -1552,8 +1564,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return new ResizeVolumeAnswer(cmd, false, "Unable to shrink volumes of type " + type); } - s_logger.debug("got to the stage where we execute the volume resize, params:" + path + "," + currentSize + "," + newSize + "," + type + "," + vmInstanceName + "," + - shrinkOk); + s_logger.debug("got to the stage where we execute the volume resize, params:" + path + "," + currentSize + "," + newSize + "," + type + "," + + vmInstanceName + "," + shrinkOk); final Script resizecmd = new Script(_resizeVolumePath, _cmdsTimeout, s_logger); resizecmd.add("-s", String.valueOf(newSize)); resizecmd.add("-c", String.valueOf(currentSize)); @@ -1635,7 +1647,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv conn = LibvirtConnection.getConnectionByVmName(dhcpName); List ifaces = getInterfaces(conn, dhcpName); InterfaceDef guestNic = ifaces.get(0); - script.add(opr, "-b", _guestBridgeName, "-p", primaryPvlan, "-i", isolatedPvlan, "-n", dhcpName, "-d", dhcpIp, "-m", dhcpMac, "-I", guestNic.getDevName()); + script.add(opr, "-b", _guestBridgeName, "-p", primaryPvlan, "-i", isolatedPvlan, "-n", dhcpName, "-d", dhcpIp, "-m", dhcpMac, "-I", + guestNic.getDevName()); } else { script.add(opr, "-b", _guestBridgeName, "-p", primaryPvlan, "-i", isolatedPvlan, "-n", dhcpName, "-d", dhcpIp, "-m", dhcpMac); } @@ -1875,8 +1888,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv /*skip over, no physical bridge device exists*/ } else if (pluggedVlanId == null) { /*this should only be true in the case of link local bridge*/ - return new SetSourceNatAnswer(cmd, false, "unable to find the vlan id for bridge " + pluggedVlanBr + " when attempting to set up" + pubVlan + " on router " + - routerName); + return new SetSourceNatAnswer(cmd, false, "unable to find the vlan id for bridge " + pluggedVlanBr + " when attempting to set up" + pubVlan + + " on router " + routerName); } else if (pluggedVlanId.equals(pubVlan)) { break; } @@ -1915,7 +1928,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv String pluggedVlan = pluggedNic.getBrName(); if (pluggedVlan.equalsIgnoreCase(_linkLocalBridgeName)) { broadcastUriToNicNum.put("LinkLocal", devNum); - } else if (pluggedVlan.equalsIgnoreCase(_publicBridgeName) || pluggedVlan.equalsIgnoreCase(_privBridgeName) || pluggedVlan.equalsIgnoreCase(_guestBridgeName)) { + } else if (pluggedVlan.equalsIgnoreCase(_publicBridgeName) || pluggedVlan.equalsIgnoreCase(_privBridgeName) || + pluggedVlan.equalsIgnoreCase(_guestBridgeName)) { broadcastUriToNicNum.put(BroadcastDomainType.Vlan.toUri(Vlan.UNTAGGED).toString(), devNum); } else { broadcastUriToNicNum.put(getBroadcastUriFromBridge(pluggedVlan), devNum); @@ -1980,8 +1994,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } nicNum = broadcastUriAllocatedToVM.get(ip.getBroadcastUri()); networkUsage(routerIp, "addVif", "eth" + nicNum); - result = _virtRouterResource.assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), - ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), nicNum, newNic); + result = + _virtRouterResource.assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), + ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), nicNum, newNic); if (result != null) { results[i++] = IpAssocAnswer.errorResult; @@ -2350,8 +2365,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv primary = _storagePoolMgr.getStoragePool(cmd.getPool().getType(), cmd.getPrimaryStoragePoolNameLabel()); } catch (CloudRuntimeException e) { if (e.getMessage().contains("not found")) { - primary = _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), cmd.getPool() - .getUserInfo(), cmd.getPool().getType()); + primary = + _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), + cmd.getPool().getUserInfo(), cmd.getPool().getType()); } else { return new CreatePrivateTemplateAnswer(cmd, false, e.getMessage()); } @@ -2376,8 +2392,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } else { s_logger.debug("Converting RBD disk " + disk.getPath() + " into template " + cmd.getUniqueName()); - QemuImgFile srcFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(primary.getSourceHost(), primary.getSourcePort(), primary.getAuthUserName(), - primary.getAuthSecret(), disk.getPath())); + QemuImgFile srcFile = + new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(primary.getSourceHost(), primary.getSourcePort(), primary.getAuthUserName(), + primary.getAuthSecret(), disk.getPath())); srcFile.setFormat(PhysicalDiskFormat.RAW); QemuImgFile destFile = new QemuImgFile(tmpltPath + "/" + cmd.getUniqueName() + ".qcow2"); @@ -2388,7 +2405,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv q.convert(srcFile, destFile); } catch (QemuImgException e) { s_logger.error("Failed to create new template while converting " + srcFile.getFileName() + " to " + destFile.getFileName() + " the error was: " + - e.getMessage()); + e.getMessage()); } File templateProp = new File(tmpltPath + "/template.properties"); @@ -2421,8 +2438,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv loc.addFormat(info); loc.save(); - return new CreatePrivateTemplateAnswer(cmd, true, null, templateInstallFolder + cmd.getUniqueName() + ".qcow2", info.virtualSize, info.size, cmd.getUniqueName(), - ImageFormat.QCOW2); + return new CreatePrivateTemplateAnswer(cmd, true, null, templateInstallFolder + cmd.getUniqueName() + ".qcow2", info.virtualSize, info.size, + cmd.getUniqueName(), ImageFormat.QCOW2); } catch (InternalErrorException e) { return new CreatePrivateTemplateAnswer(cmd, false, e.toString()); } catch (IOException e) { @@ -2492,8 +2509,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } protected Answer execute(ModifyStoragePoolCommand cmd) { - KVMStoragePool storagepool = _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), - cmd.getPool().getUserInfo(), cmd.getPool().getType()); + KVMStoragePool storagepool = + _storagePoolMgr.createStoragePool(cmd.getPool().getUuid(), cmd.getPool().getHost(), cmd.getPool().getPort(), cmd.getPool().getPath(), cmd.getPool() + .getUserInfo(), cmd.getPool().getType()); if (storagepool == null) { return new Answer(cmd, false, " Failed to create storage pool"); } @@ -2516,15 +2534,16 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return new SecurityGroupRuleAnswer(cmd, false, e.toString()); } - boolean result = add_network_rules(cmd.getVmName(), Long.toString(cmd.getVmId()), cmd.getGuestIp(), cmd.getSignature(), Long.toString(cmd.getSeqNum()), cmd.getGuestMac(), - cmd.stringifyRules(), vif, brname, cmd.getSecIpsString()); + boolean result = + add_network_rules(cmd.getVmName(), Long.toString(cmd.getVmId()), cmd.getGuestIp(), cmd.getSignature(), Long.toString(cmd.getSeqNum()), cmd.getGuestMac(), + cmd.stringifyRules(), vif, brname, cmd.getSecIpsString()); if (!result) { s_logger.warn("Failed to program network rules for vm " + cmd.getVmName()); return new SecurityGroupRuleAnswer(cmd, false, "programming network rules failed"); } else { s_logger.debug("Programmed network rules for vm " + cmd.getVmName() + " guestIp=" + cmd.getGuestIp() + ",ingress numrules=" + cmd.getIngressRuleSet().length + - ",egress numrules=" + cmd.getEgressRuleSet().length); + ",egress numrules=" + cmd.getEgressRuleSet().length); return new SecurityGroupRuleAnswer(cmd); } } @@ -2614,8 +2633,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv Connect conn = LibvirtConnection.getConnectionByVmName(cmd.getVmName()); KVMStoragePool primary = _storagePoolMgr.getStoragePool(cmd.getPooltype(), cmd.getPoolUuid()); KVMPhysicalDisk disk = primary.getPhysicalDisk(cmd.getVolumePath()); - attachOrDetachDisk(conn, cmd.getAttach(), cmd.getVmName(), disk, cmd.getDeviceId().intValue(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), - cmd.getIopsWriteRate()); + attachOrDetachDisk(conn, cmd.getAttach(), cmd.getVmName(), disk, cmd.getDeviceId().intValue(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), + cmd.getIopsReadRate(), cmd.getIopsWriteRate()); } catch (LibvirtException e) { return new AttachVolumeAnswer(cmd, e.toString()); } catch (InternalErrorException e) { @@ -3522,8 +3541,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv We store the secret under the UUID of the pool, that's why we pass the pool's UUID as the authSecret */ - disk.defNetworkBasedDisk(physicalDisk.getPath().replace("rbd:", ""), pool.getSourceHost(), pool.getSourcePort(), pool.getAuthUserName(), pool.getUuid(), devId, - diskBusType, diskProtocol.RBD); + disk.defNetworkBasedDisk(physicalDisk.getPath().replace("rbd:", ""), pool.getSourceHost(), pool.getSourcePort(), pool.getAuthUserName(), + pool.getUuid(), devId, diskBusType, diskProtocol.RBD); } else if (pool.getType() == StoragePoolType.CLVM || physicalDisk.getFormat() == PhysicalDiskFormat.RAW) { disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusType); } else { @@ -3772,8 +3791,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv final List info = getHostInfo(); - final StartupRoutingCommand cmd = new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), - _hypervisorType, RouterPrivateIpStrategy.HostLocal); + final StartupRoutingCommand cmd = + new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), _hypervisorType, + RouterPrivateIpStrategy.HostLocal); cmd.setStateChanges(changes); cmd.setCpuSockets((Integer)info.get(5)); fillNetworkInformation(cmd); @@ -3788,8 +3808,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv try { KVMStoragePool localStoragePool = _storagePoolMgr.createStoragePool(_localStorageUUID, "localhost", -1, _localStoragePath, "", StoragePoolType.Filesystem); - com.cloud.agent.api.StoragePoolInfo pi = new com.cloud.agent.api.StoragePoolInfo(localStoragePool.getUuid(), cmd.getPrivateIpAddress(), _localStoragePath, - _localStoragePath, StoragePoolType.Filesystem, localStoragePool.getCapacity(), localStoragePool.getAvailable()); + com.cloud.agent.api.StoragePoolInfo pi = + new com.cloud.agent.api.StoragePoolInfo(localStoragePool.getUuid(), cmd.getPrivateIpAddress(), _localStoragePath, _localStoragePath, + StoragePoolType.Filesystem, localStoragePool.getCapacity(), localStoragePool.getAvailable()); sscmd = new StartupStorageCommand(); sscmd.setPoolInfo(pi); @@ -4470,9 +4491,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv String guestOSName = KVMGuestOsMapper.getGuestOsName(guestOS); if (guestOS.startsWith("Ubuntu") || guestOSName.startsWith("Fedora 13") || guestOSName.startsWith("Fedora 12") || guestOSName.startsWith("Fedora 11") || guestOSName.startsWith("Fedora 10") || guestOSName.startsWith("Fedora 9") || guestOSName.startsWith("CentOS 5.3") || guestOSName.startsWith("CentOS 5.4") || - guestOSName.startsWith("CentOS 5.5") || guestOS.startsWith("CentOS") || guestOS.startsWith("Fedora") || guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || - guestOSName.startsWith("Red Hat Enterprise Linux 5.4") || guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || - guestOSName.startsWith("Red Hat Enterprise Linux 6") || guestOS.startsWith("Debian GNU/Linux") || guestOSName.startsWith("Other PV")) { + guestOSName.startsWith("CentOS 5.5") || guestOS.startsWith("CentOS") || guestOS.startsWith("Fedora") || + guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || guestOSName.startsWith("Red Hat Enterprise Linux 5.4") || + guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || guestOSName.startsWith("Red Hat Enterprise Linux 6") || guestOS.startsWith("Debian GNU/Linux") || + guestOSName.startsWith("Other PV")) { return true; } else { return false; @@ -4815,7 +4837,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return true; } - private boolean add_network_rules(String vmName, String vmId, String guestIP, String sig, String seq, String mac, String rules, String vif, String brname, String secIps) { + private boolean add_network_rules(String vmName, String vmId, String guestIP, String sig, String seq, String mac, String rules, String vif, String brname, + String secIps) { if (!_can_bridge_firewall) { return false; } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java index 56c6fdebe2b..53f7fb06f66 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java @@ -25,7 +25,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -35,7 +34,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef; -import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskProtocol; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef; import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef.nicModel; @@ -195,7 +193,7 @@ public class LibvirtDomainXMLParser { NodeList nlList = tagNodeList.item(0).getChildNodes(); - Node nValue = (Node)nlList.item(0); + Node nValue = nlList.item(0); return nValue.getNodeValue(); } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java index b05160e3448..d68f3a88fd9 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java @@ -92,10 +92,10 @@ public class LibvirtSecretDef { secretBuilder.append("" + _description + "\n"); } secretBuilder.append("\n"); - if (_usage == _usage.VOLUME) { + if (_usage == usage.VOLUME) { secretBuilder.append("" + _volumeVolume + "\n"); } - if (_usage == _usage.CEPH) { + if (_usage == usage.CEPH) { secretBuilder.append("" + _cephName + "\n"); } secretBuilder.append("\n"); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java index 5e4b430b6bd..a6186f6ba69 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java @@ -24,7 +24,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.log4j.Logger; -import org.w3c.dom.*; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -84,7 +87,7 @@ public class LibvirtStoragePoolXMLParser { private static String getTagValue(String tag, Element eElement) { NodeList nlList = eElement.getElementsByTagName(tag).item(0).getChildNodes(); - Node nValue = (Node)nlList.item(0); + Node nValue = nlList.item(0); return nValue.getNodeValue(); } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java index 939b51a99fb..79957b2aec1 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java @@ -62,7 +62,7 @@ public class LibvirtStorageVolumeXMLParser { private static String getTagValue(String tag, Element eElement) { NodeList nlList = eElement.getElementsByTagName(tag).item(0).getChildNodes(); - Node nValue = (Node)nlList.item(0); + Node nValue = nlList.item(0); return nValue.getNodeValue(); } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 010579425c1..96fad193b6a 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; public class LibvirtVMDef { private String _hvsType; @@ -638,7 +637,8 @@ public class LibvirtVMDef { if ((_deviceType != deviceType.CDROM) && (_libvirtVersion >= 9008) && (_qemuVersion >= 1001000) && - (((_bytesReadRate != null) && (_bytesReadRate > 0)) || ((_bytesWriteRate != null) && (_bytesWriteRate > 0)) || ((_iopsReadRate != null) && (_iopsReadRate > 0)) || ((_iopsWriteRate != null) && (_iopsWriteRate > 0)))) { // not CDROM, from libvirt 0.9.8 and QEMU 1.1.0 + (((_bytesReadRate != null) && (_bytesReadRate > 0)) || ((_bytesWriteRate != null) && (_bytesWriteRate > 0)) || + ((_iopsReadRate != null) && (_iopsReadRate > 0)) || ((_iopsWriteRate != null) && (_iopsWriteRate > 0)))) { // not CDROM, from libvirt 0.9.8 and QEMU 1.1.0 diskBuilder.append("\n"); if ((_bytesReadRate != null) && (_bytesReadRate > 0)) diskBuilder.append("" + _bytesReadRate + "\n"); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java index 8c6cd72feee..dc60f077ac1 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java @@ -143,7 +143,7 @@ public class OvsVifDriver extends VifDriverBase { } if (!foundLinkLocalBr) { Script.runSimpleBashScript("ifconfig " + linkLocalBr + " 169.254.0.1;" + "ip route add " + NetUtils.getLinkLocalCIDR() + " dev " + linkLocalBr + " src " + - NetUtils.getLinkLocalGateway()); + NetUtils.getLinkLocalGateway()); } } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java index b9d50c85fed..dc77a2eae64 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriver.java @@ -19,12 +19,14 @@ package com.cloud.hypervisor.kvm.resource; -import com.cloud.agent.api.to.NicTO; -import com.cloud.exception.InternalErrorException; -import org.libvirt.LibvirtException; +import java.util.Map; import javax.naming.ConfigurationException; -import java.util.Map; + +import org.libvirt.LibvirtException; + +import com.cloud.agent.api.to.NicTO; +import com.cloud.exception.InternalErrorException; public interface VifDriver { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 5eef81e7419..d89d71a1b2a 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -19,12 +19,14 @@ package com.cloud.hypervisor.kvm.resource; -import com.cloud.agent.api.to.NicTO; -import com.cloud.exception.InternalErrorException; -import org.libvirt.LibvirtException; +import java.util.Map; import javax.naming.ConfigurationException; -import java.util.Map; + +import org.libvirt.LibvirtException; + +import com.cloud.agent.api.to.NicTO; +import com.cloud.exception.InternalErrorException; public abstract class VifDriverBase implements VifDriver { @@ -39,8 +41,10 @@ public abstract class VifDriverBase implements VifDriver { _pifs = (Map)params.get("libvirt.host.pifs"); } + @Override public abstract LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType) throws InternalErrorException, LibvirtException; + @Override public abstract void unplug(LibvirtVMDef.InterfaceDef iface); protected LibvirtVMDef.InterfaceDef.nicModel getGuestNicModel(String guestOSType) { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java index c704a4fa53a..ca3d32f08f9 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; + import com.cloud.storage.Storage.StoragePoolType; public interface KVMStoragePool { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index 85e5c936ddf..08286e408cc 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -18,18 +18,21 @@ package com.cloud.hypervisor.kvm.storage; import java.net.URI; import java.net.URISyntaxException; -import java.util.List; import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; -import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.DiskTO; - +import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.kvm.resource.KVMHABase; import com.cloud.hypervisor.kvm.resource.KVMHABase.PoolType; import com.cloud.hypervisor.kvm.resource.KVMHAMonitor; @@ -37,10 +40,6 @@ import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageLayer; import com.cloud.storage.Volume; import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.log4j.Logger; - -import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; -import org.apache.cloudstack.storage.to.VolumeObjectTO; public class KVMStoragePoolManager { private static final Logger s_logger = Logger.getLogger(KVMStoragePoolManager.class); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index eea8b66b391..db7706c2fd2 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -18,6 +18,8 @@ */ package com.cloud.hypervisor.kvm.storage; +import static com.cloud.utils.S3Utils.putFile; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -35,6 +37,21 @@ import java.util.UUID; import javax.naming.ConfigurationException; +import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; +import org.libvirt.Connect; +import org.libvirt.Domain; +import org.libvirt.DomainInfo; +import org.libvirt.DomainSnapshot; +import org.libvirt.LibvirtException; + +import com.ceph.rados.IoCTX; +import com.ceph.rados.Rados; +import com.ceph.rados.RadosException; +import com.ceph.rbd.Rbd; +import com.ceph.rbd.RbdException; +import com.ceph.rbd.RbdImage; + import org.apache.cloudstack.storage.command.AttachAnswer; import org.apache.cloudstack.storage.command.AttachCommand; import org.apache.cloudstack.storage.command.CopyCmdAnswer; @@ -54,20 +71,7 @@ import org.apache.cloudstack.utils.qemu.QemuImg; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import org.apache.cloudstack.utils.qemu.QemuImgException; import org.apache.cloudstack.utils.qemu.QemuImgFile; -import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; -import org.libvirt.Connect; -import org.libvirt.Domain; -import org.libvirt.DomainInfo; -import org.libvirt.DomainSnapshot; -import org.libvirt.LibvirtException; -import com.ceph.rados.IoCTX; -import com.ceph.rados.Rados; -import com.ceph.rados.RadosException; -import com.ceph.rbd.Rbd; -import com.ceph.rbd.RbdException; -import com.ceph.rbd.RbdImage; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer; import com.cloud.agent.api.to.DataObjectType; @@ -96,8 +100,6 @@ import com.cloud.utils.S3Utils; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; -import static com.cloud.utils.S3Utils.putFile; - public class KVMStorageProcessor implements StorageProcessor { private static final Logger s_logger = Logger.getLogger(KVMStorageProcessor.class); private KVMStoragePoolManager storagePoolMgr; @@ -354,8 +356,9 @@ public class KVMStorageProcessor implements StorageProcessor { primaryPool = storagePoolMgr.getStoragePool(primaryStore.getPoolType(), primaryStore.getUuid()); } catch (CloudRuntimeException e) { if (e.getMessage().contains("not found")) { - primaryPool = storagePoolMgr.createStoragePool(primaryStore.getUuid(), primaryStore.getHost(), primaryStore.getPort(), primaryStore.getPath(), null, - primaryStore.getPoolType()); + primaryPool = + storagePoolMgr.createStoragePool(primaryStore.getUuid(), primaryStore.getHost(), primaryStore.getPort(), primaryStore.getPath(), null, + primaryStore.getPoolType()); } else { return new CopyCmdAnswer(e.getMessage()); } @@ -475,8 +478,9 @@ public class KVMStorageProcessor implements StorageProcessor { } else { s_logger.debug("Converting RBD disk " + disk.getPath() + " into template " + templateName); - QemuImgFile srcFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(primary.getSourceHost(), primary.getSourcePort(), primary.getAuthUserName(), - primary.getAuthSecret(), disk.getPath())); + QemuImgFile srcFile = + new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(primary.getSourceHost(), primary.getSourcePort(), primary.getAuthUserName(), + primary.getAuthSecret(), disk.getPath())); srcFile.setFormat(PhysicalDiskFormat.RAW); QemuImgFile destFile = new QemuImgFile(tmpltPath + "/" + templateName + ".qcow2"); @@ -487,7 +491,7 @@ public class KVMStorageProcessor implements StorageProcessor { q.convert(srcFile, destFile); } catch (QemuImgException e) { s_logger.error("Failed to create new template while converting " + srcFile.getFileName() + " to " + destFile.getFileName() + " the error was: " + - e.getMessage()); + e.getMessage()); } File templateProp = new File(tmpltPath + "/template.properties"); @@ -1023,8 +1027,8 @@ public class KVMStorageProcessor implements StorageProcessor { } } - protected static MessageFormat SnapshotXML = new MessageFormat(" " + " {0}" + " " + " {1}" - + " " + " "); + protected static MessageFormat SnapshotXML = new MessageFormat(" " + " {0}" + " " + + " {1}" + " " + " "); @Override public Answer createSnapshot(CreateObjectCommand cmd) { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java index 86cbbbecd79..d83528f5770 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageResource.java @@ -58,31 +58,31 @@ public class KVMStorageResource { } protected Answer execute(CopyCommand cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(AttachPrimaryDataStoreCmd cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(CreatePrimaryDataStoreCmd cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(CreateObjectCommand cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(DeleteCommand cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(AttachCommand cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } protected Answer execute(DettachCommand cmd) { - return new Answer((Command)cmd, false, "not implemented yet"); + return new Answer(cmd, false, "not implemented yet"); } } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index bbdddd762fc..82d0f8d41cf 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -16,45 +16,48 @@ // under the License. package com.cloud.hypervisor.kvm.storage; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.BufferedInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import java.util.Map; -import org.apache.log4j.Logger; +import java.util.UUID; + import org.apache.commons.codec.binary.Base64; -import org.apache.cloudstack.utils.qemu.QemuImg; -import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; -import org.apache.cloudstack.utils.qemu.QemuImgFile; -import org.apache.cloudstack.utils.qemu.QemuImgException; +import org.apache.log4j.Logger; import org.libvirt.Connect; import org.libvirt.LibvirtException; import org.libvirt.Secret; import org.libvirt.StoragePool; -import org.libvirt.StorageVol; import org.libvirt.StoragePoolInfo.StoragePoolState; +import org.libvirt.StorageVol; + +import com.ceph.rados.IoCTX; import com.ceph.rados.Rados; import com.ceph.rados.RadosException; -import com.ceph.rados.IoCTX; import com.ceph.rbd.Rbd; -import com.ceph.rbd.RbdImage; import com.ceph.rbd.RbdException; +import com.ceph.rbd.RbdImage; import com.ceph.rbd.jna.RbdSnapInfo; +import org.apache.cloudstack.utils.qemu.QemuImg; +import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; +import org.apache.cloudstack.utils.qemu.QemuImgException; +import org.apache.cloudstack.utils.qemu.QemuImgFile; + +import com.cloud.exception.InternalErrorException; import com.cloud.hypervisor.kvm.resource.LibvirtConnection; import com.cloud.hypervisor.kvm.resource.LibvirtSecretDef; import com.cloud.hypervisor.kvm.resource.LibvirtSecretDef.usage; import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef; +import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef.authType; +import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef.poolType; import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolXMLParser; import com.cloud.hypervisor.kvm.resource.LibvirtStorageVolumeDef; -import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef.poolType; -import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef.authType; import com.cloud.hypervisor.kvm.resource.LibvirtStorageVolumeDef.volFormat; import com.cloud.hypervisor.kvm.resource.LibvirtStorageVolumeXMLParser; -import com.cloud.exception.InternalErrorException; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageLayer; import com.cloud.utils.exception.CloudRuntimeException; @@ -467,8 +470,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { String targetPath = pdef.getTargetPath(); if (targetPath != null && targetPath.equals(path)) { - s_logger.debug("Storage pool utilizing path '" + path + "' already exists as pool " + poolname + ", undefining so we can re-define with correct name " + - name); + s_logger.debug("Storage pool utilizing path '" + path + "' already exists as pool " + poolname + + ", undefining so we can re-define with correct name " + name); if (p.isPersistent() == 1) { p.destroy(); p.undefine(); @@ -524,8 +527,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { String error = e.toString(); if (error.contains("Storage source conflict")) { throw new CloudRuntimeException("A pool matching this location already exists in libvirt, " + - " but has a different UUID/Name. Cannot create new pool without first " + - " removing it. Check for inactive pools via 'virsh pool-list --all'. " + error); + " but has a different UUID/Name. Cannot create new pool without first " + " removing it. Check for inactive pools via 'virsh pool-list --all'. " + + error); } else { throw new CloudRuntimeException(error); } @@ -577,7 +580,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { if (e.toString().contains("exit status 16")) { String targetPath = _mountPoint + File.separator + uuid; s_logger.error("deleteStoragePool removed pool from libvirt, but libvirt had trouble" + "unmounting the pool. Trying umount location " + targetPath + - "again in a few seconds"); + "again in a few seconds"); String result = Script.runSimpleBashScript("sleep 5 && umount " + targetPath); if (result == null) { s_logger.error("Succeeded in unmounting " + targetPath); @@ -813,8 +816,9 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { QemuImg qemu = new QemuImg(timeout); QemuImgFile srcFile; - QemuImgFile destFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool.getSourceHost(), destPool.getSourcePort(), destPool.getAuthUserName(), - destPool.getAuthSecret(), disk.getPath())); + QemuImgFile destFile = + new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool.getSourceHost(), destPool.getSourcePort(), destPool.getAuthUserName(), + destPool.getAuthSecret(), disk.getPath())); destFile.setFormat(format); if (srcPool.getType() != StoragePoolType.RBD) { @@ -847,8 +851,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { if (srcImage.isOldFormat()) { /* The source image is RBD format 1, we have to do a regular copy */ - s_logger.debug("The source image " + srcPool.getSourceDir() + "/" + template.getName() + " is RBD format 1. We have to perform a regular copy (" + - template.getVirtualSize() + " bytes)"); + s_logger.debug("The source image " + srcPool.getSourceDir() + "/" + template.getName() + + " is RBD format 1. We have to perform a regular copy (" + template.getVirtualSize() + " bytes)"); rbd.create(disk.getName(), template.getVirtualSize(), this.rbdFeatures, this.rbdOrder); RbdImage destImage = rbd.open(disk.getName()); @@ -860,7 +864,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { rbd.close(destImage); } else { s_logger.debug("The source image " + srcPool.getSourceDir() + "/" + template.getName() + - " is RBD format 2. We will perform a RBD clone using snapshot " + this.rbdTemplateSnapName); + " is RBD format 2. We will perform a RBD clone using snapshot " + this.rbdTemplateSnapName); /* The source image is format 2, we can do a RBD snapshot+clone (layering) */ rbd.clone(template.getName(), this.rbdTemplateSnapName, io, disk.getName(), this.rbdFeatures, this.rbdOrder); s_logger.debug("Succesfully cloned " + template.getName() + "@" + this.rbdTemplateSnapName + " to " + disk.getName()); @@ -890,14 +894,15 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { IoCTX dIO = rDest.ioCtxCreate(destPool.getSourceDir()); Rbd dRbd = new Rbd(dIO); - s_logger.debug("Creating " + disk.getName() + " on the destination cluster " + rDest.confGet("mon_host") + " in pool " + destPool.getSourceDir()); + s_logger.debug("Creating " + disk.getName() + " on the destination cluster " + rDest.confGet("mon_host") + " in pool " + + destPool.getSourceDir()); dRbd.create(disk.getName(), template.getVirtualSize(), this.rbdFeatures, this.rbdOrder); RbdImage srcImage = sRbd.open(template.getName()); RbdImage destImage = dRbd.open(disk.getName()); s_logger.debug("Copying " + template.getName() + " from Ceph cluster " + rSrc.confGet("mon_host") + " to " + disk.getName() + " on cluster " + - rDest.confGet("mon_host")); + rDest.confGet("mon_host")); sRbd.copy(srcImage, destImage); sRbd.close(srcImage); @@ -1119,8 +1124,9 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { We let Qemu-Img do the work here. Although we could work with librbd and have that do the cloning it doesn't benefit us. It's better to keep the current code in place which works */ - srcFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(srcPool.getSourceHost(), srcPool.getSourcePort(), srcPool.getAuthUserName(), srcPool.getAuthSecret(), - sourcePath)); + srcFile = + new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(srcPool.getSourceHost(), srcPool.getSourcePort(), srcPool.getAuthUserName(), srcPool.getAuthSecret(), + sourcePath)); srcFile.setFormat(sourceFormat); destFile = new QemuImgFile(destPath); destFile.setFormat(destFormat); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java index 308a403ce97..550bd0148a3 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java @@ -20,12 +20,13 @@ import java.io.File; import java.util.List; import java.util.Map; -import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import org.apache.log4j.Logger; import org.libvirt.StoragePool; +import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; + import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.utils.exception.CloudRuntimeException; public class LibvirtStoragePool implements KVMStoragePool { private static final Logger s_logger = Logger.getLogger(LibvirtStoragePool.class); @@ -80,6 +81,7 @@ public class LibvirtStoragePool implements KVMStoragePool { return this.used; } + @Override public long getAvailable() { return this.available; } @@ -92,6 +94,7 @@ public class LibvirtStoragePool implements KVMStoragePool { return this.name; } + @Override public String getUuid() { return this.uuid; } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java index 0d53e1c696c..c751aabdde9 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; + import com.cloud.storage.Storage.StoragePoolType; public interface StorageAdaptor { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/iScsiAdmStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/iScsiAdmStorageAdaptor.java index 27743097cbd..3c500348dae 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/iScsiAdmStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/iScsiAdmStorageAdaptor.java @@ -16,11 +16,12 @@ // under the License. package com.cloud.hypervisor.kvm.storage; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.log4j.Logger; + import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import com.cloud.agent.api.to.DiskTO; diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java index 8ddced0da18..8c23f1ee802 100644 --- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java +++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java @@ -16,16 +16,11 @@ // under the License. package org.apache.cloudstack.utils.qemu; -import org.apache.cloudstack.utils.qemu.QemuImgFile; -import org.apache.cloudstack.utils.qemu.QemuImgException; - -import com.cloud.utils.script.Script; -import com.cloud.utils.script.OutputInterpreter; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import java.util.HashMap; +import java.util.Map; + +import com.cloud.utils.script.OutputInterpreter; +import com.cloud.utils.script.Script; public class QemuImg { @@ -42,6 +37,7 @@ public class QemuImg { this.format = format; } + @Override public String toString() { return this.format; } diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index fb0913a4314..7e812dbea6d 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -39,6 +39,7 @@ import org.libvirt.DomainInfo; import org.libvirt.DomainInterfaceStats; import org.libvirt.LibvirtException; import org.libvirt.NodeInfo; +import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -156,7 +157,8 @@ public class LibvirtComputingResourceTest { String vncPassword = "mySuperSecretPassword"; LibvirtComputingResource lcr = new LibvirtComputingResource(); - VirtualMachineTO to = new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, minSpeed, maxSpeed, minRam, maxRam, BootloaderType.HVM, os, false, false, vncPassword); + VirtualMachineTO to = + new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, minSpeed, maxSpeed, minRam, maxRam, BootloaderType.HVM, os, false, false, vncPassword); to.setVncAddr(vncAddr); to.setUuid("b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9"); @@ -245,7 +247,7 @@ public class LibvirtComputingResourceTest { nodeInfo.model = "Foo processor"; Mockito.when(connect.nodeInfo()).thenReturn(nodeInfo); // this is testing the interface stats, returns an increasing number of sent and received bytes - Mockito.when(domain.interfaceStats(Mockito.anyString())).thenAnswer(new Answer() { + Mockito.when(domain.interfaceStats(Matchers.anyString())).thenAnswer(new Answer() { // increment with less than a KB, so this should be less than 1 KB final static int increment = 1000; int rx_bytes = 1000; @@ -262,7 +264,7 @@ public class LibvirtComputingResourceTest { }); - Mockito.when(domain.blockStats(Mockito.anyString())).thenAnswer(new Answer() { + Mockito.when(domain.blockStats(Matchers.anyString())).thenAnswer(new Answer() { // a little less than a KB final static int increment = 1000; diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java index 6c04fd3b021..90b8c3b7a2f 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java @@ -27,8 +27,9 @@ public class LibvirtVMDefTest extends TestCase { LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef(); ifDef.defEthernet("targetDeviceName", "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.nicModel.VIRTIO); - String expected = "\n" + "\n" + "\n" + "\n" - + "\n"; + String expected = + "\n" + "\n" + "\n" + "\n" + + "\n"; assertEquals(expected, ifDef.toString()); } @@ -37,8 +38,9 @@ public class LibvirtVMDefTest extends TestCase { LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef(); ifDef.defDirectNet("targetDeviceName", null, "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.nicModel.VIRTIO, "private"); - String expected = "\n" + "\n" + - "\n" + "\n" + "\n"; + String expected = + "\n" + "\n" + + "\n" + "\n" + "\n"; assertEquals(expected, ifDef.toString()); } diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java index 05550d7fe42..0b7fb914853 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVifDriverTest.java @@ -19,19 +19,23 @@ package com.cloud.hypervisor.kvm.resource; -import com.cloud.network.Networks.TrafficType; -import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource.BridgeType; - -import org.junit.Before; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import static org.mockito.Matchers.anyMap; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import java.util.HashMap; import java.util.Map; + import javax.naming.ConfigurationException; -import static org.mockito.Mockito.*; +import org.junit.Before; +import org.junit.Test; + +import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource.BridgeType; +import com.cloud.network.Networks.TrafficType; public class LibvirtVifDriverTest { private LibvirtComputingResource res; diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java index b0ef6fc0a95..817c5f0a484 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java @@ -18,13 +18,11 @@ */ package com.cloud.hypervisor.kvm.storage; -import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource; +import javax.naming.ConfigurationException; + import org.junit.Before; import org.junit.Test; -import javax.naming.ConfigurationException; -import java.util.HashMap; - public class KVMStorageProcessorTest { @Before public void setUp() throws ConfigurationException { diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java b/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java index 9fe057f0359..9c4becdcdc0 100644 --- a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java +++ b/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgFileTest.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.utils.qemu; +import static org.junit.Assert.assertEquals; + import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import org.apache.cloudstack.utils.qemu.QemuImgFile; + import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; @Ignore diff --git a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java b/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java index 140028ba43a..8bdff4d7875 100644 --- a/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java +++ b/plugins/hypervisors/kvm/test/org/apache/cloudstack/utils/qemu/QemuImgTest.java @@ -16,16 +16,18 @@ // under the License. package org.apache.cloudstack.utils.qemu; -import org.junit.Ignore; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.apache.cloudstack.utils.qemu.QemuImgFile; -import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; -import java.util.Map; -import java.util.HashMap; -import java.util.UUID; + import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import org.junit.Ignore; +import org.junit.Test; + +import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; @Ignore public class QemuImgTest { diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java index eba7ae56ef6..b72004038c2 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java @@ -93,8 +93,8 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) throws DiscoveryException { Connection conn = null; if (!url.getScheme().equals("http")) { @@ -153,7 +153,8 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc sshConnection.connect(null, 60000, 60000); sshConnection = SSHCmdHelper.acquireAuthorizedConnection(hostIp, username, password); if (sshConnection == null) { - throw new DiscoveryException(String.format("Cannot connect to ovm host(IP=%1$s, username=%2$s, password=%3$s, discover failed", hostIp, username, password)); + throw new DiscoveryException(String.format("Cannot connect to ovm host(IP=%1$s, username=%2$s, password=%3$s, discover failed", hostIp, username, + password)); } if (!SSHCmdHelper.sshExecuteCmd(sshConnection, "[ -f '/etc/ovs-agent/agent.ini' ]")) { diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java index 00fb76d652c..ed25fa88526 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java @@ -29,12 +29,14 @@ import java.util.concurrent.ConcurrentHashMap; import javax.naming.ConfigurationException; -import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; import com.trilead.ssh2.SCPClient; + +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; + import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachIsoCommand; @@ -133,7 +135,6 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; import com.cloud.vm.VirtualMachine.State; -import com.trilead.ssh2.SCPClient; public class OvmResourceBase implements ServerResource, HypervisorResource { private static final Logger s_logger = Logger.getLogger(OvmResourceBase.class); @@ -513,8 +514,9 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { vol = OvmVolume.createDataDsik(_conn, primaryStorage.getUuid(), Long.toString(disk.getSize()), disk.getType() == Volume.Type.ROOT); } - VolumeTO volume = new VolumeTO(cmd.getVolumeId(), disk.getType(), primaryStorage.getType(), primaryStorage.getUuid(), primaryStorage.getPath(), vol.name, vol.path, - vol.size, null); + VolumeTO volume = + new VolumeTO(cmd.getVolumeId(), disk.getType(), primaryStorage.getType(), primaryStorage.getUuid(), primaryStorage.getPath(), vol.name, vol.path, + vol.size, null); return new CreateAnswer(cmd, volume); } catch (Exception e) { s_logger.debug("CreateCommand failed", e); @@ -1115,8 +1117,9 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { OvmVif.Details vif = getVifFromVm(cmd.getVmName(), null); String vifDeviceName = vif.name; String bridgeName = vif.bridge; - result = addNetworkRules(cmd.getVmName(), Long.toString(cmd.getVmId()), cmd.getGuestIp(), cmd.getSignature(), String.valueOf(cmd.getSeqNum()), cmd.getGuestMac(), - cmd.stringifyRules(), vifDeviceName, bridgeName); + result = + addNetworkRules(cmd.getVmName(), Long.toString(cmd.getVmId()), cmd.getGuestIp(), cmd.getSignature(), String.valueOf(cmd.getSeqNum()), cmd.getGuestMac(), + cmd.stringifyRules(), vifDeviceName, bridgeName); } catch (XmlRpcException e) { s_logger.error(e); result = false; @@ -1127,7 +1130,7 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { return new SecurityGroupRuleAnswer(cmd, false, "programming network rules failed"); } else { s_logger.info("Programmed network rules for vm " + cmd.getVmName() + " guestIp=" + cmd.getGuestIp() + ":ingress num rules=" + cmd.getIngressRuleSet().length + - ":egress num rules=" + cmd.getEgressRuleSet().length); + ":egress num rules=" + cmd.getEgressRuleSet().length); return new SecurityGroupRuleAnswer(cmd); } } @@ -1171,8 +1174,8 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { return OvmSecurityGroup.deleteAllNetworkRulesForVm(_conn, vmName, vif); } - protected boolean addNetworkRules(String vmName, String vmId, String guestIp, String signature, String seqno, String vifMacAddress, String rules, String vifDeviceName, - String bridgeName) throws XmlRpcException { + protected boolean addNetworkRules(String vmName, String vmId, String guestIp, String signature, String seqno, String vifMacAddress, String rules, + String vifDeviceName, String bridgeName) throws XmlRpcException { if (!_canBridgeFirewall) { return false; } @@ -1308,12 +1311,15 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { break; } if (!isNetworkSetupByName(info.getPrivateNetworkName())) { - msg = "For Physical Network id:" + info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + info.getPrivateNetworkName(); + msg = + "For Physical Network id:" + info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + + info.getPrivateNetworkName(); errorout = true; break; } if (!isNetworkSetupByName(info.getPublicNetworkName())) { - msg = "For Physical Network id:" + info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + info.getPublicNetworkName(); + msg = + "For Physical Network id:" + info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + info.getPublicNetworkName(); errorout = true; break; } diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java index 9b6e7f388d4..9af4016da4e 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Coder.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import com.cloud.ovm.object.OvmHost.Details; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializationContext; @@ -69,7 +68,7 @@ public class Coder { } public static T fromJson(String str, Class clz) { - return (T)_gson.fromJson(str, clz); + return _gson.fromJson(str, clz); } @SuppressWarnings("unchecked") diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java index 11acb36e187..32eab09e43e 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmHost.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.ovm.object; -import java.util.List; import java.util.Map; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java index 6c36b079dc0..8a9f19a7ce7 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java @@ -42,8 +42,8 @@ public class OvmSecurityGroup extends OvmObject { return (Boolean)c.call("OvmSecurityGroup.default_network_rules_user_vm", params); } - public static boolean addNetworkRules(Connection c, String vmName, String vmId, String guestIp, String signature, String seqno, String vifMacAddress, String newRules, - String vifDeviceName, String bridgeName) throws XmlRpcException { + public static boolean addNetworkRules(Connection c, String vmName, String vmId, String guestIp, String signature, String seqno, String vifMacAddress, + String newRules, String vifDeviceName, String bridgeName) throws XmlRpcException { Object[] params = {vmName, vmId, guestIp, signature, seqno, vifMacAddress, newRules, vifDeviceName, bridgeName}; return (Boolean)c.call("OvmSecurityGroup.add_network_rules", params); } diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java index d217ffbcb5b..db9fb255463 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java @@ -84,16 +84,16 @@ public class OvmStoragePool extends OvmObject { c.call("OvmStoragePool.prepareOCFS2Nodes", params); } - public static Map createTemplateFromVolume(Connection c, String secStorageMountPath, String installPath, String volumePath, int timeout) throws XmlRpcException { + public static Map createTemplateFromVolume(Connection c, String secStorageMountPath, String installPath, String volumePath, int timeout) + throws XmlRpcException { Object[] params = {secStorageMountPath, installPath, volumePath}; String res = (String)c.callTimeoutInSec("OvmStoragePool.createTemplateFromVolume", params, timeout); Map info = Coder.mapFromJson(res); return info; } - public static String - copyVolume(Connection c, String secStorageMountPath, String volumeFolderOnSecStorage, String volumePath, String storagePoolUuid, Boolean toSec, int timeout) - throws XmlRpcException { + public static String copyVolume(Connection c, String secStorageMountPath, String volumeFolderOnSecStorage, String volumePath, String storagePoolUuid, Boolean toSec, + int timeout) throws XmlRpcException { Object[] params = {secStorageMountPath, volumeFolderOnSecStorage, volumePath, storagePoolUuid, toSec}; String res = (String)c.callTimeoutInSec("OvmStoragePool.copyVolume", params, timeout); Map info = Coder.mapFromJson(res); diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java index 720a0441ff8..6bbc33f91f6 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmVm.java @@ -22,8 +22,6 @@ import java.util.Map; import org.apache.xmlrpc.XmlRpcException; -import com.cloud.ovm.object.OvmHost.Details; - public class OvmVm extends OvmObject { public static final String CD = "CD"; public static final String HDD = "HDD"; diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java index 4e6c6a00451..080b3cc1062 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java @@ -16,15 +16,10 @@ // under the License. package com.cloud.ovm.object; -import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.cloud.utils.Pair; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - public class Test { public static void main(String[] args) { try { @@ -90,7 +85,8 @@ public class Test { //System.out.println(vm.toJson()); Connection c = new Connection("192.168.189.12", "oracle", "password"); //System.out.println(Coder.toJson(OvmHost.getDetails(c))); - String txt = "{\"MasterIp\": \"192.168.189.12\", \"dom0Memory\": 790626304, \"freeMemory\": 16378757120, \"totalMemory\": 17169383424, \"cpuNum\": 4, \"agentVersion\": \"2.3-38\", \"cpuSpeed\": 2261}"; + String txt = + "{\"MasterIp\": \"192.168.189.12\", \"dom0Memory\": 790626304, \"freeMemory\": 16378757120, \"totalMemory\": 17169383424, \"cpuNum\": 4, \"agentVersion\": \"2.3-38\", \"cpuSpeed\": 2261}"; //OvmHost.Details d = new GsonBuilder().create().fromJson(txt, OvmHost.Details.class); //OvmHost.Details d = Coder.fromJson(txt, OvmHost.Details.class); //OvmHost.Details d = OvmHost.getDetails(c); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java index 2d0d8bd9ad4..0851023a7ef 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManager.java @@ -16,6 +16,10 @@ // under the License. package com.cloud.agent.manager; +import java.util.Map; + +import javax.naming.ConfigurationException; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthCommand; import com.cloud.agent.api.CheckNetworkCommand; @@ -27,19 +31,18 @@ import com.cloud.resource.AgentResourceBase; import com.cloud.simulator.MockHost; import com.cloud.utils.component.Manager; -import javax.naming.ConfigurationException; -import java.util.Map; - public interface MockAgentManager extends Manager { public static final long DEFAULT_HOST_MEM_SIZE = 8 * 1024 * 1024 * 1024L; // 8G, unit of Mbytes public static final int DEFAULT_HOST_CPU_CORES = 4; // 2 dual core CPUs (2 x 2) public static final int DEFAULT_HOST_SPEED_MHZ = 8000; // 1 GHz CPUs + @Override boolean configure(String name, Map params) throws ConfigurationException; Map> createServerResources(Map params); - boolean handleSystemVMStart(long vmId, String privateIpAddress, String privateMacAddress, String privateNetMask, long dcId, long podId, String name, String vmType, String url); + boolean handleSystemVMStart(long vmId, String privateIpAddress, String privateMacAddress, String privateNetMask, long dcId, long podId, String name, String vmType, + String url); boolean handleSystemVMStop(long vmId); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java index 5f43b5c0d83..85f7e856f80 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java @@ -214,8 +214,8 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage } @Override - public boolean handleSystemVMStart(long vmId, String privateIpAddress, String privateMacAddress, String privateNetMask, long dcId, long podId, String name, String vmType, - String url) { + public boolean handleSystemVMStart(long vmId, String privateIpAddress, String privateMacAddress, String privateNetMask, long dcId, long podId, String name, + String vmType, String url) { _executor.execute(new SystemVMHandler(vmId, privateIpAddress, privateMacAddress, privateNetMask, dcId, podId, name, vmType, _simulatorMgr, url)); return true; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java index 335be38b667..a4ffd953ea5 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java @@ -19,6 +19,10 @@ package com.cloud.agent.manager; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckS2SVpnConnectionsCommand; import com.cloud.agent.api.NetworkUsageAnswer; @@ -55,9 +59,6 @@ import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.simulator.MockVMVO; import com.cloud.simulator.dao.MockVMDao; import com.cloud.utils.component.ManagerBase; -import org.apache.log4j.Logger; - -import javax.inject.Inject; public class MockNetworkManagerImpl extends ManagerBase implements MockNetworkManager { private static final Logger s_logger = Logger.getLogger(MockVmManagerImpl.class); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index 3c43acbba86..f821dc8fa87 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -16,6 +16,28 @@ // under the License. package com.cloud.agent.manager; +import java.io.File; +import java.math.BigInteger; +import java.net.URI; +import java.net.URISyntaxException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.storage.command.DeleteCommand; +import org.apache.cloudstack.storage.command.DownloadCommand; +import org.apache.cloudstack.storage.command.DownloadProgressCommand; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachIsoCommand; import com.cloud.agent.api.AttachVolumeAnswer; @@ -53,6 +75,7 @@ import com.cloud.agent.api.storage.ListVolumeCommand; import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer; import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.agent.api.to.DataStoreTO; +import com.cloud.agent.api.to.NfsTO; import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.simulator.MockHost; @@ -71,37 +94,14 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.template.TemplateProp; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine.State; -import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DownloadCommand; -import org.apache.cloudstack.storage.command.DownloadProgressCommand; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import com.cloud.agent.api.to.NfsTO; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.io.File; -import java.math.BigInteger; -import java.net.URI; -import java.net.URISyntaxException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - @Component @Local(value = {MockStorageManager.class}) public class MockStorageManagerImpl extends ManagerBase implements MockStorageManager { @@ -237,8 +237,9 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn.close(); } - VolumeTO volumeTo = new VolumeTO(cmd.getVolumeId(), dskch.getType(), sf.getType(), sf.getUuid(), volume.getName(), storagePool.getMountPoint(), volume.getPath(), - volume.getSize(), null); + VolumeTO volumeTo = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), sf.getType(), sf.getUuid(), volume.getName(), storagePool.getMountPoint(), volume.getPath(), + volume.getSize(), null); return new CreateAnswer(cmd, volumeTo); } @@ -454,8 +455,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa Map templateInfos = new HashMap(); for (MockVolumeVO volume : volumes) { - templateInfos.put(volume.getId(), new TemplateProp(volume.getName(), volume.getPath().replaceAll(storage.getMountPoint(), ""), volume.getSize(), volume.getSize(), - true, false)); + templateInfos.put(volume.getId(), + new TemplateProp(volume.getName(), volume.getPath().replaceAll(storage.getMountPoint(), ""), volume.getSize(), volume.getSize(), true, false)); } txn.commit(); return new ListVolumeAnswer(cmd.getSecUrl(), templateInfos); @@ -487,8 +488,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa Map templateInfos = new HashMap(); for (MockVolumeVO template : templates) { - templateInfos.put(template.getName(), - new TemplateProp(template.getName(), template.getPath().replaceAll(storage.getMountPoint(), ""), template.getSize(), template.getSize(), true, false)); + templateInfos.put(template.getName(), new TemplateProp(template.getName(), template.getPath().replaceAll(storage.getMountPoint(), ""), + template.getSize(), template.getSize(), true, false)); } return new ListTemplateAnswer(nfsUrl, templateInfos); } catch (Exception ex) { @@ -571,8 +572,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB); txn.close(); } - return new DownloadAnswer(String.valueOf(volume.getId()), 0, "Downloading", Status.DOWNLOAD_IN_PROGRESS, cmd.getName(), cmd.getName(), volume.getSize(), volume.getSize(), - null); + return new DownloadAnswer(String.valueOf(volume.getId()), 0, "Downloading", Status.DOWNLOAD_IN_PROGRESS, cmd.getName(), cmd.getName(), volume.getSize(), + volume.getSize(), null); } @Override @@ -595,12 +596,13 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa volume.setStatus(Status.DOWNLOADED); _mockVolumeDao.update(volume.getId(), volume); txn.commit(); - return new DownloadAnswer(cmd.getJobId(), 100, cmd, com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED, volume.getPath(), volume.getName()); + return new DownloadAnswer(cmd.getJobId(), 100, cmd, com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED, volume.getPath(), + volume.getName()); } else { _mockVolumeDao.update(volume.getId(), volume); txn.commit(); - return new DownloadAnswer(cmd.getJobId(), (int)(pct * 100.0), cmd, com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS, volume.getPath(), - volume.getName()); + return new DownloadAnswer(cmd.getJobId(), (int)(pct * 100.0), cmd, com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS, + volume.getPath(), volume.getName()); } } catch (Exception ex) { txn.rollback(); @@ -961,8 +963,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn.close(); } } - return new StoragePoolInfo(storagePool.getUuid(), host.getPrivateIpAddress(), storagePool.getMountPoint(), storagePool.getMountPoint(), storagePool.getPoolType(), - storagePool.getCapacity(), 0); + return new StoragePoolInfo(storagePool.getUuid(), host.getPrivateIpAddress(), storagePool.getMountPoint(), storagePool.getMountPoint(), + storagePool.getPoolType(), storagePool.getCapacity(), 0); } @Override @@ -1020,8 +1022,8 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa txn.close(); } } - return new StoragePoolInfo(storagePool.getUuid(), host.getPrivateIpAddress(), storagePool.getMountPoint(), storagePool.getMountPoint(), storagePool.getPoolType(), - storagePool.getCapacity(), 0); + return new StoragePoolInfo(storagePool.getUuid(), host.getPrivateIpAddress(), storagePool.getMountPoint(), storagePool.getMountPoint(), + storagePool.getPoolType(), storagePool.getCapacity(), 0); } @Override diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java index 0d30e95cc01..bc6cdd73575 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManager.java @@ -16,6 +16,9 @@ // under the License. package com.cloud.agent.manager; +import java.util.HashMap; +import java.util.Map; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.BumpUpPriorityCommand; import com.cloud.agent.api.CheckRouterAnswer; @@ -54,9 +57,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.component.Manager; import com.cloud.vm.VirtualMachine.State; -import java.util.HashMap; -import java.util.Map; - public interface MockVmManager extends Manager { Map getVmStates(String hostGuid); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java index 188b85e9ee3..27002f2a5e9 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java @@ -16,6 +16,19 @@ // under the License. package com.cloud.agent.manager; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.BumpUpPriorityCommand; import com.cloud.agent.api.CheckRouterAnswer; @@ -74,17 +87,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine.State; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; @Component @Local(value = {MockVmManager.class}) @@ -601,8 +603,8 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager { s_logger.info("New seqno received: " + cmd.getSeqNum() + " curr=" + currSeqnum); updateSeqnoAndSig = true; if (!cmd.getSignature().equals(currSig)) { - s_logger.info("New seqno received: " + cmd.getSeqNum() + " curr=" + currSeqnum + " new signature received:" + cmd.getSignature() + " curr=" + currSig + - ", updated iptables"); + s_logger.info("New seqno received: " + cmd.getSeqNum() + " curr=" + currSeqnum + " new signature received:" + cmd.getSignature() + " curr=" + + currSig + ", updated iptables"); action = ", updated iptables"; reason = reason + "seqno_increased_sig_changed"; } else { @@ -614,12 +616,14 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager { reason = reason + "seqno_decreased"; } else { if (!cmd.getSignature().equals(currSig)) { - s_logger.info("Identical seqno received: " + cmd.getSeqNum() + " new signature received:" + cmd.getSignature() + " curr=" + currSig + ", updated iptables"); + s_logger.info("Identical seqno received: " + cmd.getSeqNum() + " new signature received:" + cmd.getSignature() + " curr=" + currSig + + ", updated iptables"); action = ", updated iptables"; reason = reason + "seqno_same_sig_changed"; updateSeqnoAndSig = true; } else { - s_logger.info("Identical seqno received: " + cmd.getSeqNum() + " curr=" + currSeqnum + " no change in signature:" + cmd.getSignature() + ", do nothing"); + s_logger.info("Identical seqno received: " + cmd.getSeqNum() + " curr=" + currSeqnum + " no change in signature:" + cmd.getSignature() + + ", do nothing"); reason = reason + "seqno_same_sig_same"; } } @@ -629,9 +633,9 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager { action = ", updated iptables"; reason = ", seqno_new"; } - s_logger.info("Programmed network rules for vm " + cmd.getVmName() + " seqno=" + cmd.getSeqNum() + " signature=" + cmd.getSignature() + " guestIp=" + cmd.getGuestIp() + - ", numIngressRules=" + cmd.getIngressRuleSet().length + ", numEgressRules=" + cmd.getEgressRuleSet().length + " total cidrs=" + cmd.getTotalNumCidrs() + - action + reason); + s_logger.info("Programmed network rules for vm " + cmd.getVmName() + " seqno=" + cmd.getSeqNum() + " signature=" + cmd.getSignature() + " guestIp=" + + cmd.getGuestIp() + ", numIngressRules=" + cmd.getIngressRuleSet().length + ", numEgressRules=" + cmd.getEgressRuleSet().length + " total cidrs=" + + cmd.getTotalNumCidrs() + action + reason); return updateSeqnoAndSig; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java index e7476e897b7..37394816d24 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -16,6 +16,23 @@ // under the License. package com.cloud.agent.manager; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.storage.command.DeleteCommand; +import org.apache.cloudstack.storage.command.DownloadCommand; +import org.apache.cloudstack.storage.command.DownloadProgressCommand; +import org.apache.cloudstack.storage.command.StorageSubSystemCommand; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachIsoCommand; import com.cloud.agent.api.AttachVolumeCommand; @@ -102,20 +119,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine.State; -import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.command.DownloadCommand; -import org.apache.cloudstack.storage.command.DownloadProgressCommand; -import org.apache.cloudstack.storage.command.StorageSubSystemCommand; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Component @Local(value = {SimulatorManager.class}) diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java b/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java index af339e04f27..c27a363e51c 100755 --- a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java +++ b/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java @@ -16,12 +16,10 @@ // under the License. package com.cloud.api.commands; -import com.cloud.agent.manager.SimulatorManager; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.user.Account; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,9 +27,13 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.log4j.Logger; -import javax.inject.Inject; +import com.cloud.agent.manager.SimulatorManager; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; @APICommand(name = "configureSimulator", description = "configure simulator", responseObject = SuccessResponse.class) public class ConfigureSimulatorCmd extends BaseCmd { @@ -60,7 +62,8 @@ public class ConfigureSimulatorCmd extends BaseCmd { private String values; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { boolean result = _simMgr.configureSimulator(zoneId, podId, clusterId, hostId, command, values); if (!result) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to configure simulator"); diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java index edaa6acd2a6..dbfbba05d86 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java @@ -16,6 +16,21 @@ // under the License. package com.cloud.resource; +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.net.URL; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; + import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; @@ -31,19 +46,6 @@ import com.cloud.host.Host; import com.cloud.host.Host.Type; import com.cloud.simulator.MockHost; import com.cloud.utils.component.ComponentContext; -import org.apache.log4j.Logger; - -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.io.File; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.URL; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; public class AgentResourceBase implements ServerResource { private static final Logger s_logger = Logger.getLogger(AgentResourceBase.class); @@ -108,6 +110,7 @@ public class AgentResourceBase implements ServerResource { return _name; } + @Override public void setName(String name) { _name = name; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java index 1396cc41097..bb2851fef72 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentRoutingResource.java @@ -136,8 +136,9 @@ public class AgentRoutingResource extends AgentStorageResource { List info = getHostInfo(); - StartupRoutingCommand cmd = new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), - HypervisorType.Simulator, RouterPrivateIpStrategy.HostLocal); + StartupRoutingCommand cmd = + new StartupRoutingCommand((Integer)info.get(0), (Long)info.get(1), (Long)info.get(2), (Long)info.get(4), (String)info.get(3), HypervisorType.Simulator, + RouterPrivateIpStrategy.HostLocal); cmd.setStateChanges(changes); Map hostDetails = new HashMap(); diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java index a8ebf4959b8..f52fd60bbbd 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java @@ -21,9 +21,10 @@ import java.util.Map; import javax.naming.ConfigurationException; -import org.apache.cloudstack.storage.resource.SecondaryStorageResource; import org.apache.log4j.Logger; +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.PingCommand; @@ -32,7 +33,6 @@ import com.cloud.agent.api.ReadyAnswer; import com.cloud.agent.api.ReadyCommand; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupSecondaryStorageCommand; -import com.cloud.agent.api.storage.ssCommand; import com.cloud.agent.manager.SimulatorManager; import com.cloud.agent.manager.SimulatorManager.AgentType; import com.cloud.host.Host; diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java index f75b6491f36..d1ebfb557fd 100755 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java @@ -82,8 +82,8 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L * java.lang.Long, java.net.URI, java.lang.String, java.lang.String) */ @Override - public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) throws DiscoveryException { Map> resources; try { @@ -92,10 +92,10 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L String host = uri.getAuthority(); String commands = URLDecoder.decode(uri.getPath()); - long cpuSpeed = _mockAgentMgr.DEFAULT_HOST_SPEED_MHZ; - long cpuCores = _mockAgentMgr.DEFAULT_HOST_CPU_CORES; - long memory = _mockAgentMgr.DEFAULT_HOST_MEM_SIZE; - long localstorageSize = _mockStorageMgr.DEFAULT_HOST_STORAGE_SIZE; + long cpuSpeed = MockAgentManager.DEFAULT_HOST_SPEED_MHZ; + long cpuCores = MockAgentManager.DEFAULT_HOST_CPU_CORES; + long memory = MockAgentManager.DEFAULT_HOST_MEM_SIZE; + long localstorageSize = MockStorageManager.DEFAULT_HOST_STORAGE_SIZE; if (scheme.equals("http")) { if (host == null || !host.startsWith("sim")) { String msg = "uri is not of simulator type so we're not taking care of the discovery for this: " + uri; diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java index 37d14338a05..654eee60305 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java @@ -25,13 +25,12 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.dao.VMTemplateDao; +import org.apache.log4j.Logger; + import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer; import org.apache.cloudstack.storage.resource.SecondaryStorageResource; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -46,9 +45,7 @@ import com.cloud.exception.ConnectionException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; -import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDao; -import com.cloud.utils.exception.CloudRuntimeException; @Local(value = Discoverer.class) public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer implements ResourceStateAdapter, Listener { @@ -77,7 +74,8 @@ public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer imp } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) { + public Map> + find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) { if (!uri.getScheme().equalsIgnoreCase("sim")) { s_logger.debug("It's not NFS or file or ISO, so not a secondary storage server: " + uri.toString()); return null; diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java index eab05adab3f..8a78b87e284 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java @@ -22,6 +22,8 @@ package com.cloud.resource; import java.io.File; import java.util.UUID; +import org.apache.log4j.Logger; + import org.apache.cloudstack.storage.command.AttachAnswer; import org.apache.cloudstack.storage.command.AttachCommand; import org.apache.cloudstack.storage.command.CopyCmdAnswer; @@ -36,7 +38,6 @@ import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DataStoreTO; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java index 4d69241c6eb..585598a6fdb 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java @@ -54,6 +54,7 @@ public class MockConfigurationVO implements InternalIdentity { @Column(name = "values") private String values; + @Override public long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java index 3f7c0ae3dee..89064f8234d 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java @@ -116,6 +116,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.resource = resource; } + @Override public long getCpuSpeed() { return this.cpuSpeed; } @@ -124,6 +125,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.cpuSpeed = cpuSpeed; } + @Override public long getCpuCount() { return this.cpuCount; } @@ -132,6 +134,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.cpuCount = cpuCount; } + @Override public long getMemorySize() { return this.memorySize; } @@ -140,6 +143,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.memorySize = memorySize; } + @Override public String getCapabilities() { return this.capabilities; } @@ -148,10 +152,12 @@ public class MockHostVO implements MockHost, InternalIdentity { this.capabilities = capabilities; } + @Override public long getId() { return id; } + @Override public String getName() { return name; } @@ -160,6 +166,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.name = name; } + @Override public String getGuid() { return this.guid; } @@ -168,6 +175,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.guid = guid; } + @Override public String getVersion() { return this.version; } @@ -176,6 +184,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.version = version; } + @Override public Long getDataCenterId() { return this.dataCenterId; } @@ -184,6 +193,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.dataCenterId = dataCenterId; } + @Override public Long getPodId() { return this.podId; } @@ -192,6 +202,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.podId = podId; } + @Override public Long getClusterId() { return this.clusterId; } @@ -200,6 +211,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.clusterId = clusterId; } + @Override public String getPrivateIpAddress() { return privateIpAddress; } @@ -208,6 +220,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.privateIpAddress = privateIpAddress; } + @Override public String getPrivateNetMask() { return this.privateNetmask; } @@ -216,6 +229,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.privateNetmask = privateNetmask; } + @Override public String getPrivateMacAddress() { return this.privateMacAddress; } @@ -224,6 +238,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.privateMacAddress = privateMacAddress; } + @Override public String getPublicIpAddress() { return this.publicIpAddress; } @@ -232,6 +247,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.publicIpAddress = publicIpAddress; } + @Override public String getPublicNetMask() { return this.publicNetmask; } @@ -240,6 +256,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.publicNetmask = publicNetMask; } + @Override public String getPublicMacAddress() { return this.publicMacAddress; } @@ -248,6 +265,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.publicMacAddress = publicMacAddress; } + @Override public String getStorageIpAddress() { return this.storageIpAddress; } @@ -256,6 +274,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.storageIpAddress = storageIpAddress; } + @Override public String getStorageNetMask() { return this.storageNetMask; } @@ -264,6 +283,7 @@ public class MockHostVO implements MockHost, InternalIdentity { this.storageNetMask = storageNetMask; } + @Override public String getStorageMacAddress() { return this.storageMacAddress; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java index 8fe6760be00..e3867610acf 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java @@ -67,6 +67,7 @@ public class MockSecurityRulesVO implements InternalIdentity { this.hostId = hostId; } + @Override public long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java index bebc043729b..04b4e89eea9 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java @@ -63,14 +63,17 @@ public class MockVMVO implements MockVm, InternalIdentity { } + @Override public long getId() { return this.id; } + @Override public String getName() { return this.name; } + @Override public void setName(String name) { this.name = name; } @@ -79,6 +82,7 @@ public class MockVMVO implements MockVm, InternalIdentity { return this.hostId; } + @Override public void setHostId(long hostId) { this.hostId = hostId; } @@ -91,50 +95,62 @@ public class MockVMVO implements MockVm, InternalIdentity { this.vmType = vmType; } + @Override public State getState() { return this.state; } + @Override public String getType() { return this.vmType; } + @Override public void setState(State state) { this.state = state; } + @Override public int getVncPort() { return this.vncPort; } + @Override public void setVncPort(int vncPort) { this.vncPort = vncPort; } + @Override public long getMemory() { return this.memory; } + @Override public void setMemory(long memory) { this.memory = memory; } + @Override public int getCpu() { return this.cpu; } + @Override public void setCpu(int cpu) { this.cpu = cpu; } + @Override public void setType(String type) { this.vmType = type; } + @Override public String getBootargs() { return bootargs; } + @Override public void setBootargs(String bootargs) { this.bootargs = bootargs; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java index 6cd86885239..040025a8793 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java @@ -16,17 +16,19 @@ // under the License. package com.cloud.simulator.dao; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Formatter; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.simulator.MockConfigurationVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Formatter; @Component @Local(value = {MockConfigurationDao.class}) @@ -120,8 +122,8 @@ public class MockConfigurationDaoImpl extends GenericDaoBase { + @Override public MockStoragePoolVO findByUuid(String uuid); public MockStoragePoolVO findByHost(String hostUuid); diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java index 2101ecfb81b..67d5e4bc9cb 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java @@ -16,14 +16,15 @@ // under the License. package com.cloud.simulator.dao; +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.simulator.MockStoragePoolVO; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; @Component @Local(value = {MockStoragePoolDao.class}) diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java index 1dd0023e6bc..d19dba444e8 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java @@ -16,6 +16,16 @@ // under the License. package com.cloud.simulator.dao; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.springframework.stereotype.Component; + import com.cloud.simulator.MockHostVO; import com.cloud.simulator.MockVMVO; import com.cloud.utils.db.GenericDaoBase; @@ -23,14 +33,6 @@ import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.VirtualMachine; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; @Component @Local(value = {MockVMDao.class}) diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java index 52f06f8d060..bc106962d98 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java @@ -16,6 +16,12 @@ // under the License. package com.cloud.simulator.dao; +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.simulator.MockVolumeVO; import com.cloud.simulator.MockVolumeVO.MockVolumeType; import com.cloud.utils.db.GenericDaoBase; @@ -23,10 +29,6 @@ import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import java.util.List; @Component @Local(value = {MockVolumeDao.class}) diff --git a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java b/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java index 775d7431fad..9e3f4b40749 100644 --- a/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java +++ b/plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java @@ -19,8 +19,14 @@ package org.apache.cloudstack.storage.datastore.provider; -import com.cloud.storage.ScopeType; -import com.cloud.utils.component.ComponentContext; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; + +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -32,12 +38,9 @@ import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; -import org.springframework.stereotype.Component; -import javax.inject.Inject; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import com.cloud.storage.ScopeType; +import com.cloud.utils.component.ComponentContext; @Component public class SimulatorImageStoreProviderImpl implements ImageStoreProvider { diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java index d0190416a41..233a7782d15 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java @@ -50,6 +50,7 @@ public class UcsBladeVO implements InternalIdentity, Identity { @Column(name = "profile_dn") private String profileDn; + @Override public long getId() { return id; } @@ -82,6 +83,7 @@ public class UcsBladeVO implements InternalIdentity, Identity { this.dn = dn; } + @Override public String getUuid() { return uuid; } diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java index 741fd5d710e..5ffabeb633b 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java @@ -17,17 +17,7 @@ // package com.cloud.ucs.database; -import java.util.List; -import java.util.Map; - -import javax.naming.ConfigurationException; - -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDao; -import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.GenericQueryBuilder; public interface UcsManagerDao extends GenericDao { } diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java index fbd4bdd396e..5d88c67fbb7 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java @@ -68,37 +68,39 @@ public class UcsCommands { } public static String associateProfileToBlade(String cookie, String profileDn, String bladeDn) { - XmlObject cmd = new XmlObject("configConfMos").putElement("cookie", cookie) - .putElement("inHierarchical", "true") - .putElement( - "inConfigs", - new XmlObject("inConfigs").putElement( - "pair", - new XmlObject("pair").putElement("key", profileDn).putElement( - "lsServer", - new XmlObject("lsServer").putElement("agentPolicyName", "") - .putElement("biosProfileName", "") - .putElement("bootPolicyName", "") - .putElement("descr", "") - .putElement("dn", profileDn) - .putElement("dynamicConPolicyName", "") - .putElement("extIPState", "none") - .putElement("hostFwPolicyName", "") - .putElement("identPoolName", "") - .putElement("localDiskPolicyName", "") - .putElement("maintPolicyName", "") - .putElement("mgmtAccessPolicyName", "") - .putElement("mgmtFwPolicyName", "") - .putElement("powerPolicyName", "") - .putElement("scrubPolicyName", "") - .putElement("solPolicyName", "") - .putElement("srcTemplName", "") - .putElement("statsPolicyName", "default") - .putElement("status", "") - .putElement("usrLbl", "") - .putElement("uuid", "") - .putElement("vconProfileName", "") - .putElement("lsBinding", new XmlObject("lsBinding").putElement("pnDn", bladeDn).putElement("restrictMigration", "no").putElement("rn", "pn"))))); + XmlObject cmd = + new XmlObject("configConfMos").putElement("cookie", cookie) + .putElement("inHierarchical", "true") + .putElement( + "inConfigs", + new XmlObject("inConfigs").putElement( + "pair", + new XmlObject("pair").putElement("key", profileDn).putElement( + "lsServer", + new XmlObject("lsServer").putElement("agentPolicyName", "") + .putElement("biosProfileName", "") + .putElement("bootPolicyName", "") + .putElement("descr", "") + .putElement("dn", profileDn) + .putElement("dynamicConPolicyName", "") + .putElement("extIPState", "none") + .putElement("hostFwPolicyName", "") + .putElement("identPoolName", "") + .putElement("localDiskPolicyName", "") + .putElement("maintPolicyName", "") + .putElement("mgmtAccessPolicyName", "") + .putElement("mgmtFwPolicyName", "") + .putElement("powerPolicyName", "") + .putElement("scrubPolicyName", "") + .putElement("solPolicyName", "") + .putElement("srcTemplName", "") + .putElement("statsPolicyName", "default") + .putElement("status", "") + .putElement("usrLbl", "") + .putElement("uuid", "") + .putElement("vconProfileName", "") + .putElement("lsBinding", + new XmlObject("lsBinding").putElement("pnDn", bladeDn).putElement("restrictMigration", "no").putElement("rn", "pn"))))); return cmd.dump(); } diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java index 227de69b7b4..797cea60bab 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java @@ -31,6 +31,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.AddUcsManagerCmd; import org.apache.cloudstack.api.AssociateUcsProfileToBladeCmd; import org.apache.cloudstack.api.DeleteUcsManagerCmd; @@ -63,7 +64,6 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.xmlobject.XmlObject; import com.cloud.utils.xmlobject.XmlObjectParser; @@ -327,7 +327,8 @@ public class UcsManagerImpl implements UcsManager { s_logger.debug(String.format("association response is %s", res)); if (xo.get("outConfig.computeBlade.association").equals("none")) { - throw new CloudRuntimeException(String.format("cannot associated a profile to blade[dn:%s]. please check your UCS manasger for detailed error information", dn)); + throw new CloudRuntimeException(String.format("cannot associated a profile to blade[dn:%s]. please check your UCS manasger for detailed error information", + dn)); } return xo.get("outConfig.computeBlade.association").equals("associated"); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java index eba243c8156..17cd3ab4c59 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java @@ -19,23 +19,16 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.UcsManagerResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; import com.cloud.ucs.manager.UcsManager; import com.cloud.user.Account; @@ -62,8 +55,8 @@ public class AddUcsManagerCmd extends BaseCmd { private String password; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { UcsManagerResponse rsp = mgr.addUcsManager(this); rsp.setObjectName("ucsmanager"); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java index fdd8f7bd074..caea0bec21e 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java @@ -19,15 +19,10 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.UcsBladeResponse; import org.apache.cloudstack.api.response.UcsManagerResponse; -import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -53,8 +48,8 @@ public class AssociateUcsProfileToBladeCmd extends BaseAsyncCmd { private Long bladeId; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { UcsBladeResponse rsp = mgr.associateProfileToBlade(this); rsp.setResponseName(getCommandName()); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java index 52818246e52..566ee30458b 100644 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java @@ -16,6 +16,13 @@ // under the License. package org.apache.cloudstack.api; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.UcsManagerResponse; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; @@ -25,12 +32,6 @@ import com.cloud.ucs.manager.UcsManager; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.api.response.UcsManagerResponse; -import org.apache.log4j.Logger; - -import javax.inject.Inject; - @APICommand(name = "deleteUcsManager", description = "Delete a Ucs manager", responseObject = SuccessResponse.class) public class DeleteUcsManagerCmd extends BaseCmd { private static final Logger logger = Logger.getLogger(DeleteUcsManagerCmd.class); @@ -38,7 +39,11 @@ public class DeleteUcsManagerCmd extends BaseCmd { @Inject private UcsManager mgr; - @Parameter(name = ApiConstants.UCS_MANAGER_ID, type = BaseCmd.CommandType.UUID, description = "ucs manager id", entityType = UcsManagerResponse.class, required = true) + @Parameter(name = ApiConstants.UCS_MANAGER_ID, + type = BaseCmd.CommandType.UUID, + description = "ucs manager id", + entityType = UcsManagerResponse.class, + required = true) private Long ucsManagerId; public Long getUcsManagerId() { @@ -46,8 +51,8 @@ public class DeleteUcsManagerCmd extends BaseCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { mgr.deleteUcsManager(ucsManagerId); SuccessResponse rsp = new SuccessResponse(); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java index 964cf82f74a..41c7cc1f6ba 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java @@ -18,17 +18,11 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UcsBladeResponse; import org.apache.cloudstack.api.response.UcsManagerResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -65,8 +59,8 @@ public class ListUcsBladeCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { ListResponse response = mgr.listUcsBlades(this); response.setResponseName(getCommandName()); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java index 9f9a8f88c63..767682fb0c6 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java @@ -27,26 +27,17 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UcsManagerResponse; -import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; import com.cloud.ucs.manager.UcsManager; import com.cloud.user.Account; @@ -64,8 +55,8 @@ public class ListUcsManagerCmd extends BaseListCmd { private UcsManager mgr; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { ListResponse response = mgr.listUcsManager(this); response.setResponseName(getCommandName()); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java index 324ae7dbbd7..cc49cef5520 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java @@ -19,25 +19,17 @@ package org.apache.cloudstack.api; import javax.inject.Inject; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.UcsManagerResponse; import org.apache.cloudstack.api.response.UcsProfileResponse; -import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; import com.cloud.ucs.manager.UcsManager; import com.cloud.user.Account; @@ -48,7 +40,11 @@ public class ListUcsProfileCmd extends BaseListCmd { @Inject UcsManager mgr; - @Parameter(name = ApiConstants.UCS_MANAGER_ID, type = CommandType.UUID, entityType = UcsManagerResponse.class, description = "the id for the ucs manager", required = true) + @Parameter(name = ApiConstants.UCS_MANAGER_ID, + type = CommandType.UUID, + entityType = UcsManagerResponse.class, + description = "the id for the ucs manager", + required = true) private Long ucsManagerId; public Long getUcsManagerId() { @@ -60,8 +56,8 @@ public class ListUcsProfileCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { ListResponse response = mgr.listUcsProfiles(this); response.setResponseName(getCommandName()); diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java index 86cd9f1df7a..d2b1fa82217 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsBladeResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.ucs.database.UcsBladeVO; -import com.google.gson.annotations.SerializedName; @EntityReference(value = UcsBladeVO.class) public class UcsBladeResponse extends BaseResponse { diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java index dccd62d6603..947a47fc136 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java @@ -17,14 +17,14 @@ // package org.apache.cloudstack.api.response; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.EntityReference; +import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.serializer.Param; import com.cloud.ucs.database.UcsManagerVO; -import com.google.gson.annotations.SerializedName; @EntityReference(value = UcsManagerVO.class) public class UcsManagerResponse extends BaseResponse { diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java index 2b38efc2a09..303c35f320f 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java @@ -17,11 +17,12 @@ // package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class UcsProfileResponse extends BaseResponse { @SerializedName(ApiConstants.UCS_DN) diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java index e36f4b6439b..9e19719a6b7 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java @@ -21,13 +21,14 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.api.response.CiscoNexusVSMResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -69,7 +70,8 @@ public class DeleteCiscoNexusVSMCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { boolean result = _ciscoNexusVSMService.deleteCiscoNexusVSM(this); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java index 36565af62e5..0e4d306b934 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java @@ -21,21 +21,22 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; + +import com.cloud.api.response.CiscoNexusVSMResponse; +import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.CiscoNexusVSMDevice; import com.cloud.network.element.CiscoNexusVSMElementService; import com.cloud.user.Account; -import com.cloud.event.EventTypes; -import com.cloud.api.response.CiscoNexusVSMResponse; -import com.cloud.network.CiscoNexusVSMDevice; @APICommand(name = "disableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "disable a Cisco Nexus VSM device") public class DisableCiscoNexusVSMCmd extends BaseAsyncCmd { @@ -69,7 +70,8 @@ public class DisableCiscoNexusVSMCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { CiscoNexusVSMDevice result = _ciscoNexusVSMService.disableCiscoNexusVSM(this); if (result != null) { CiscoNexusVSMResponse response = _ciscoNexusVSMService.createCiscoNexusVSMDetailedResponse(result); diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java index 6105a8dda57..63c79fb4c96 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java @@ -19,19 +19,24 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; + +import com.cloud.api.response.CiscoNexusVSMResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.CiscoNexusVSMDevice; import com.cloud.network.element.CiscoNexusVSMElementService; import com.cloud.user.Account; -import com.cloud.api.response.CiscoNexusVSMResponse; -import com.cloud.network.CiscoNexusVSMDevice; @APICommand(name = "enableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "Enable a Cisco Nexus VSM device") public class EnableCiscoNexusVSMCmd extends BaseAsyncCmd { @@ -65,7 +70,8 @@ public class EnableCiscoNexusVSMCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { CiscoNexusVSMDevice result = _ciscoNexusVSMService.enableCiscoNexusVSM(this); if (result != null) { CiscoNexusVSMResponse response = _ciscoNexusVSMService.createCiscoNexusVSMDetailedResponse(result); diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java index 42d69ea034b..381bfc918e5 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java @@ -17,17 +17,24 @@ package com.cloud.api.commands; -import org.apache.cloudstack.api.response.ClusterResponse; -import org.apache.cloudstack.api.response.ZoneResponse; +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.CiscoNexusVSMResponse; +import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + +import com.cloud.api.response.CiscoNexusVSMResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; @@ -36,11 +43,6 @@ import com.cloud.network.CiscoNexusVSMDevice; import com.cloud.network.element.CiscoNexusVSMElementService; import com.cloud.user.Account; -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - @APICommand(name = "listCiscoNexusVSMs", responseObject = CiscoNexusVSMResponse.class, description = "Retrieves a Cisco Nexus 1000v Virtual Switch Manager device associated with a Cluster") @@ -96,7 +98,8 @@ public class ListCiscoNexusVSMsCmd extends BaseListCmd { // automagically gets translated to the corresponding db id before this execute() method // is invoked. That's the reason why we don't have any uuid-dbid translation code here. @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { List vsmDeviceList = _ciscoNexusVSMService.getCiscoNexusVSMs(this); if (vsmDeviceList.size() > 0) { diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java b/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java index 8bd334c5cc4..1a9e0cac597 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java @@ -16,13 +16,14 @@ // under the License. package com.cloud.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.network.CiscoNexusVSMDevice; +import com.cloud.serializer.Param; @EntityReference(value = CiscoNexusVSMDevice.class) public class CiscoNexusVSMResponse extends BaseResponse { diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index 4f8a19ade3d..081c6518ce6 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -27,16 +27,11 @@ import java.util.UUID; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand; -import com.cloud.host.Host; -import com.cloud.storage.Storage; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.storage.to.VolumeObjectTO; - import org.apache.log4j.Logger; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.command.CopyCommand; +import org.apache.cloudstack.storage.to.VolumeObjectTO; import com.cloud.agent.api.BackupSnapshotCommand; import com.cloud.agent.api.Command; @@ -44,8 +39,8 @@ import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand; import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand; import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; import com.cloud.agent.api.UnregisterNicCommand; -import com.cloud.agent.api.UnregisterVMCommand; import com.cloud.agent.api.storage.CopyVolumeCommand; +import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand; import com.cloud.agent.api.storage.CreateVolumeOVACommand; import com.cloud.agent.api.storage.PrepareOVAPackingCommand; import com.cloud.agent.api.to.DataObjectType; @@ -79,6 +74,7 @@ import com.cloud.secstorage.CommandExecLogDao; import com.cloud.secstorage.CommandExecLogVO; import com.cloud.storage.DataStoreRole; import com.cloud.storage.GuestOSVO; +import com.cloud.storage.Storage; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.secondary.SecondaryStorageVmManager; import com.cloud.template.VirtualMachineTemplate.BootloaderType; @@ -146,7 +142,8 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { details = new HashMap(); String nicDeviceType = details.get(VmDetailConstants.NIC_ADAPTER); - if (vm.getVirtualMachine() instanceof DomainRouterVO || vm.getVirtualMachine() instanceof ConsoleProxyVO || vm.getVirtualMachine() instanceof SecondaryStorageVmVO) { + if (vm.getVirtualMachine() instanceof DomainRouterVO || vm.getVirtualMachine() instanceof ConsoleProxyVO || + vm.getVirtualMachine() instanceof SecondaryStorageVmVO) { if (nicDeviceType == null) { details.put(VmDetailConstants.NIC_ADAPTER, _vmwareMgr.getSystemVMDefaultNicAdapterType()); @@ -331,8 +328,8 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { return new Pair(Boolean.FALSE, new Long(hostId)); } - if (destData.getObjectType() == DataObjectType.VOLUME && destStoreTO.getRole() == DataStoreRole.Primary && srcData.getObjectType() == DataObjectType.TEMPLATE && - srcStoreTO.getRole() == DataStoreRole.Primary) { + if (destData.getObjectType() == DataObjectType.VOLUME && destStoreTO.getRole() == DataStoreRole.Primary && + srcData.getObjectType() == DataObjectType.TEMPLATE && srcStoreTO.getRole() == DataStoreRole.Primary) { needDelegation = false; } else { needDelegation = true; @@ -375,9 +372,9 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { cmd.setContextParam("noderuninfo", String.format("%d-%d", _clusterMgr.getManagementNodeId(), _clusterMgr.getCurrentRunId())); cmd.setContextParam("vCenterSessionTimeout", String.valueOf(_vmwareMgr.getVcenterSessionTimeout())); - if (cmd instanceof BackupSnapshotCommand || cmd instanceof CreatePrivateTemplateFromVolumeCommand || cmd instanceof CreatePrivateTemplateFromSnapshotCommand || - cmd instanceof CopyVolumeCommand || cmd instanceof CopyCommand || cmd instanceof CreateVolumeOVACommand || cmd instanceof PrepareOVAPackingCommand || - cmd instanceof CreateVolumeFromSnapshotCommand) { + if (cmd instanceof BackupSnapshotCommand || cmd instanceof CreatePrivateTemplateFromVolumeCommand || + cmd instanceof CreatePrivateTemplateFromSnapshotCommand || cmd instanceof CopyVolumeCommand || cmd instanceof CopyCommand || + cmd instanceof CreateVolumeOVACommand || cmd instanceof PrepareOVAPackingCommand || cmd instanceof CreateVolumeFromSnapshotCommand) { String workerName = _vmwareMgr.composeWorkerName(); long checkPointId = 1; @@ -432,7 +429,8 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { // We need the traffic label to figure out which vSwitch has the // portgroup PhysicalNetworkTrafficTypeVO trafficTypeVO = _physicalNetworkTrafficTypeDao.findBy(networkVO.getPhysicalNetworkId(), networkVO.getTrafficType()); - UnregisterNicCommand unregisterNicCommand = new UnregisterNicCommand(vm.getInstanceName(), trafficTypeVO.getVmwareNetworkLabel(), UUID.fromString(nic.getUuid())); + UnregisterNicCommand unregisterNicCommand = + new UnregisterNicCommand(vm.getInstanceName(), trafficTypeVO.getVmwareNetworkLabel(), UUID.fromString(nic.getUuid())); commands.add(unregisterNicCommand); } } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java index 535b6a7f99d..3b168f4076c 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity; public interface LegacyZone extends InternalIdentity { + @Override long getId(); long getZoneId(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java index 6d6d2ebf0eb..b1f233c3606 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java @@ -28,6 +28,7 @@ public interface VmwareDatacenter extends Identity, InternalIdentity { String getVcenterHost(); + @Override long getId(); String getPassword(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java index f70a5414de8..16a03a98ddc 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.InternalIdentity; import com.cloud.org.Grouping; public interface VmwareDatacenterZoneMap extends Grouping, InternalIdentity { + @Override public long getId(); public long getZoneId(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index b5da8276e12..8ed445f6781 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -27,9 +27,13 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.ApiConstants; import org.apache.log4j.Logger; +import com.vmware.vim25.ClusterDasConfigInfo; +import com.vmware.vim25.ManagedObjectReference; + +import org.apache.cloudstack.api.ApiConstants; + import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.alert.AlertManager; @@ -60,7 +64,6 @@ import com.cloud.hypervisor.vmware.resource.VmwareResource; import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.network.NetworkModel; import com.cloud.network.Networks.TrafficType; -import com.cloud.network.Network; import com.cloud.network.PhysicalNetwork; import com.cloud.network.VmwareTrafficLabel; import com.cloud.network.dao.CiscoNexusVSMDeviceDao; @@ -79,8 +82,6 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.user.Account; import com.cloud.utils.Pair; import com.cloud.utils.UriUtils; -import com.vmware.vim25.ClusterDasConfigInfo; -import com.vmware.vim25.ManagedObjectReference; @Local(value = Discoverer.class) public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { @@ -124,8 +125,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) throws DiscoveryException { if (s_logger.isInfoEnabled()) s_logger.info("Discover host. dc: " + dcId + ", pod: " + podId + ", cluster: " + clusterId + ", uri host: " + url.getHost()); @@ -157,7 +158,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer if (usernameNotProvided || passwordNotProvided) { // Retrieve credentials associated with VMware DC s_logger.info("Username and/or Password not provided while adding cluster to cloudstack zone. " - + "Hence using both username & password provided while adding VMware DC to CloudStack zone."); + + "Hence using both username & password provided while adding VMware DC to CloudStack zone."); username = vmwareDc.getUser(); password = vmwareDc.getPassword(); clusterDetails.put("username", username); @@ -250,7 +251,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer publicTrafficLabel = _netmgr.getDefaultPublicTrafficLabel(dcId, HypervisorType.VMware); // Process traffic label information provided at zone level and cluster level - publicTrafficLabelObj = getTrafficInfo(TrafficType.Public, publicTrafficLabel, defaultVirtualSwitchType, paramPublicVswitchType, paramPublicVswitchName, clusterId); + publicTrafficLabelObj = + getTrafficInfo(TrafficType.Public, publicTrafficLabel, defaultVirtualSwitchType, paramPublicVswitchType, paramPublicVswitchName, clusterId); // Configuration Check: A physical network cannot be shared by different types of virtual switches. // @@ -269,8 +271,10 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer PhysicalNetwork pNetworkPublic = pNetworkListPublicTraffic.get(0); if (pNetworkListGuestTraffic.contains(pNetworkPublic)) { if (publicTrafficLabelObj.getVirtualSwitchType() != guestTrafficLabelObj.getVirtualSwitchType()) { - String msg = "Both public traffic and guest traffic is over same physical network " + pNetworkPublic + - ". And virtual switch type chosen for each traffic is different" + ". A physical network cannot be shared by different types of virtual switches."; + String msg = + "Both public traffic and guest traffic is over same physical network " + pNetworkPublic + + ". And virtual switch type chosen for each traffic is different" + + ". A physical network cannot be shared by different types of virtual switches."; s_logger.error(msg); throw new InvalidParameterValueException(msg); } @@ -486,13 +490,15 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer } if (!vCenterHost.equalsIgnoreCase(url.getHost())) { - msg = "This cluster " + clusterName + " belongs to vCenter " + url.getHost() + ". But this zone is associated with VMware DC from vCenter " + vCenterHost + - ". Make sure the cluster being added belongs to vCenter " + vCenterHost + " and VMware DC " + vmwareDcNameFromDb; + msg = + "This cluster " + clusterName + " belongs to vCenter " + url.getHost() + ". But this zone is associated with VMware DC from vCenter " + vCenterHost + + ". Make sure the cluster being added belongs to vCenter " + vCenterHost + " and VMware DC " + vmwareDcNameFromDb; s_logger.error(msg); throw new DiscoveryException(msg); } else if (!vmwareDcNameFromDb.equalsIgnoreCase(vmwareDcNameFromApi)) { - msg = "This cluster " + clusterName + " belongs to VMware DC " + vmwareDcNameFromApi + " .But this zone is associated with VMware DC " + vmwareDcNameFromDb + - ". Make sure the cluster being added belongs to VMware DC " + vmwareDcNameFromDb + " in vCenter " + vCenterHost; + msg = + "This cluster " + clusterName + " belongs to VMware DC " + vmwareDcNameFromApi + " .But this zone is associated with VMware DC " + vmwareDcNameFromDb + + ". Make sure the cluster being added belongs to VMware DC " + vmwareDcNameFromDb + " in vCenter " + vCenterHost; s_logger.error(msg); throw new DiscoveryException(msg); } @@ -560,8 +566,9 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer Long id; if (tmplt == null) { id = _tmpltDao.getNextInSequence(Long.class, "id"); - VMTemplateVO template = VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, - Account.ACCOUNT_ID_SYSTEM, null, "VMware Tools Installer ISO", false, 1, false, HypervisorType.VMware); + VMTemplateVO template = + VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, Account.ACCOUNT_ID_SYSTEM, + null, "VMware Tools Installer ISO", false, 1, false, HypervisorType.VMware); _tmpltDao.persist(template); } else { id = tmplt.getId(); @@ -656,7 +663,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer return trafficLabelObj; } - private VmwareTrafficLabel getTrafficInfo(TrafficType trafficType, String zoneWideTrafficLabel, Map clusterDetails, VirtualSwitchType defVirtualSwitchType) { + private VmwareTrafficLabel getTrafficInfo(TrafficType trafficType, String zoneWideTrafficLabel, Map clusterDetails, + VirtualSwitchType defVirtualSwitchType) { VmwareTrafficLabel trafficLabelObj = null; try { trafficLabelObj = new VmwareTrafficLabel(zoneWideTrafficLabel, trafficType, defVirtualSwitchType); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java index 421951f2f1e..a77679faa35 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java @@ -18,11 +18,12 @@ package com.cloud.hypervisor.vmware.manager; import java.util.List; +import com.vmware.vim25.ManagedObjectReference; + import com.cloud.agent.api.Command; import com.cloud.hypervisor.vmware.mo.DatastoreMO; import com.cloud.hypervisor.vmware.mo.VmwareHypervisorHost; import com.cloud.hypervisor.vmware.util.VmwareContext; -import com.vmware.vim25.ManagedObjectReference; public interface VmwareHostService { VmwareContext getServiceContext(Command cmd); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java index 712b49fef2b..27975eea8ea 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java @@ -20,13 +20,12 @@ import java.io.File; import java.util.List; import java.util.Map; -import com.cloud.agent.api.to.VolumeTO; +import com.vmware.vim25.ManagedObjectReference; + import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.vmware.manager.VmwareStorageManager; import com.cloud.hypervisor.vmware.mo.HostMO; import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.utils.Pair; -import com.vmware.vim25.ManagedObjectReference; public interface VmwareManager { public final String CONTEXT_STOCK_NAME = "vmwareMgr"; diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 3c903183e13..066a395d6e8 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -399,7 +399,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } @Override - public List addHostToPodCluster(VmwareContext serviceContext, long dcId, Long podId, Long clusterId, String hostInventoryPath) throws Exception { + public List addHostToPodCluster(VmwareContext serviceContext, long dcId, Long podId, Long clusterId, String hostInventoryPath) + throws Exception { ManagedObjectReference mor = null; if (serviceContext != null) { mor = serviceContext.getHostMorByPath(hostInventoryPath); @@ -462,8 +463,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } @Deprecated - private ManagedObjectReference addHostToVCenterCluster(VmwareContext serviceContext, ManagedObjectReference morCluster, String host, String userName, String password) - throws Exception { + private ManagedObjectReference + addHostToVCenterCluster(VmwareContext serviceContext, ManagedObjectReference morCluster, String host, String userName, String password) throws Exception { VmwareClient vclient = serviceContext.getVimClient(); ManagedObjectReference morHost = vclient.getDecendentMoRef(morCluster, "HostSystem", host); @@ -631,7 +632,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw s_logger.info("Inject SSH key pairs before copying systemvm.iso into secondary storage"); _configServer.updateKeyPairs(); - s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() + ", destination: " + destIso.getAbsolutePath()); + s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() + ", destination: " + + destIso.getAbsolutePath()); try { FileUtil.copyfile(srcIso, destIso); } catch (IOException e) { @@ -1040,7 +1042,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if (vCenterHost == null) { throw new InvalidParameterValueException("Missing or invalid parameter name. " - + "Please provide valid VMware vCenter server's IP address or fully qualified domain name."); + + "Please provide valid VMware vCenter server's IP address or fully qualified domain name."); } if (zoneId == null) { @@ -1059,11 +1061,12 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw Long associatedVmwareDcId = vmwareDcZoneMap.getVmwareDcId(); VmwareDatacenterVO associatedVmwareDc = _vmwareDcDao.findById(associatedVmwareDcId); if (associatedVmwareDc.getVcenterHost().equalsIgnoreCase(vCenterHost) && associatedVmwareDc.getVmwareDatacenterName().equalsIgnoreCase(vmwareDcName)) { - s_logger.info("Ignoring API call addVmwareDc, because VMware DC " + vCenterHost + "/" + vmwareDcName + " is already associated with specified zone with id " + - zoneId); + s_logger.info("Ignoring API call addVmwareDc, because VMware DC " + vCenterHost + "/" + vmwareDcName + + " is already associated with specified zone with id " + zoneId); return associatedVmwareDc; } else { - throw new CloudRuntimeException("Zone " + zoneId + " is already associated with a VMware datacenter. " + "Only 1 VMware DC can be associated with a zone."); + throw new CloudRuntimeException("Zone " + zoneId + " is already associated with a VMware datacenter. " + + "Only 1 VMware DC can be associated with a zone."); } } // Zone validation to check if the zone already has resources. diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java index 18fc91125d1..fe91cae47fc 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java @@ -24,7 +24,9 @@ import com.cloud.agent.api.CreateVMSnapshotCommand; import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; import com.cloud.agent.api.DeleteVMSnapshotCommand; import com.cloud.agent.api.RevertToVMSnapshotCommand; -import com.cloud.agent.api.storage.*; +import com.cloud.agent.api.storage.CopyVolumeCommand; +import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand; +import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; public interface VmwareStorageManager { Answer execute(VmwareHostService hostService, PrimaryStorageDownloadCommand cmd); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index 561406ad98a..040a4cfd8f3 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -29,9 +29,18 @@ import java.util.Map; import java.util.Properties; import java.util.UUID; +import org.apache.log4j.Logger; + +import com.vmware.vim25.FileInfo; +import com.vmware.vim25.FileQueryFlags; +import com.vmware.vim25.HostDatastoreBrowserSearchResults; +import com.vmware.vim25.HostDatastoreBrowserSearchSpec; +import com.vmware.vim25.ManagedObjectReference; +import com.vmware.vim25.TaskInfo; +import com.vmware.vim25.VirtualDisk; + import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.BackupSnapshotAnswer; @@ -80,13 +89,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import com.cloud.vm.VirtualMachine; import com.cloud.vm.snapshot.VMSnapshot; -import com.vmware.vim25.FileInfo; -import com.vmware.vim25.FileQueryFlags; -import com.vmware.vim25.HostDatastoreBrowserSearchResults; -import com.vmware.vim25.HostDatastoreBrowserSearchSpec; -import com.vmware.vim25.ManagedObjectReference; -import com.vmware.vim25.TaskInfo; -import com.vmware.vim25.VirtualDisk; public class VmwareStorageManagerImpl implements VmwareStorageManager { @Override @@ -347,8 +349,9 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { throw new Exception("Failed to take snapshot " + cmd.getSnapshotName() + " on vm: " + cmd.getVmName()); } - snapshotBackupUuid = backupSnapshotToSecondaryStorage(vmMo, accountId, volumeId, cmd.getVolumePath(), snapshotUuid, secondaryStorageUrl, prevSnapshotUuid, - prevBackupUuid, hostService.getWorkerName(context, cmd, 1)); + snapshotBackupUuid = + backupSnapshotToSecondaryStorage(vmMo, accountId, volumeId, cmd.getVolumePath(), snapshotUuid, secondaryStorageUrl, prevSnapshotUuid, prevBackupUuid, + hostService.getWorkerName(context, cmd, 1)); success = (snapshotBackupUuid != null); if (success) { @@ -402,7 +405,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(cmd.getVmName()); if (vmMo == null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + ", try within datacenter"); + s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + + ", try within datacenter"); } vmMo = hyperHost.findVmOnPeerHyperHost(cmd.getVmName()); @@ -413,8 +417,9 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { } } - Ternary result = createTemplateFromVolume(vmMo, accountId, templateId, cmd.getUniqueName(), secondaryStoragePoolURL, volumePath, - hostService.getWorkerName(context, cmd, 0)); + Ternary result = + createTemplateFromVolume(vmMo, accountId, templateId, cmd.getUniqueName(), secondaryStoragePoolURL, volumePath, + hostService.getWorkerName(context, cmd, 0)); return new CreatePrivateTemplateAnswer(cmd, true, null, result.first(), result.third(), result.second(), cmd.getUniqueName(), ImageFormat.OVA); @@ -470,8 +475,9 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { Pair result; if (cmd.toSecondaryStorage()) { - result = copyVolumeToSecStorage(hostService, hyperHost, cmd, vmName, volumeId, cmd.getPool().getUuid(), volumePath, secondaryStorageURL, - hostService.getWorkerName(context, cmd, 0)); + result = + copyVolumeToSecStorage(hostService, hyperHost, cmd, vmName, volumeId, cmd.getPool().getUuid(), volumePath, secondaryStorageURL, + hostService.getWorkerName(context, cmd, 0)); } else { StorageFilerTO poolTO = cmd.getPool(); @@ -541,11 +547,11 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { // templateName: name in secondary storage // templateUuid: will be used at hypervisor layer - private void copyTemplateFromSecondaryToPrimary(VmwareHypervisorHost hyperHost, DatastoreMO datastoreMo, String secondaryStorageUrl, String templatePathAtSecondaryStorage, - String templateName, String templateUuid) throws Exception { + private void copyTemplateFromSecondaryToPrimary(VmwareHypervisorHost hyperHost, DatastoreMO datastoreMo, String secondaryStorageUrl, + String templatePathAtSecondaryStorage, String templateName, String templateUuid) throws Exception { s_logger.info("Executing copyTemplateFromSecondaryToPrimary. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + - templatePathAtSecondaryStorage + ", templateName: " + templateName); + templatePathAtSecondaryStorage + ", templateName: " + templateName); String secondaryMountPoint = _mountService.getMountPoint(secondaryStorageUrl); s_logger.info("Secondary storage mount point: " + secondaryMountPoint); @@ -579,8 +585,9 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmName); if (vmMo == null) { - String msg = "Failed to import OVA template. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + templatePathAtSecondaryStorage + - ", templateName: " + templateName + ", templateUuid: " + templateUuid; + String msg = + "Failed to import OVA template. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + templatePathAtSecondaryStorage + + ", templateName: " + templateName + ", templateUuid: " + templateUuid; s_logger.error(msg); throw new Exception(msg); } @@ -845,8 +852,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { } } - private String createVolumeFromSnapshot(VmwareHypervisorHost hyperHost, DatastoreMO primaryDsMo, String newVolumeName, long accountId, long volumeId, String secStorageUrl, - String snapshotBackupUuid) throws Exception { + private String createVolumeFromSnapshot(VmwareHypervisorHost hyperHost, DatastoreMO primaryDsMo, String newVolumeName, long accountId, long volumeId, + String secStorageUrl, String snapshotBackupUuid) throws Exception { restoreVolumeFromSecStorage(hyperHost, primaryDsMo, newVolumeName, secStorageUrl, getSnapshotRelativeDirInSecStorage(accountId, volumeId), snapshotBackupUuid); return null; @@ -920,8 +927,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { return backupUuid + "/" + backupUuid; } - private void exportVolumeToSecondaryStroage(VirtualMachineMO vmMo, String volumePath, String secStorageUrl, String secStorageDir, String exportName, String workerVmName) - throws Exception { + private void exportVolumeToSecondaryStroage(VirtualMachineMO vmMo, String volumePath, String secStorageUrl, String secStorageDir, String exportName, + String workerVmName) throws Exception { String secondaryMountPoint = _mountService.getMountPoint(secStorageUrl); String exportPath = secondaryMountPoint + "/" + secStorageDir + "/" + exportName; @@ -997,8 +1004,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { return "Failed to delete snapshot backup file, backupUuid: " + backupUuid; } - private Pair copyVolumeToSecStorage(VmwareHostService hostService, VmwareHypervisorHost hyperHost, CopyVolumeCommand cmd, String vmName, long volumeId, - String poolId, String volumePath, String secStorageUrl, String workerVmName) throws Exception { + private Pair copyVolumeToSecStorage(VmwareHostService hostService, VmwareHypervisorHost hyperHost, CopyVolumeCommand cmd, String vmName, + long volumeId, String poolId, String volumePath, String secStorageUrl, String workerVmName) throws Exception { String volumeFolder = String.valueOf(volumeId) + "/"; VirtualMachineMO workerVm = null; @@ -1034,7 +1041,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { vmMo.createSnapshot(exportName, "Temporary snapshot for copy-volume command", false, false); - exportVolumeToSecondaryStroage(vmMo, volumePath, secStorageUrl, "volumes/" + volumeFolder, exportName, hostService.getWorkerName(hyperHost.getContext(), cmd, 1)); + exportVolumeToSecondaryStroage(vmMo, volumePath, secStorageUrl, "volumes/" + volumeFolder, exportName, + hostService.getWorkerName(hyperHost.getContext(), cmd, 1)); return new Pair(volumeFolder, exportName); } finally { diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java index 6875795cbb4..cdd0c29c9fe 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java @@ -63,7 +63,7 @@ public class VmwareContextFactory { String serviceUrl = "https://" + vCenterAddress + "/sdk/vimService"; if (s_logger.isDebugEnabled()) s_logger.debug("initialize VmwareContext. url: " + serviceUrl + ", username: " + vCenterUserName + ", password: " + - StringUtils.getMaskedPasswordForDisplay(vCenterPassword)); + StringUtils.getMaskedPasswordForDisplay(vCenterPassword)); VmwareClient vimClient = new VmwareClient(vCenterAddress + "-" + s_seq++); vimClient.setVcenterSessionTimeout(s_vmwareMgr.getVcenterSessionTimeout()); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index a356a402168..b7a0a482ec0 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -45,8 +45,6 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.agent.api.routing.*; - import org.apache.log4j.Logger; import org.apache.log4j.NDC; @@ -65,8 +63,6 @@ import com.vmware.vim25.DistributedVirtualSwitchPortCriteria; import com.vmware.vim25.DynamicProperty; import com.vmware.vim25.GuestInfo; import com.vmware.vim25.HostCapability; -import com.vmware.vim25.HostFirewallInfo; -import com.vmware.vim25.HostFirewallRuleset; import com.vmware.vim25.HostHostBusAdapter; import com.vmware.vim25.HostInternetScsiHba; import com.vmware.vim25.HostInternetScsiHbaAuthenticationProperties; @@ -100,18 +96,14 @@ import com.vmware.vim25.VirtualDisk; import com.vmware.vim25.VirtualEthernetCard; import com.vmware.vim25.VirtualEthernetCardDistributedVirtualPortBackingInfo; import com.vmware.vim25.VirtualEthernetCardNetworkBackingInfo; -import com.vmware.vim25.VirtualLsiLogicController; import com.vmware.vim25.VirtualMachineConfigSpec; -import com.vmware.vim25.VirtualMachineFileInfo; import com.vmware.vim25.VirtualMachineGuestOsIdentifier; import com.vmware.vim25.VirtualMachinePowerState; import com.vmware.vim25.VirtualMachineRelocateSpec; import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator; import com.vmware.vim25.VirtualMachineRuntimeInfo; -import com.vmware.vim25.VirtualSCSISharing; import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec; -import org.apache.cloudstack.engine.orchestration.VolumeOrchestrator; import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; @@ -216,6 +208,35 @@ import com.cloud.agent.api.ValidateSnapshotCommand; import com.cloud.agent.api.VmStatsEntry; import com.cloud.agent.api.check.CheckSshAnswer; import com.cloud.agent.api.check.CheckSshCommand; +import com.cloud.agent.api.routing.CreateIpAliasCommand; +import com.cloud.agent.api.routing.DeleteIpAliasCommand; +import com.cloud.agent.api.routing.DhcpEntryCommand; +import com.cloud.agent.api.routing.DnsMasqConfigCommand; +import com.cloud.agent.api.routing.IpAliasTO; +import com.cloud.agent.api.routing.IpAssocAnswer; +import com.cloud.agent.api.routing.IpAssocCommand; +import com.cloud.agent.api.routing.IpAssocVpcCommand; +import com.cloud.agent.api.routing.LoadBalancerConfigCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand; +import com.cloud.agent.api.routing.SavePasswordCommand; +import com.cloud.agent.api.routing.SetFirewallRulesAnswer; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetMonitorServiceCommand; +import com.cloud.agent.api.routing.SetNetworkACLAnswer; +import com.cloud.agent.api.routing.SetNetworkACLCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesAnswer; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand; +import com.cloud.agent.api.routing.SetSourceNatAnswer; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesAnswer; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.routing.SetStaticRouteAnswer; +import com.cloud.agent.api.routing.SetStaticRouteCommand; +import com.cloud.agent.api.routing.Site2SiteVpnCfgCommand; +import com.cloud.agent.api.routing.VmDataCommand; +import com.cloud.agent.api.routing.VpnUsersCfgCommand; import com.cloud.agent.api.storage.CopyVolumeAnswer; import com.cloud.agent.api.storage.CopyVolumeCommand; import com.cloud.agent.api.storage.CreateAnswer; @@ -583,7 +604,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa PropertyMapDynamicBean mbeanToRemove = _cmdMBeans.get(0); _cmdMBeans.remove(0); - JmxUtil.unregisterMBean("VMware " + _morHyperHost.getValue(), "Command " + mbeanToRemove.getProp("Sequence") + "-" + mbeanToRemove.getProp("Name")); + JmxUtil.unregisterMBean("VMware " + _morHyperHost.getValue(), + "Command " + mbeanToRemove.getProp("Sequence") + "-" + mbeanToRemove.getProp("Name")); } } catch (Exception e) { if (s_logger.isTraceEnabled()) @@ -700,8 +722,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa // Send over the command for execution, via ssh, to the VR. try { VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_staticroute.sh " + - args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_staticroute.sh " + args); if (s_logger.isDebugEnabled()) s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/vpc_staticroute.sh " + args); @@ -749,8 +771,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair resultPair = SshHelper.sshExecute(privateIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_netusage.sh " + - args); + Pair resultPair = + SshHelper.sshExecute(privateIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_netusage.sh " + args); if (!resultPair.first()) { throw new Exception(" vpc network usage plugin call failed "); @@ -776,8 +798,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return new NetworkUsageAnswer(cmd, "success", 0L, 0L); } catch (Throwable e) { - s_logger.error("Unable to execute NetworkUsage command on DomR (" + privateIp + "), domR may not be ready yet. failure due to " + VmwareHelper.getExceptionMessage(e), - e); + s_logger.error( + "Unable to execute NetworkUsage command on DomR (" + privateIp + "), domR may not be ready yet. failure due to " + VmwareHelper.getExceptionMessage(e), e); } return new NetworkUsageAnswer(cmd, "success", 0L, 0L); } @@ -796,8 +818,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/monitor_service.sh " + - args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/monitor_service.sh " + args); if (!result.first()) { String msg = "monitor_service.sh failed on domain router " + controlIp + " failed " + result.second(); @@ -946,8 +968,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa // Invoke command on VPC VR. try { - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_staticnat.sh " + - args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_staticnat.sh " + args); if (s_logger.isDebugEnabled()) s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/vpc_staticnat.sh " + args); @@ -1080,8 +1102,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } // Invoke the command - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_loadbalancer.sh " + - args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_loadbalancer.sh " + args); if (!result.first()) { String msg = "LoadBalancerConfigCommand on domain router " + routerIp + " failed. message: " + result.second(); @@ -1167,8 +1189,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -s " + sb.toString(); } - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp " + tmpCfgFilePath + - " /etc/haproxy/haproxy.cfg.new"); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp " + tmpCfgFilePath + + " /etc/haproxy/haproxy.cfg.new"); if (!result.first()) { s_logger.error("Unable to copy haproxy configuration file"); @@ -1265,7 +1288,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (s_logger.isDebugEnabled()) s_logger.debug("Run domr script " + cmd); Pair result2 = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, - // TODO need to find the dev index inside router based on IP address + // TODO need to find the dev index inside router based on IP address cmd); if (s_logger.isDebugEnabled()) s_logger.debug("result: " + result2.first() + ", output: " + result2.second()); @@ -1279,7 +1302,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.warn("can not find intereface associated with mac: " + mac + ", guest OS may still at loading state, retry..."); try { - Thread.currentThread().sleep(1000); + Thread.currentThread(); + Thread.sleep(1000); } catch (InterruptedException e) { } } @@ -1341,7 +1365,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -e " + domainName; } - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_guestnw.sh " + args); + Pair result = + SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_guestnw.sh " + args); if (!result.first()) { String msg = "SetupGuestNetworkCommand on domain router " + routerIp + " failed. message: " + result.second(); @@ -1407,7 +1432,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -c "; args += "eth" + ethDeviceNum; - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_snat.sh " + args); + Pair result = + SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_snat.sh " + args); if (!result.first()) { String msg = "SetupGuestNetworkCommand on domain router " + routerIp + " failed. message: " + result.second(); @@ -1511,8 +1537,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -d " + rule.getStringDstPortRange().replace(":", "-"); try { - Pair sshResult = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, - "/opt/cloud/bin/vpc_portforwarding.sh " + args); + Pair sshResult = + SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_portforwarding.sh " + args); if (!sshResult.first()) { results[i++] = "Failed"; @@ -1655,11 +1681,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa ManagedObjectReference dvsMor = dataCenterMo.getDvSwitchMor(networkInfo.first()); dvSwitchUuid = dataCenterMo.getDvSwitchUuid(dvsMor); s_logger.info("Preparing NIC device on dvSwitch : " + dvSwitchUuid); - nic = VmwareHelper.prepareDvNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), dvSwitchUuid, nicTo.getMac(), deviceNumber, deviceNumber + 1, - true, true); + nic = + VmwareHelper.prepareDvNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), dvSwitchUuid, nicTo.getMac(), deviceNumber, + deviceNumber + 1, true, true); } else { s_logger.info("Preparing NIC device on network " + networkInfo.second()); - nic = VmwareHelper.prepareNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), nicTo.getMac(), deviceNumber, deviceNumber + 1, true, true); + nic = + VmwareHelper.prepareNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), nicTo.getMac(), deviceNumber, deviceNumber + 1, true, + true); } VirtualMachineConfigSpec vmConfigSpec = new VirtualMachineConfigSpec(); @@ -1777,7 +1806,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -n "; args += NetUtils.getSubNet(ip.getPublicIp(), ip.getVlanNetmask()); - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_ipassoc.sh " + args); + Pair result = + SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_ipassoc.sh " + args); if (!result.first()) { throw new InternalErrorException("Unable to assign public IP address"); @@ -1789,8 +1819,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa snatArgs += " -c "; snatArgs += "eth" + ethDeviceNum; - Pair result_gateway = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, - "/opt/cloud/bin/vpc_privateGateway.sh " + snatArgs); + Pair result_gateway = + SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_privateGateway.sh " + snatArgs); if (!result_gateway.first()) { throw new InternalErrorException("Unable to configure source NAT for public IP address."); @@ -1799,7 +1829,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, - final boolean firstIP, final boolean sourceNat, final String broadcastId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception { + final boolean firstIP, final boolean sourceNat, final String broadcastId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) + throws Exception { /** * TODO support other networks @@ -1880,7 +1911,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args); + Pair result = + SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args); if (!result.first()) { s_logger.error("ipassoc command on domain router " + privateIpAddress + " failed. message: " + result.second()); @@ -1922,12 +1954,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa */ if (VirtualSwitchType.StandardVirtualSwitch == vSwitchType) { synchronized (vmMo.getRunningHost().getMor().getValue().intern()) { - networkInfo = HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null, - _ops_timeout, true, BroadcastDomainType.Vlan, null); + networkInfo = + HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null, + _ops_timeout, true, BroadcastDomainType.Vlan, null); } } else { - networkInfo = HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null, null, - _ops_timeout, vSwitchType, _portsPerDvPortGroup, null, false, BroadcastDomainType.Vlan); + networkInfo = + HypervisorHostHelper.prepareNetwork(_publicTrafficInfo.getVirtualSwitchName(), "cloud.public", vmMo.getRunningHost(), vlanId, null, null, null, + _ops_timeout, vSwitchType, _portsPerDvPortGroup, null, false, BroadcastDomainType.Vlan); } int nicIndex = allocPublicNicIndex(vmMo); @@ -2024,8 +2058,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } for (IpAddressTO ip : ips) { - assignPublicIpAddress(vmMo, routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), - ip.getVlanNetmask(), ip.getVifMacAddress()); + assignPublicIpAddress(vmMo, routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), + ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress()); results[i++] = ip.getPublicIp() + " - success"; } } catch (Throwable e) { @@ -2043,7 +2077,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (s_logger.isInfoEnabled()) { s_logger.info("Executing resource SavePasswordCommand. vmName: " + cmd.getVmName() + ", vmIp: " + cmd.getVmIpAddress() + ", password: " + - StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); } String controlIp = getRouterSshControlIp(cmd); @@ -2055,14 +2089,15 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (s_logger.isDebugEnabled()) { s_logger.debug("Run command on domain router " + controlIp + ", /opt/cloud/bin/savepassword.sh " + args + " -p " + - StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); + StringUtils.getMaskedPasswordForDisplay(cmd.getPassword())); } args += " -p " + password; try { VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/savepassword.sh " + args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/savepassword.sh " + args); if (!result.first()) { s_logger.error("savepassword command on domain router " + controlIp + " failed, message: " + result.second()); @@ -2161,7 +2196,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); String controlIp = getRouterSshControlIp(cmd); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/createIpAlias.sh " + args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/createIpAlias.sh " + args); if (!result.first()) { s_logger.error("CreateIpAlias command on domr " + controlIp + " failed, message: " + result.second()); @@ -2204,7 +2240,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); String controlIp = getRouterSshControlIp(cmd); - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/deleteIpAlias.sh " + args); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/deleteIpAlias.sh " + args); if (!result.first()) { s_logger.error("deleteIpAlias command on domr " + controlIp + " failed, message: " + result.second()); @@ -2284,7 +2321,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (!result.first()) { s_logger.error("check site-to-site vpn connections command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + " failed, message: " + - result.second()); + result.second()); return new CheckS2SVpnConnectionsAnswer(cmd, false, result.second()); } @@ -2432,7 +2469,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/tmp", content.getBytes(), tmpFileName, null); try { - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/userdata.py " + tmpFileName); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/userdata.py " + tmpFileName); if (!result.first()) { s_logger.error("vm_data command on domain router " + controlIp + " failed. messge: " + result.second()); @@ -2557,7 +2595,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa hotaddMemoryLimitInMb = vmMo.getHotAddMemoryLimitInMb(); if (requestedMaxMemoryInMb > hotaddMemoryLimitInMb) { throw new CloudRuntimeException("Memory of VM " + vmMo.getVmName() + " cannot be scaled to " + requestedMaxMemoryInMb + "MB." + - " Requested memory limit is beyond the hotadd memory limit for this VM at the moment is " + hotaddMemoryLimitInMb + "MB."); + " Requested memory limit is beyond the hotadd memory limit for this VM at the moment is " + hotaddMemoryLimitInMb + "MB."); } // Check increment is multiple of increment size @@ -2568,7 +2606,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa // Check if license supports the feature VmwareHelper.isFeatureLicensed(hyperHost, FeatureKeyConstants.HOTPLUG); - VmwareHelper.setVmScaleUpConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int)requestedMaxMemoryInMb, ramMb, vmSpec.getLimitCpuUse()); + VmwareHelper.setVmScaleUpConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int)requestedMaxMemoryInMb, ramMb, + vmSpec.getLimitCpuUse()); if (!vmMo.configureVm(vmConfigSpec)) { throw new Exception("Unable to execute ScaleVmCommand"); @@ -2674,7 +2713,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (rootDiskDataStoreDetails.second().folderExists(String.format("[%s]", rootDiskDataStoreDetails.second().getName()), vmNameOnVcenter)) { s_logger.warn("WARN!!! Folder already exists on datastore for new VM " + vmNameOnVcenter + ", erase it"); - rootDiskDataStoreDetails.second().deleteFile(String.format("[%s] %s/", rootDiskDataStoreDetails.second().getName(), vmNameOnVcenter), dcMo.getMor(), false); + rootDiskDataStoreDetails.second().deleteFile(String.format("[%s] %s/", rootDiskDataStoreDetails.second().getName(), vmNameOnVcenter), + dcMo.getMor(), false); } if (!hyperHost.createBlankVm(vmNameOnVcenter, vmInternalCSName, vmSpec.getCpus(), vmSpec.getMaxSpeed().intValue(), vmSpec.getMinSpeed(), @@ -2706,8 +2746,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa int ramMb = (int)(vmSpec.getMinRam() / (1024 * 1024)); String guestOsId = translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs()).value(); - VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int)(vmSpec.getMaxRam() / (1024 * 1024)), ramMb, guestOsId, - vmSpec.getLimitCpuUse()); + VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int)(vmSpec.getMaxRam() / (1024 * 1024)), ramMb, + guestOsId, vmSpec.getLimitCpuUse()); // Check for hotadd settings vmConfigSpec.setMemoryHotAddEnabled(vmMo.isMemoryHotAddSupported(guestOsId)); @@ -2745,8 +2785,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa DatastoreMO secDsMo = new DatastoreMO(hyperHost.getContext(), morSecDs); deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec(); - Pair isoInfo = VmwareHelper.prepareIsoDevice(vmMo, - String.format("[%s] systemvm/%s", secDsMo.getName(), mgr.getSystemVMIsoFileNameOnDatastore()), secDsMo.getMor(), true, true, ideUnitNumber++, i + 1); + Pair isoInfo = + VmwareHelper.prepareIsoDevice(vmMo, String.format("[%s] systemvm/%s", secDsMo.getName(), mgr.getSystemVMIsoFileNameOnDatastore()), secDsMo.getMor(), + true, true, ideUnitNumber++, i + 1); deviceConfigSpecArray[i].setDevice(isoInfo.first()); if (isoInfo.second()) { if (s_logger.isDebugEnabled()) @@ -2775,8 +2816,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa assert (isoDatastoreInfo.second() != null); deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec(); - Pair isoInfo = VmwareHelper.prepareIsoDevice(vmMo, isoDatastoreInfo.first(), isoDatastoreInfo.second(), true, true, - ideUnitNumber++, i + 1); + Pair isoInfo = + VmwareHelper.prepareIsoDevice(vmMo, isoDatastoreInfo.first(), isoDatastoreInfo.second(), true, true, ideUnitNumber++, i + 1); deviceConfigSpecArray[i].setDevice(isoInfo.first()); if (isoInfo.second()) { if (s_logger.isDebugEnabled()) @@ -2830,8 +2871,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa String[] diskChain = syncDiskChain(dcMo, vmMo, vmSpec, vol, matchingExistingDisk, dataStoresDetails); if (controllerKey == scsiControllerKey && VmwareHelper.isReservedScsiDeviceNumber(scsiUnitNumber)) scsiUnitNumber++; - VirtualDevice device = VmwareHelper.prepareDiskDevice(vmMo, null, controllerKey, diskChain, volumeDsDetails.first(), - (controllerKey == ideControllerKey) ? ideUnitNumber++ : scsiUnitNumber++, i + 1); + VirtualDevice device = + VmwareHelper.prepareDiskDevice(vmMo, null, controllerKey, diskChain, volumeDsDetails.first(), + (controllerKey == ideControllerKey) ? ideUnitNumber++ : scsiUnitNumber++, i + 1); deviceConfigSpecArray[i].setDevice(device); deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.ADD); @@ -2873,11 +2915,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa ManagedObjectReference dvsMor = dataCenterMo.getDvSwitchMor(networkInfo.first()); dvSwitchUuid = dataCenterMo.getDvSwitchUuid(dvsMor); s_logger.info("Preparing NIC device on dvSwitch : " + dvSwitchUuid); - nic = VmwareHelper.prepareDvNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), dvSwitchUuid, nicTo.getMac(), nicUnitNumber++, i + 1, - true, true); + nic = + VmwareHelper.prepareDvNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), dvSwitchUuid, nicTo.getMac(), nicUnitNumber++, + i + 1, true, true); } else { s_logger.info("Preparing NIC device on network " + networkInfo.second()); - nic = VmwareHelper.prepareNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), nicTo.getMac(), nicUnitNumber++, i + 1, true, true); + nic = + VmwareHelper.prepareNicDevice(vmMo, networkInfo.first(), nicDeviceType, networkInfo.second(), nicTo.getMac(), nicUnitNumber++, i + 1, true, true); } deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec(); @@ -3202,7 +3246,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa Map details = vol.getDetails(); boolean isManaged = details != null && Boolean.parseBoolean(details.get(DiskTO.MANAGED)); - VirtualMachineDiskInfo diskInfo = diskInfoBuilder.getDiskInfoByBackingFileBaseName(isManaged ? new DatastoreFile(volume.getPath()).getFileBaseName() : volume.getPath()); + VirtualMachineDiskInfo diskInfo = + diskInfoBuilder.getDiskInfoByBackingFileBaseName(isManaged ? new DatastoreFile(volume.getPath()).getFileBaseName() : volume.getPath()); if (diskInfo != null) { s_logger.info("Found existing disk info from volume path: " + volume.getPath()); return diskInfo; @@ -3254,11 +3299,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (vmDetails != null && vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER) != null) { if (vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER).equalsIgnoreCase("scsi")) { s_logger.info("Chose disk controller for vol " + vol.getType() + " -> scsi, based on root disk controller settings: " + - vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER)); + vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER)); controllerKey = scsiControllerKey; } else { s_logger.info("Chose disk controller for vol " + vol.getType() + " -> ide, based on root disk controller settings: " + - vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER)); + vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER)); controllerKey = ideControllerKey; } } else { @@ -3275,7 +3320,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return controllerKey; } - private void postDiskConfigBeforeStart(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, DiskTO[] sortedDisks, int ideControllerKey, int scsiControllerKey) throws Exception { + private void postDiskConfigBeforeStart(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, DiskTO[] sortedDisks, int ideControllerKey, int scsiControllerKey) + throws Exception { VirtualMachineDiskInfoBuilder diskInfoBuilder = vmMo.getDiskInfoBuilder(); @@ -3385,8 +3431,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return listForSort.toArray(new DiskTO[0]); } - private HashMap> inferDatastoreDetailsFromDiskInfo(VmwareHypervisorHost hyperHost, VmwareContext context, DiskTO[] disks) - throws Exception { + private HashMap> inferDatastoreDetailsFromDiskInfo(VmwareHypervisorHost hyperHost, VmwareContext context, + DiskTO[] disks) throws Exception { HashMap> poolMors = new HashMap>(); assert (hyperHost != null) && (context != null); @@ -3405,8 +3451,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa iScsiName = details.get(DiskTO.IQN); } - ManagedObjectReference morDataStore = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, - isManaged ? VmwareResource.getDatastoreName(iScsiName) : poolUuid); + ManagedObjectReference morDataStore = + HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, isManaged ? VmwareResource.getDatastoreName(iScsiName) : poolUuid); if (morDataStore == null) { String msg = "Failed to get the mounted datastore for the volume's pool " + poolUuid; s_logger.error(msg); @@ -3493,8 +3539,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (VirtualSwitchType.StandardVirtualSwitch == switchType) { synchronized (hostMo.getMor().getValue().intern()) { - networkInfo = HypervisorHostHelper.prepareNetwork(switchName.first(), namePrefix, hostMo, getVlanInfo(nicTo, switchName.second()), nicTo.getNetworkRateMbps(), - nicTo.getNetworkRateMulticastMbps(), _ops_timeout, !namePrefix.startsWith("cloud.private"), nicTo.getBroadcastType(), nicTo.getUuid()); + networkInfo = + HypervisorHostHelper.prepareNetwork(switchName.first(), namePrefix, hostMo, getVlanInfo(nicTo, switchName.second()), nicTo.getNetworkRateMbps(), + nicTo.getNetworkRateMulticastMbps(), _ops_timeout, !namePrefix.startsWith("cloud.private"), nicTo.getBroadcastType(), nicTo.getUuid()); } } else { String vlanId = getVlanInfo(nicTo, switchName.second()); @@ -3507,8 +3554,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa // plumb this network to the isolated vlan. svlanId = getPvlanInfo(nicTo); } - networkInfo = HypervisorHostHelper.prepareNetwork(switchName.first(), namePrefix, hostMo, vlanId, svlanId, nicTo.getNetworkRateMbps(), - nicTo.getNetworkRateMulticastMbps(), _ops_timeout, switchType, _portsPerDvPortGroup, nicTo.getGateway(), configureVServiceInNexus, nicTo.getBroadcastType()); + networkInfo = + HypervisorHostHelper.prepareNetwork(switchName.first(), namePrefix, hostMo, vlanId, svlanId, nicTo.getNetworkRateMbps(), + nicTo.getNetworkRateMulticastMbps(), _ops_timeout, switchType, _portsPerDvPortGroup, nicTo.getGateway(), configureVServiceInNexus, + nicTo.getBroadcastType()); } return networkInfo; @@ -3592,8 +3641,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.debug("Executing /opt/cloud/bin/vpn_lt2p.sh "); } - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, - "/opt/cloud/bin/vpn_l2tp.sh " + argsBuf.toString()); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpn_l2tp.sh " + argsBuf.toString()); if (!result.first()) { s_logger.error("RemoteAccessVpnCfg command on domR failed, message: " + result.second()); @@ -3637,8 +3686,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.debug("Executing /opt/cloud/bin/vpn_lt2p.sh "); } - Pair result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpn_l2tp.sh " + - argsBuf.toString()); + Pair result = + SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpn_l2tp.sh " + argsBuf.toString()); if (!result.first()) { s_logger.error("VpnUserCfg command on domR failed, message: " + result.second()); @@ -4206,8 +4255,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa relocateSpec.setDatastore(morDsAtSource); isFirstDs = false; } - srcDiskName = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDsAtSource), vmName, volume.getPath() + - ".vmdk"); + srcDiskName = + VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDsAtSource), vmName, volume.getPath() + + ".vmdk"); diskLocator = new VirtualMachineRelocateSpecDiskLocator(); diskLocator.setDatastore(morDsAtSource); diskLocator.setDiskId(getVirtualDiskInfo(vmMo, volume.getPath() + ".vmdk")); @@ -4272,7 +4322,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa srcHyperHost.unmountDatastore(mountedDatastore); } catch (Exception unmountEx) { s_logger.debug("Failed to unmount datastore " + mountedDatastore + " at " + _hostName + ". Seems the datastore is still being used by " + _hostName + - ". Please unmount manually to cleanup."); + ". Please unmount manually to cleanup."); } s_logger.debug("Successfully unmounted datastore " + mountedDatastore + " at " + _hostName); } @@ -4327,7 +4377,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa throw new Exception(msg); } - srcDiskName = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDs), vmName, volumePath + ".vmdk"); + srcDiskName = + VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDs), vmName, volumePath + ".vmdk"); diskLocator = new VirtualMachineRelocateSpecDiskLocator(); diskLocator.setDatastore(morDs); diskLocator.setDiskId(getVirtualDiskInfo(vmMo, volumePath + ".vmdk")); @@ -4396,7 +4447,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa ManagedObjectReference morDatastore = null; morDatastore = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, pool.getUuid()); if (morDatastore == null) - morDatastore = hyperHost.mountDatastore(pool.getType() == StoragePoolType.VMFS, pool.getHost(), pool.getPort(), pool.getPath(), pool.getUuid().replace("-", "")); + morDatastore = + hyperHost.mountDatastore(pool.getType() == StoragePoolType.VMFS, pool.getHost(), pool.getPort(), pool.getPath(), pool.getUuid().replace("-", "")); assert (morDatastore != null); DatastoreSummary summary = new DatastoreMO(getServiceContext(), morDatastore).getSummary(); @@ -4510,8 +4562,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa ManagedObjectReference morDs = null; if (cmd.getAttach() && cmd.isManaged()) { - morDs = getVmfsDatastore(hyperHost, getDatastoreName(cmd.get_iScsiName()), cmd.getStorageHost(), cmd.getStoragePort(), trimIqn(cmd.get_iScsiName()), - cmd.getChapInitiatorUsername(), cmd.getChapInitiatorPassword(), cmd.getChapTargetUsername(), cmd.getChapTargetPassword()); + morDs = + getVmfsDatastore(hyperHost, getDatastoreName(cmd.get_iScsiName()), cmd.getStorageHost(), cmd.getStoragePort(), trimIqn(cmd.get_iScsiName()), + cmd.getChapInitiatorUsername(), cmd.getChapInitiatorPassword(), cmd.getChapTargetUsername(), cmd.getChapTargetPassword()); DatastoreMO dsMo = new DatastoreMO(getServiceContext(), morDs); @@ -4720,6 +4773,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } } + @Override public ManagedObjectReference getVmfsDatastore(VmwareHypervisorHost hyperHost, String datastoreName, String storageIpAddress, int storagePortNumber, String iqn, String chapName, String chapSecret, String mutualChapName, String mutualChapSecret) throws Exception { VmwareContext context = getServiceContext(); @@ -5139,8 +5193,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa long used = capacity - free; if (s_logger.isDebugEnabled()) { - s_logger.debug("Datastore summary info, storageId: " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + cmd.getPooltype() + - ", capacity: " + capacity + ", free: " + free + ", used: " + used); + s_logger.debug("Datastore summary info, storageId: " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + + cmd.getPooltype() + ", capacity: " + capacity + ", free: " + free + ", used: " + used); } if (summary.getCapacity() <= 0) { @@ -5149,8 +5203,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return new GetStorageStatsAnswer(cmd, capacity, used); } else { - String msg = "Could not find datastore for GetStorageStatsCommand storageId : " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + - cmd.getPooltype(); + String msg = + "Could not find datastore for GetStorageStatsCommand storageId : " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + + cmd.getPooltype(); s_logger.error(msg); return new GetStorageStatsAnswer(cmd, msg); @@ -5161,8 +5216,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa invalidateServiceContext(); } - String msg = "Unable to execute GetStorageStatsCommand(storageId : " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + cmd.getPooltype() + - ") due to " + VmwareHelper.getExceptionMessage(e); + String msg = + "Unable to execute GetStorageStatsCommand(storageId : " + cmd.getStorageId() + ", localPath: " + cmd.getLocalPath() + ", poolType: " + cmd.getPooltype() + + ") due to " + VmwareHelper.getExceptionMessage(e); s_logger.error(msg, e); return new GetStorageStatsAnswer(cmd, msg); } @@ -5238,7 +5294,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (result.first()) return new Answer(cmd); } catch (Exception e) { - s_logger.error("Unable to execute ping command on DomR (" + controlIp + "), domR may not be ready yet. failure due to " + VmwareHelper.getExceptionMessage(e), e); + s_logger.error( + "Unable to execute ping command on DomR (" + controlIp + "), domR may not be ready yet. failure due to " + VmwareHelper.getExceptionMessage(e), e); } return new Answer(cmd, false, "PingTestCommand failed"); } @@ -5666,8 +5723,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.createDisk(volumeDatastorePath, getMBsFromBytes(dskch.getSize()), morDatastore, -1); vmMo.detachDisk(volumeDatastorePath, false); - VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), - null); + VolumeTO vol = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), + null); return new CreateAnswer(cmd, vol); } finally { vmMo.detachAllDisks(); @@ -5702,8 +5760,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa String srcFile = String.format("[%s] %s/", dsMo.getName(), vmdkName); dsMo.deleteFile(srcFile, dcMo.getMor(), true); - VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), - null); + VolumeTO vol = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), null); return new CreateAnswer(cmd, vol); } } else { @@ -5724,8 +5782,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.createDisk(volumeDatastorePath, getMBsFromBytes(dskch.getSize()), morDatastore, vmMo.getScsiDeviceControllerKey()); vmMo.detachDisk(volumeDatastorePath, false); - VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), volumeUuid, dskch.getSize(), - null); + VolumeTO vol = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), volumeUuid, dskch.getSize(), + null); return new CreateAnswer(cmd, vol); } finally { s_logger.info("Destroy dummy VM after volume creation"); @@ -5923,8 +5982,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa DatastoreSummary dsSummary = dsMo.getSummary(); String address = hostMo.getHostName(); - StoragePoolInfo pInfo = new StoragePoolInfo(poolUuid, address, dsMo.getMor().getValue(), "", StoragePoolType.LVM, dsSummary.getCapacity(), - dsSummary.getFreeSpace()); + StoragePoolInfo pInfo = + new StoragePoolInfo(poolUuid, address, dsMo.getMor().getValue(), "", StoragePoolType.LVM, dsSummary.getCapacity(), dsSummary.getFreeSpace()); StartupStorageCommand cmd = new StartupStorageCommand(); cmd.setName(poolUuid); cmd.setPoolInfo(pInfo); @@ -6118,8 +6177,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } if (oldState != State.Starting && oldState != State.Migrating) { - s_logger.debug("VM " + vm + " is now missing from host report and VM is not at starting/migrating state, remove it from host VM-sync map, oldState: " + - oldState); + s_logger.debug("VM " + vm + + " is now missing from host report and VM is not at starting/migrating state, remove it from host VM-sync map, oldState: " + oldState); _vms.remove(vm); } else { s_logger.debug("VM " + vm + " is missing from host report, but we will ignore VM " + vm + " in transition state " + oldState); @@ -6164,7 +6223,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return hyperHost.findVmOnPeerHyperHost(vmName) != null; } - protected OptionValue[] configureVnc(OptionValue[] optionsToMerge, VmwareHypervisorHost hyperHost, String vmName, String vncPassword, String keyboardLayout) throws Exception { + protected OptionValue[] configureVnc(OptionValue[] optionsToMerge, VmwareHypervisorHost hyperHost, String vmName, String vncPassword, String keyboardLayout) + throws Exception { VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmName); @@ -6385,7 +6445,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } String instanceNameCustomField = "value[" + key + "]"; - ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[] {"name", "summary.config.numCpu", "summary.quickStats.overallCpuUsage", instanceNameCustomField}); + ObjectContent[] ocs = + hyperHost.getVmPropertiesOnHyperHost(new String[] {"name", "summary.config.numCpu", "summary.quickStats.overallCpuUsage", instanceNameCustomField}); if (ocs != null && ocs.length > 0) { for (ObjectContent oc : ocs) { List objProps = oc.getPropSet(); @@ -6498,8 +6559,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + - args); + Pair result = + SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + args); if (!result.first()) { return null; @@ -6508,7 +6569,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return result.second(); } catch (Throwable e) { s_logger.error( - "Unable to execute NetworkUsage command on DomR (" + privateIpAddress + "), domR may not be ready yet. failure due to " + VmwareHelper.getExceptionMessage(e), e); + "Unable to execute NetworkUsage command on DomR (" + privateIpAddress + "), domR may not be ready yet. failure due to " + + VmwareHelper.getExceptionMessage(e), e); } return null; @@ -6732,8 +6794,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa _portsPerDvPortGroup = intObj.intValue(); s_logger.info("VmwareResource network configuration info." + " private traffic over vSwitch: " + _privateNetworkVSwitchName + ", public traffic over " + - _publicTrafficInfo.getVirtualSwitchType() + " : " + _publicTrafficInfo.getVirtualSwitchName() + ", guest traffic over " + - _guestTrafficInfo.getVirtualSwitchType() + " : " + _guestTrafficInfo.getVirtualSwitchName()); + _publicTrafficInfo.getVirtualSwitchType() + " : " + _publicTrafficInfo.getVirtualSwitchName() + ", guest traffic over " + + _guestTrafficInfo.getVirtualSwitchType() + " : " + _guestTrafficInfo.getVirtualSwitchName()); value = params.get("vmware.create.full.clone").toString(); if (value != null && value.equalsIgnoreCase("true")) { @@ -6752,8 +6814,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa value = (String)params.get("scripts.timeout"); int timeout = NumbersUtil.parseInt(value, 1440) * 1000; VmwareManager mgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - VmwareStorageProcessor storageProcessor = new VmwareStorageProcessor((VmwareHostService)this, _fullCloneFlag, (VmwareStorageMount)mgr, timeout, this, _shutdown_waitMs, - null); + VmwareStorageProcessor storageProcessor = + new VmwareStorageProcessor((VmwareHostService)this, _fullCloneFlag, (VmwareStorageMount)mgr, timeout, this, _shutdown_waitMs, null); storageHandler = new VmwareStorageSubsystemCommandHandler(storageProcessor); return true; diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java index 280819127c8..9616fffce12 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDevice.java @@ -65,6 +65,7 @@ public interface CiscoNexusVSMDevice extends InternalIdentity, Identity { public VSMDeviceState getvsmDeviceState(); + @Override public String getUuid(); } diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java index 98ec2253f60..136e44261b5 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java @@ -29,22 +29,22 @@ import com.cloud.dc.ClusterVSMMapVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.ClusterVSMMapDao; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceInUseException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDetailsDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.vmware.manager.VmwareManager; +import com.cloud.network.dao.CiscoNexusVSMDeviceDao; +import com.cloud.network.dao.PortProfileDao; import com.cloud.resource.ResourceManager; +import com.cloud.utils.cisco.n1kv.vsm.NetconfHelper; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.network.dao.CiscoNexusVSMDeviceDao; -import com.cloud.network.dao.PortProfileDao; -import com.cloud.exception.ResourceInUseException; -import com.cloud.utils.cisco.n1kv.vsm.NetconfHelper; public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { @@ -204,7 +204,8 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase { for (Host host : hosts) { if (host.getType() == Host.Type.Routing) { s_logger.info("Non-empty cluster with id" + clusterId + "still has a host that uses this VSM. Please empty the cluster first"); - throw new ResourceInUseException("Non-empty cluster with id" + clusterId + "still has a host that uses this VSM. Please empty the cluster first"); + throw new ResourceInUseException("Non-empty cluster with id" + clusterId + + "still has a host that uses this VSM. Please empty the cluster first"); } } } diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java index 8f9c0f7a9b9..afc52b56edf 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java @@ -26,9 +26,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.utils.db.Encrypt; -import org.apache.cloudstack.api.InternalIdentity; /** * CiscoNexusVSMDeviceVO contains information on external Cisco Nexus 1000v VSM devices added into a deployment. diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java index da93f556076..5660f1660b9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java @@ -17,6 +17,7 @@ package com.cloud.network.dao; import java.util.List; + import com.cloud.network.CiscoNexusVSMDeviceVO; import com.cloud.utils.db.GenericDao; diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java index e8a36fd7d0d..69517793dff 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java @@ -17,6 +17,7 @@ package com.cloud.network.dao; import java.util.List; + import javax.ejb.Local; import org.apache.log4j.Logger; @@ -75,35 +76,41 @@ public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase sc = domainIdSearch.create(); sc.setParameters("vsmSwitchDomainId", domId); return findOneBy(sc); } + @Override public CiscoNexusVSMDeviceVO getVSMbyName(String vsmName) { SearchCriteria sc = nameSearch.create(); sc.setParameters("vsmName", vsmName); return findOneBy(sc); } + @Override public CiscoNexusVSMDeviceVO getVSMbyIpaddress(String ipaddress) { SearchCriteria sc = ipaddrSearch.create(); sc.setParameters("ipaddr", ipaddress); return findOneBy(sc); } + @Override public List listByMgmtVlan(int vlanId) { SearchCriteria sc = mgmtVlanIdSearch.create(); sc.setParameters("managementVlan", vlanId); return search(sc, null); } + @Override public List listAllVSMs() { SearchCriteria sc = fullTableSearch.create(); return search(sc, null); } + @Override public List listByVlanId(int vlanId) { SearchCriteria sc = genericVlanIdSearch.create(); sc.setParameters("managementVlan", vlanId); diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index 6d5a52b9ae9..e92954e99b8 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java @@ -66,7 +66,6 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = NetworkElement.class) @@ -98,13 +97,14 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { return true; } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -124,7 +124,8 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -219,6 +220,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme return response; } + @Override public CiscoNexusVSMResponse createCiscoNexusVSMDetailedResponse(CiscoNexusVSMDevice vsmDeviceVO) { CiscoNexusVSMResponse response = new CiscoNexusVSMResponse(); response.setId(vsmDeviceVO.getUuid()); @@ -248,6 +250,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme return cmdList; } + @Override @DB public Pair validateAndAddVsm(final String vsmIp, final String vsmUser, final String vsmPassword, final long clusterId, String clusterName) throws ResourceInUseException { @@ -274,8 +277,8 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme List clusterList = _clusterVSMDao.listByVSMId(vsm.getId()); if (clusterList != null && !clusterList.isEmpty()) { s_logger.error("Failed to add cluster: specified Nexus VSM is already associated with another cluster"); - ResourceInUseException ex = new ResourceInUseException( - "Failed to add cluster: specified Nexus VSM is already associated with another cluster with specified Id"); + ResourceInUseException ex = + new ResourceInUseException("Failed to add cluster: specified Nexus VSM is already associated with another cluster with specified Id"); // get clusterUuid to report error ClusterVO cluster = _clusterDao.findById(clusterList.get(0).getClusterId()); ex.addProxyObject(cluster.getUuid()); diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java index 43101792c57..8e4a0d2a83d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java @@ -21,9 +21,10 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource; import org.apache.cloudstack.storage.resource.SecondaryStorageResourceHandler; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java index 30020076c61..ee0273ca1ba 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java @@ -18,8 +18,6 @@ package com.cloud.storage.resource; import org.apache.log4j.Logger; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import com.cloud.hypervisor.vmware.util.VmwareClient; import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.hypervisor.vmware.util.VmwareContextPool; diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java index 1c82a1f1b85..c91d7b6f2cd 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java @@ -20,11 +20,13 @@ import java.util.List; import javax.naming.OperationNotSupportedException; -import com.cloud.agent.api.storage.*; -import com.cloud.agent.api.to.DataTO; +import org.apache.log4j.Logger; + +import com.google.gson.Gson; +import com.vmware.vim25.ManagedObjectReference; + import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.resource.SecondaryStorageResourceHandler; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.BackupSnapshotCommand; @@ -32,6 +34,9 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand; import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand; import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; +import com.cloud.agent.api.storage.CopyVolumeCommand; +import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand; +import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.hypervisor.vmware.manager.VmwareHostService; import com.cloud.hypervisor.vmware.manager.VmwareStorageManager; import com.cloud.hypervisor.vmware.manager.VmwareStorageManagerImpl; @@ -48,8 +53,6 @@ import com.cloud.serializer.GsonHelper; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.StringUtils; -import com.google.gson.Gson; -import com.vmware.vim25.ManagedObjectReference; public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageResourceHandler, VmwareHostService, VmwareStorageMount { private static final Logger s_logger = Logger.getLogger(VmwareSecondaryStorageResourceHandler.class); @@ -212,7 +215,8 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe VmwareContext context = currentContext.get(); if (context == null) { - s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " + StringUtils.getMaskedPasswordForDisplay(password)); + s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " + + StringUtils.getMaskedPasswordForDisplay(password)); VmwareSecondaryStorageContextFactory.setVcenterSessionTimeout(vCenterSessionTimeout); context = VmwareSecondaryStorageContextFactory.getContext(vCenterAddress, username, password); } @@ -274,7 +278,8 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe for (Pair hostPair : hostsInCluster) { HostMO hostIteratorMo = new HostMO(hostMo.getContext(), hostPair.first()); - VmwareHypervisorHostNetworkSummary netSummary = hostIteratorMo.getHyperHostNetworkSummary(hostIteratorMo.getHostType() == VmwareHostType.ESXi ? cmd.getContextParam("manageportgroup") + VmwareHypervisorHostNetworkSummary netSummary = + hostIteratorMo.getHyperHostNetworkSummary(hostIteratorMo.getHostType() == VmwareHostType.ESXi ? cmd.getContextParam("manageportgroup") : cmd.getContextParam("serviceconsole")); _resource.ensureOutgoingRuleForAddress(netSummary.getHostIp()); @@ -323,7 +328,8 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe if (morHyperHost.getType().equalsIgnoreCase("HostSystem")) { HostMO hostMo = new HostMO(context, morHyperHost); try { - VmwareHypervisorHostNetworkSummary netSummary = hostMo.getHyperHostNetworkSummary(hostMo.getHostType() == VmwareHostType.ESXi ? cmd.getContextParam("manageportgroup") + VmwareHypervisorHostNetworkSummary netSummary = + hostMo.getHyperHostNetworkSummary(hostMo.getHostType() == VmwareHostType.ESXi ? cmd.getContextParam("manageportgroup") : cmd.getContextParam("serviceconsole")); assert (netSummary != null); if (netSummary.getHostIp() != null && !netSummary.getHostIp().isEmpty()) { @@ -345,19 +351,23 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe return true; } + @Override public ManagedObjectReference getVmfsDatastore(VmwareHypervisorHost hyperHost, String datastoreName, String storageIpAddress, int storagePortNumber, String iqn, String initiatorChapName, String initiatorChapSecret, String mutualChapName, String mutualChapSecret) throws Exception { throw new OperationNotSupportedException(); } + @Override public void createVmdk(Command cmd, DatastoreMO dsMo, String volumeDatastorePath, Long volumeSize) throws Exception { throw new OperationNotSupportedException(); } + @Override public void handleDatastoreAndVmdkDetach(String iqn, String storageHost, int storagePort) throws Exception { throw new OperationNotSupportedException(); } + @Override public void removeManagedTargetsFromCluster(List managedIqns) throws Exception { throw new OperationNotSupportedException(); } diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java index 92ef65817f5..96197ff03c1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java @@ -33,7 +33,8 @@ import com.cloud.utils.Pair; public class VmwareStorageLayoutHelper { private static final Logger s_logger = Logger.getLogger(VmwareStorageLayoutHelper.class); - public static String[] getVmdkFilePairDatastorePath(DatastoreMO dsMo, String vmName, String vmdkName, VmwareStorageLayoutType layoutType, boolean linkedVmdk) throws Exception { + public static String[] getVmdkFilePairDatastorePath(DatastoreMO dsMo, String vmName, String vmdkName, VmwareStorageLayoutType layoutType, boolean linkedVmdk) + throws Exception { String[] filePair = new String[2]; switch (layoutType) { diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java index 534b19e597c..455c85dd12b 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -22,11 +22,20 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.net.URI; import java.rmi.RemoteException; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; + +import com.google.gson.Gson; +import com.vmware.vim25.ManagedObjectReference; +import com.vmware.vim25.VirtualDisk; +import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo; + import org.apache.cloudstack.storage.command.AttachAnswer; import org.apache.cloudstack.storage.command.AttachCommand; import org.apache.cloudstack.storage.command.CopyCmdAnswer; @@ -40,8 +49,6 @@ import org.apache.cloudstack.storage.command.IntroduceObjectCmd; import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; @@ -76,10 +83,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.Ternary; import com.cloud.utils.script.Script; import com.cloud.vm.VirtualMachine.State; -import com.google.gson.Gson; -import com.vmware.vim25.ManagedObjectReference; -import com.vmware.vim25.VirtualDisk; -import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo; public class VmwareStorageProcessor implements StorageProcessor { private static final Logger s_logger = Logger.getLogger(VmwareStorageProcessor.class); @@ -119,17 +122,18 @@ public class VmwareStorageProcessor implements StorageProcessor { return null; } - private void copyTemplateFromSecondaryToPrimary(VmwareHypervisorHost hyperHost, DatastoreMO datastoreMo, String secondaryStorageUrl, String templatePathAtSecondaryStorage, - String templateName, String templateUuid) throws Exception { + private void copyTemplateFromSecondaryToPrimary(VmwareHypervisorHost hyperHost, DatastoreMO datastoreMo, String secondaryStorageUrl, + String templatePathAtSecondaryStorage, String templateName, String templateUuid) throws Exception { s_logger.info("Executing copyTemplateFromSecondaryToPrimary. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + - templatePathAtSecondaryStorage + ", templateName: " + templateName); + templatePathAtSecondaryStorage + ", templateName: " + templateName); String secondaryMountPoint = mountService.getMountPoint(secondaryStorageUrl); s_logger.info("Secondary storage mount point: " + secondaryMountPoint); - String srcOVAFileName = VmwareStorageLayoutHelper.getTemplateOnSecStorageFilePath(secondaryMountPoint, templatePathAtSecondaryStorage, templateName, - ImageFormat.OVA.getFileExtension()); + String srcOVAFileName = + VmwareStorageLayoutHelper.getTemplateOnSecStorageFilePath(secondaryMountPoint, templatePathAtSecondaryStorage, templateName, + ImageFormat.OVA.getFileExtension()); String srcFileName = getOVFFilePath(srcOVAFileName); if (srcFileName == null) { @@ -158,8 +162,9 @@ public class VmwareStorageProcessor implements StorageProcessor { VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmName); if (vmMo == null) { - String msg = "Failed to import OVA template. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + templatePathAtSecondaryStorage + - ", templateName: " + templateName + ", templateUuid: " + templateUuid; + String msg = + "Failed to import OVA template. secondaryStorage: " + secondaryStorageUrl + ", templatePathAtSecondaryStorage: " + templatePathAtSecondaryStorage + + ", templateName: " + templateName + ", templateUuid: " + templateUuid; s_logger.error(msg); throw new Exception(msg); } @@ -212,7 +217,8 @@ public class VmwareStorageProcessor implements StorageProcessor { assert (morDs != null); DatastoreMO primaryStorageDatastoreMo = new DatastoreMO(context, morDs); - copyTemplateFromSecondaryToPrimary(hyperHost, primaryStorageDatastoreMo, secondaryStorageUrl, templateInfo.first(), templateInfo.second(), templateUuidName); + copyTemplateFromSecondaryToPrimary(hyperHost, primaryStorageDatastoreMo, secondaryStorageUrl, templateInfo.first(), templateInfo.second(), + templateUuidName); } else { s_logger.info("Template " + templateInfo.second() + " has already been setup, skip the template setup process in primary storage"); } @@ -250,7 +256,8 @@ public class VmwareStorageProcessor implements StorageProcessor { s_logger.info("Move volume out of volume-wrapper VM "); String[] vmwareLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.VMWARE, true); - String[] legacyCloudStackLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, true); + String[] legacyCloudStackLayoutFilePair = + VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, true); dsMo.moveDatastoreFile(vmwareLayoutFilePair[0], dcMo.getMor(), dsMo.getMor(), legacyCloudStackLayoutFilePair[0], dcMo.getMor(), true); @@ -271,7 +278,8 @@ public class VmwareStorageProcessor implements StorageProcessor { s_logger.info("Move volume out of volume-wrapper VM "); String[] vmwareLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.VMWARE, false); - String[] legacyCloudStackLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, false); + String[] legacyCloudStackLayoutFilePair = + VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, false); dsMo.moveDatastoreFile(vmwareLayoutFilePair[0], dcMo.getMor(), dsMo.getMor(), legacyCloudStackLayoutFilePair[0], dcMo.getMor(), true); @@ -521,8 +529,9 @@ public class VmwareStorageProcessor implements StorageProcessor { Pair result; - result = copyVolumeToSecStorage(hostService, hyperHost, cmd, vmName, primaryStorage.getUuid(), srcVolume.getPath(), destVolume.getPath(), destStore.getUrl(), - hostService.getWorkerName(context, cmd, 0)); + result = + copyVolumeToSecStorage(hostService, hyperHost, cmd, vmName, primaryStorage.getUuid(), srcVolume.getPath(), destVolume.getPath(), destStore.getUrl(), + hostService.getWorkerName(context, cmd, 0)); VolumeObjectTO newVolume = new VolumeObjectTO(); newVolume.setPath(result.first() + File.separator + result.second()); return new CopyCmdAnswer(newVolume); @@ -576,8 +585,8 @@ public class VmwareStorageProcessor implements StorageProcessor { } } - private Ternary createTemplateFromVolume(VirtualMachineMO vmMo, String installPath, long templateId, String templateUniqueName, String secStorageUrl, - String volumePath, String workerVmName) throws Exception { + private Ternary createTemplateFromVolume(VirtualMachineMO vmMo, String installPath, long templateId, String templateUniqueName, + String secStorageUrl, String volumePath, String workerVmName) throws Exception { String secondaryMountPoint = mountService.getMountPoint(secStorageUrl); String installFullPath = secondaryMountPoint + "/" + installPath; @@ -610,8 +619,8 @@ public class VmwareStorageProcessor implements StorageProcessor { } // 4 MB is the minimum requirement for VM memory in VMware - Pair cloneResult = vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), - VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first())); + Pair cloneResult = + vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first())); clonedVm = cloneResult.first(); clonedVm.exportVm(secondaryMountPoint + "/" + installPath, templateUniqueName, true, false); @@ -658,7 +667,8 @@ public class VmwareStorageProcessor implements StorageProcessor { VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(volume.getVmName()); if (vmMo == null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + ", try within datacenter"); + s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + + ", try within datacenter"); } vmMo = hyperHost.findVmOnPeerHyperHost(volume.getVmName()); @@ -677,8 +687,9 @@ public class VmwareStorageProcessor implements StorageProcessor { } } - Ternary result = createTemplateFromVolume(vmMo, template.getPath(), template.getId(), template.getName(), secondaryStoragePoolURL, volumePath, - hostService.getWorkerName(context, cmd, 0)); + Ternary result = + createTemplateFromVolume(vmMo, template.getPath(), template.getId(), template.getName(), secondaryStoragePoolURL, volumePath, + hostService.getWorkerName(context, cmd, 0)); TemplateObjectTO newTemplate = new TemplateObjectTO(); newTemplate.setPath(result.first()); @@ -724,8 +735,8 @@ public class VmwareStorageProcessor implements StorageProcessor { } } - private Ternary createTemplateFromSnapshot(String installPath, String templateUniqueName, String secStorageUrl, String snapshotPath, Long templateId) - throws Exception { + private Ternary createTemplateFromSnapshot(String installPath, String templateUniqueName, String secStorageUrl, String snapshotPath, + Long templateId) throws Exception { //Snapshot path is decoded in this form: /snapshots/account/volumeId/uuid/uuid String backupSSUuid; String snapshotFolder; @@ -891,8 +902,8 @@ public class VmwareStorageProcessor implements StorageProcessor { } // return Pair - private Pair exportVolumeToSecondaryStroage(VirtualMachineMO vmMo, String volumePath, String secStorageUrl, String secStorageDir, String exportName, - String workerVmName) throws Exception { + private Pair exportVolumeToSecondaryStroage(VirtualMachineMO vmMo, String volumePath, String secStorageUrl, String secStorageDir, + String exportName, String workerVmName) throws Exception { String secondaryMountPoint = mountService.getMountPoint(secStorageUrl); String exportPath = secondaryMountPoint + "/" + secStorageDir + "/" + exportName; @@ -919,8 +930,8 @@ public class VmwareStorageProcessor implements StorageProcessor { } // 4 MB is the minimum requirement for VM memory in VMware - Pair cloneResult = vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), - VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first())); + Pair cloneResult = + vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first())); clonedVm = cloneResult.first(); String disks[] = cloneResult.second(); @@ -1018,8 +1029,9 @@ public class VmwareStorageProcessor implements StorageProcessor { throw new Exception("Failed to take snapshot " + srcSnapshot.getName() + " on vm: " + vmName); } - backupResult = backupSnapshotToSecondaryStorage(vmMo, destSnapshot.getPath(), srcSnapshot.getVolume().getPath(), snapshotUuid, secondaryStorageUrl, - prevSnapshotUuid, prevBackupUuid, hostService.getWorkerName(context, cmd, 1)); + backupResult = + backupSnapshotToSecondaryStorage(vmMo, destSnapshot.getPath(), srcSnapshot.getVolume().getPath(), snapshotUuid, secondaryStorageUrl, + prevSnapshotUuid, prevBackupUuid, hostService.getWorkerName(context, cmd, 1)); snapshotBackupUuid = backupResult.first(); success = (snapshotBackupUuid != null); @@ -1143,9 +1155,10 @@ public class VmwareStorageProcessor implements StorageProcessor { if (isAttach && isManaged) { Map details = disk.getDetails(); - morDs = hostService.getVmfsDatastore(hyperHost, VmwareResource.getDatastoreName(iScsiName), storageHost, storagePort, VmwareResource.trimIqn(iScsiName), - details.get(DiskTO.CHAP_INITIATOR_USERNAME), details.get(DiskTO.CHAP_INITIATOR_SECRET), details.get(DiskTO.CHAP_TARGET_USERNAME), - details.get(DiskTO.CHAP_TARGET_SECRET)); + morDs = + hostService.getVmfsDatastore(hyperHost, VmwareResource.getDatastoreName(iScsiName), storageHost, storagePort, VmwareResource.trimIqn(iScsiName), + details.get(DiskTO.CHAP_INITIATOR_USERNAME), details.get(DiskTO.CHAP_INITIATOR_SECRET), details.get(DiskTO.CHAP_TARGET_USERNAME), + details.get(DiskTO.CHAP_TARGET_SECRET)); DatastoreMO dsMo = new DatastoreMO(hostService.getServiceContext(null), morDs); @@ -1155,7 +1168,9 @@ public class VmwareStorageProcessor implements StorageProcessor { hostService.createVmdk(cmd, dsMo, volumeDatastorePath, volumeTO.getSize()); } } else { - morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, isManaged ? VmwareResource.getDatastoreName(iScsiName) : primaryStore.getUuid()); + morDs = + HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, + isManaged ? VmwareResource.getDatastoreName(iScsiName) : primaryStore.getUuid()); } if (morDs == null) { @@ -1439,7 +1454,7 @@ public class VmwareStorageProcessor implements StorageProcessor { List networks = vmMo.getNetworksWithDetails(); // tear down all devices first before we destroy the VM to avoid accidently delete disk backing files - if (this.resource.getVmState(vmMo) != State.Stopped) { + if (VmwareResource.getVmState(vmMo) != State.Stopped) { vmMo.safePowerOff(_shutdown_waitMs); } diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java index c79e6a87a1b..8391c6416d8 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java @@ -18,6 +18,17 @@ */ package com.cloud.storage.resource; +import java.io.File; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.storage.command.CopyCmdAnswer; +import org.apache.cloudstack.storage.command.CopyCommand; +import org.apache.cloudstack.storage.command.DeleteCommand; +import org.apache.cloudstack.storage.to.SnapshotObjectTO; +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataStoreTO; @@ -27,15 +38,6 @@ import com.cloud.agent.api.to.S3TO; import com.cloud.agent.api.to.SwiftTO; import com.cloud.hypervisor.vmware.manager.VmwareStorageManager; import com.cloud.storage.DataStoreRole; -import org.apache.cloudstack.storage.command.CopyCmdAnswer; -import org.apache.cloudstack.storage.command.CopyCommand; -import org.apache.cloudstack.storage.command.DeleteCommand; -import org.apache.cloudstack.storage.to.SnapshotObjectTO; -import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; - -import java.io.File; public class VmwareStorageSubsystemCommandHandler extends StorageSubsystemCommandHandlerBase { private static final Logger s_logger = Logger.getLogger(VmwareStorageSubsystemCommandHandler.class); diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java index 06790b537f0..8a8f98ad79f 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java @@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.zone; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,7 +29,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.VmwareDatacenterResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java index aa5fae27a1f..9fbf09a2000 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java @@ -73,7 +73,8 @@ public class ListVmwareDcsCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { List vmwareDcList = null; try { diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java index bab34d285ac..631413913c6 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java @@ -69,7 +69,7 @@ public class RemoveVmwareDcCmd extends BaseCmd { } } catch (ResourceInUseException ex) { s_logger.warn("The zone has one or more resources (like cluster), hence not able to remove VMware datacenter from zone." - + " Please remove all resource from zone, and retry. Exception: ", ex); + + " Please remove all resource from zone, and retry. Exception: ", ex); ServerApiException e = new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage()); for (String proxyObj : ex.getIdProxyList()) { e.addProxyObject(proxyObj); diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java index 64fc1fac0d2..3930d8ec68d 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java @@ -24,6 +24,9 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; @@ -33,8 +36,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java index 3ecd54de2f7..4a0048905d1 100644 --- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java +++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java @@ -32,6 +32,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -164,8 +165,9 @@ public class VmwareDatacenterApiUnitTest { ComponentContext.initComponentsLifeCycle(); MockitoAnnotations.initMocks(this); - DataCenterVO zone = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, - true, true, null, null); + DataCenterVO zone = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); zoneId = 1L; HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), zoneId, "192.168.56.1", "192.168.56.0/24", 8, "test"); @@ -199,21 +201,21 @@ public class VmwareDatacenterApiUnitTest { dcZoneMap = new VmwareDatacenterZoneMapVO(zoneId, vmwareDcId); - Mockito.when(_dcDao.persist(Mockito.any(DataCenterVO.class))).thenReturn(zone); + Mockito.when(_dcDao.persist(Matchers.any(DataCenterVO.class))).thenReturn(zone); Mockito.when(_dcDao.findById(1L)).thenReturn(zone); - Mockito.when(_podDao.persist(Mockito.any(HostPodVO.class))).thenReturn(pod); + Mockito.when(_podDao.persist(Matchers.any(HostPodVO.class))).thenReturn(pod); Mockito.when(_podDao.findById(1L)).thenReturn(pod); - Mockito.when(_clusterDao.persist(Mockito.any(ClusterVO.class))).thenReturn(cluster); + Mockito.when(_clusterDao.persist(Matchers.any(ClusterVO.class))).thenReturn(cluster); Mockito.when(_clusterDao.findById(1L)).thenReturn(cluster); Mockito.when(_clusterDao.listByZoneId(1L)).thenReturn(null); Mockito.when(_clusterDao.expunge(1L)).thenReturn(true); - Mockito.when(_clusterDetailsDao.persist(Mockito.any(ClusterDetailsVO.class))).thenReturn(clusterDetails); + Mockito.when(_clusterDetailsDao.persist(Matchers.any(ClusterDetailsVO.class))).thenReturn(clusterDetails); Mockito.when(_clusterDetailsDao.expunge(1L)).thenReturn(true); - Mockito.when(_vmwareDcDao.persist(Mockito.any(VmwareDatacenterVO.class))).thenReturn(dc); + Mockito.when(_vmwareDcDao.persist(Matchers.any(VmwareDatacenterVO.class))).thenReturn(dc); Mockito.when(_vmwareDcDao.findById(1L)).thenReturn(null); Mockito.when(_vmwareDcDao.expunge(1L)).thenReturn(true); Mockito.when(_vmwareDcDao.getVmwareDatacenterByNameAndVcenter(vmwareDcName, vCenterHost)).thenReturn(null); - Mockito.when(_vmwareDcZoneMapDao.persist(Mockito.any(VmwareDatacenterZoneMapVO.class))).thenReturn(dcZoneMap); + Mockito.when(_vmwareDcZoneMapDao.persist(Matchers.any(VmwareDatacenterZoneMapVO.class))).thenReturn(dcZoneMap); Mockito.when(_vmwareDcZoneMapDao.findByZoneId(1L)).thenReturn(null); Mockito.when(_vmwareDcZoneMapDao.expunge(1L)).thenReturn(true); Mockito.when(addCmd.getZoneId()).thenReturn(1L); diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java index d37216a2bbb..9f817add11d 100644 --- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java +++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java @@ -16,6 +16,18 @@ // under the License. package com.cloud.hypervisor.vmware.resource; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; + +import com.vmware.vim25.VirtualMachineConfigSpec; + import com.cloud.agent.api.Command; import com.cloud.agent.api.ScaleVmAnswer; import com.cloud.agent.api.ScaleVmCommand; @@ -23,15 +35,6 @@ import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.vmware.mo.VirtualMachineMO; import com.cloud.hypervisor.vmware.mo.VmwareHypervisorHost; import com.cloud.hypervisor.vmware.util.VmwareContext; -import com.cloud.hypervisor.vmware.util.VmwareHelper; -import com.vmware.vim25.VirtualMachineConfigSpec; -import org.junit.Test; -import org.junit.Before; - -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.MockitoAnnotations; -import static org.mockito.Mockito.*; public class VmwareResourceTest { diff --git a/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java b/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java index bcc24bfa0bb..44296c93b2b 100644 --- a/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java +++ b/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java @@ -16,6 +16,13 @@ // under the License. package org.apache.cloudstack.storage.motion; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -23,18 +30,6 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; -import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; -import org.apache.cloudstack.framework.async.AsyncCallFuture; -import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; -import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcContext; -import org.apache.cloudstack.storage.command.CommandResult; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.test.utils.SpringUtils; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -52,6 +47,19 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import org.apache.cloudstack.framework.async.AsyncRpcContext; +import org.apache.cloudstack.storage.command.CommandResult; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.MigrateWithStorageAnswer; import com.cloud.agent.api.MigrateWithStorageCommand; @@ -63,14 +71,6 @@ import com.cloud.utils.component.ComponentContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDao; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) public class VmwareStorageMotionStrategyTest { diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 355e0baab4f..8ca515fcdc8 100755 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -150,8 +150,8 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List hostTags) throws DiscoveryException { Map> resources = new HashMap>(); Connection conn = null; if (!url.getScheme().equals("http")) { @@ -465,8 +465,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L return new XcpOssResource(); } - String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.2.0 but this one is " + - prodBrand + " " + prodVersion; + String msg = + "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.2.0 but this one is " + + prodBrand + " " + prodVersion; _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg); s_logger.debug(msg); throw new RuntimeException(msg); @@ -552,8 +553,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L Long id; if (tmplt == null) { id = _tmpltDao.getNextInSequence(Long.class, "id"); - VMTemplateVO template = VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, - Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer); + VMTemplateVO template = + VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, Account.ACCOUNT_ID_SYSTEM, + null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer); _tmpltDao.persist(template); } else { id = tmplt.getId(); @@ -618,8 +620,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } if (resource == null) { - String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0, 6.2.0 but this one is " + - prodBrand + " " + prodVersion; + String msg = + "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0, 6.2.0 but this one is " + + prodBrand + " " + prodVersion; s_logger.debug(msg); throw new RuntimeException(msg); } @@ -734,8 +737,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } } if (!success) { - String msg = "Unable to eject host " + host.getGuid() + " due to there is no host up in this cluster, please execute xe pool-eject host-uuid=" + host.getGuid() + - "in this host " + host.getPrivateIpAddress(); + String msg = + "Unable to eject host " + host.getGuid() + " due to there is no host up in this cluster, please execute xe pool-eject host-uuid=" + host.getGuid() + + "in this host " + host.getPrivateIpAddress(); s_logger.warn(msg); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Unable to eject host " + host.getGuid(), msg); } diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index 77ee5d93168..605a0606d7e 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -16,11 +16,11 @@ // under the License. package com.cloud.hypervisor.xen.resource; -import org.apache.log4j.Logger; - import java.util.ArrayList; import java.util.HashMap; +import org.apache.log4j.Logger; + /** * Reduce bloat inside CitrixResourceBase * diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 3a537717b41..2cc0ec0a6b2 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -16,6 +16,87 @@ // under the License. package com.cloud.hypervisor.xen.resource; +import static com.cloud.utils.ReflectUtil.flattenProperties; +import static com.google.common.collect.Lists.newArrayList; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Queue; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + +import javax.ejb.Local; +import javax.naming.ConfigurationException; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.commons.codec.binary.Base64; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; + +import com.google.gson.Gson; +import com.trilead.ssh2.SCPClient; +import com.xensource.xenapi.Bond; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Console; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.HostCpu; +import com.xensource.xenapi.HostMetrics; +import com.xensource.xenapi.Network; +import com.xensource.xenapi.PBD; +import com.xensource.xenapi.PIF; +import com.xensource.xenapi.PIF.Record; +import com.xensource.xenapi.Pool; +import com.xensource.xenapi.SR; +import com.xensource.xenapi.Session; +import com.xensource.xenapi.Task; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.Types.BadAsyncResult; +import com.xensource.xenapi.Types.BadServerResponse; +import com.xensource.xenapi.Types.ConsoleProtocol; +import com.xensource.xenapi.Types.IpConfigurationMode; +import com.xensource.xenapi.Types.OperationNotAllowed; +import com.xensource.xenapi.Types.SrFull; +import com.xensource.xenapi.Types.VbdType; +import com.xensource.xenapi.Types.VmBadPowerState; +import com.xensource.xenapi.Types.VmPowerState; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VBD; +import com.xensource.xenapi.VBDMetrics; +import com.xensource.xenapi.VDI; +import com.xensource.xenapi.VIF; +import com.xensource.xenapi.VLAN; +import com.xensource.xenapi.VM; +import com.xensource.xenapi.VMGuestMetrics; +import com.xensource.xenapi.XenAPIObject; + +import org.apache.cloudstack.storage.command.StorageSubSystemCommand; +import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; + import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachIsoCommand; @@ -119,7 +200,35 @@ import com.cloud.agent.api.check.CheckSshCommand; import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand; import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer; import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand; -import com.cloud.agent.api.routing.*; +import com.cloud.agent.api.routing.CreateIpAliasCommand; +import com.cloud.agent.api.routing.DeleteIpAliasCommand; +import com.cloud.agent.api.routing.DhcpEntryCommand; +import com.cloud.agent.api.routing.DnsMasqConfigCommand; +import com.cloud.agent.api.routing.IpAliasTO; +import com.cloud.agent.api.routing.IpAssocAnswer; +import com.cloud.agent.api.routing.IpAssocCommand; +import com.cloud.agent.api.routing.IpAssocVpcCommand; +import com.cloud.agent.api.routing.LoadBalancerConfigCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand; +import com.cloud.agent.api.routing.SavePasswordCommand; +import com.cloud.agent.api.routing.SetFirewallRulesAnswer; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetMonitorServiceCommand; +import com.cloud.agent.api.routing.SetNetworkACLAnswer; +import com.cloud.agent.api.routing.SetNetworkACLCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesAnswer; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand; +import com.cloud.agent.api.routing.SetSourceNatAnswer; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesAnswer; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.routing.SetStaticRouteAnswer; +import com.cloud.agent.api.routing.SetStaticRouteCommand; +import com.cloud.agent.api.routing.Site2SiteVpnCfgCommand; +import com.cloud.agent.api.routing.VmDataCommand; +import com.cloud.agent.api.routing.VpnUsersCfgCommand; import com.cloud.agent.api.storage.CopyVolumeAnswer; import com.cloud.agent.api.storage.CopyVolumeCommand; import com.cloud.agent.api.storage.CreateAnswer; @@ -148,7 +257,6 @@ import com.cloud.agent.api.to.VolumeTO; import com.cloud.exception.InternalErrorException; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.xen.resource.CitrixHelper; import com.cloud.network.HAProxyConfigurator; import com.cloud.network.LoadBalancerConfigurator; import com.cloud.network.Networks; @@ -182,9 +290,9 @@ import com.cloud.storage.template.TemplateProp; import com.cloud.template.VirtualMachineTemplate.BootloaderType; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.utils.Ternary; import com.cloud.utils.S3Utils; import com.cloud.utils.StringUtils; +import com.cloud.utils.Ternary; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.DiskProfile; @@ -192,85 +300,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.snapshot.VMSnapshot; -import com.google.gson.Gson; -import com.trilead.ssh2.SCPClient; -import com.xensource.xenapi.Bond; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Console; -import com.xensource.xenapi.Host; -import com.xensource.xenapi.HostCpu; -import com.xensource.xenapi.HostMetrics; -import com.xensource.xenapi.Network; -import com.xensource.xenapi.PBD; -import com.xensource.xenapi.PIF; -import com.xensource.xenapi.PIF.Record; -import com.xensource.xenapi.Pool; -import com.xensource.xenapi.SR; -import com.xensource.xenapi.Session; -import com.xensource.xenapi.Task; -import com.xensource.xenapi.Types; -import com.xensource.xenapi.Types.BadAsyncResult; -import com.xensource.xenapi.Types.BadServerResponse; -import com.xensource.xenapi.Types.ConsoleProtocol; -import com.xensource.xenapi.Types.IpConfigurationMode; -import com.xensource.xenapi.Types.OperationNotAllowed; -import com.xensource.xenapi.Types.SrFull; -import com.xensource.xenapi.Types.VbdType; -import com.xensource.xenapi.Types.VmBadPowerState; -import com.xensource.xenapi.Types.VmPowerState; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VBD; -import com.xensource.xenapi.VBDMetrics; -import com.xensource.xenapi.VDI; -import com.xensource.xenapi.VIF; -import com.xensource.xenapi.VLAN; -import com.xensource.xenapi.VM; -import com.xensource.xenapi.VMGuestMetrics; -import com.xensource.xenapi.XenAPIObject; - -import org.apache.cloudstack.storage.command.StorageSubSystemCommand; -import org.apache.cloudstack.storage.to.TemplateObjectTO; -import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; -import org.apache.xmlrpc.XmlRpcException; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; - -import javax.ejb.Local; -import javax.naming.ConfigurationException; -import javax.xml.parsers.DocumentBuilderFactory; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Queue; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - -import static com.cloud.utils.ReflectUtil.flattenProperties; -import static com.google.common.collect.Lists.newArrayList; /** * CitrixResourceBase encapsulates the calls to the XenServer Xapi process @@ -637,8 +666,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Long newDynamicMemoryMax = vmSpec.getMaxRam(); if (staticMemoryMin > newDynamicMemoryMin || newDynamicMemoryMax > staticMemoryMax) { throw new CloudRuntimeException("Cannot scale up the vm because of memory constraint violation: " + "0 <= memory-static-min(" + staticMemoryMin + - ") <= memory-dynamic-min(" + newDynamicMemoryMin + ") <= memory-dynamic-max(" + newDynamicMemoryMax + ") <= memory-static-max(" + - staticMemoryMax + ")"); + ") <= memory-dynamic-min(" + newDynamicMemoryMin + ") <= memory-dynamic-max(" + newDynamicMemoryMax + ") <= memory-static-max(" + staticMemoryMax + ")"); } vm.setMemoryDynamicRange(conn, newDynamicMemoryMin, newDynamicMemoryMax); @@ -678,7 +706,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe // If DMC is not enable then don't execute this command. if (!isDmcEnabled(conn, host)) { throw new CloudRuntimeException("Unable to scale the vm: " + vmName + " as DMC - Dynamic memory control is not enabled for the XenServer:" + _host.uuid + - " ,check your license and hypervisor version."); + " ,check your license and hypervisor version."); } // stop vm which is running on this host or is in halted state @@ -797,8 +825,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe private String revertToSnapshot(Connection conn, VM vmSnapshot, String vmName, String oldVmUuid, Boolean snapshotMemory, String hostUUID) throws XenAPIException, XmlRpcException { - String results = callHostPluginAsync(conn, "vmopsSnapshot", "revert_memory_snapshot", 10 * 60 * 1000, "snapshotUUID", vmSnapshot.getUuid(conn), "vmName", vmName, - "oldVmUuid", oldVmUuid, "snapshotMemory", snapshotMemory.toString(), "hostUUID", hostUUID); + String results = + callHostPluginAsync(conn, "vmopsSnapshot", "revert_memory_snapshot", 10 * 60 * 1000, "snapshotUUID", vmSnapshot.getUuid(conn), "vmName", vmName, "oldVmUuid", + oldVmUuid, "snapshotMemory", snapshotMemory.toString(), "hostUUID", hostUUID); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "revert_memory_snapshot return null"; @@ -975,8 +1004,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe if (!configured) { // Plug dom0 vif only if not done before for network and host enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + key); - String result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge, "key", String.valueOf(key), "xs_nw_uuid", nw.getUuid(conn), "cs_host_id", - ((Long)hostId).toString()); + String result = + callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge, "key", String.valueOf(key), "xs_nw_uuid", nw.getUuid(conn), "cs_host_id", + ((Long)hostId).toString()); //Note down the fact that the ovs bridge has been setup String[] res = result.split(":"); if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) { @@ -1605,8 +1635,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String result = null; if (cmd.getType() == PvlanSetupCommand.Type.DHCP) { - result = callHostPlugin(conn, "ovs-pvlan", "setup-pvlan-dhcp", "op", op, "nw-label", nwNameLabel, "primary-pvlan", primaryPvlan, "isolated-pvlan", isolatedPvlan, - "dhcp-name", dhcpName, "dhcp-ip", dhcpIp, "dhcp-mac", dhcpMac); + result = + callHostPlugin(conn, "ovs-pvlan", "setup-pvlan-dhcp", "op", op, "nw-label", nwNameLabel, "primary-pvlan", primaryPvlan, "isolated-pvlan", isolatedPvlan, + "dhcp-name", dhcpName, "dhcp-ip", dhcpIp, "dhcp-mac", dhcpMac); if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) { s_logger.warn("Failed to program pvlan for dhcp server with mac " + dhcpMac); return new Answer(cmd, false, result); @@ -1614,8 +1645,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe s_logger.info("Programmed pvlan for dhcp server with mac " + dhcpMac); } } else if (cmd.getType() == PvlanSetupCommand.Type.VM) { - result = callHostPlugin(conn, "ovs-pvlan", "setup-pvlan-vm", "op", op, "nw-label", nwNameLabel, "primary-pvlan", primaryPvlan, "isolated-pvlan", isolatedPvlan, - "vm-mac", vmMac); + result = + callHostPlugin(conn, "ovs-pvlan", "setup-pvlan-vm", "op", op, "nw-label", nwNameLabel, "primary-pvlan", primaryPvlan, "isolated-pvlan", isolatedPvlan, + "vm-mac", vmMac); if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) { s_logger.warn("Failed to program pvlan for vm with mac " + vmMac); return new Answer(cmd, false, result); @@ -1709,8 +1741,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe for (NicTO nic : vmSpec.getNics()) { if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vswitch) { HashMap args = parseDefaultOvsRuleComamnd(BroadcastDomainType.getValue(nic.getBroadcastUri())); - OvsSetTagAndFlowCommand flowCmd = new OvsSetTagAndFlowCommand(args.get("vmName"), args.get("tag"), args.get("vlans"), args.get("seqno"), - Long.parseLong(args.get("vmId"))); + OvsSetTagAndFlowCommand flowCmd = + new OvsSetTagAndFlowCommand(args.get("vmName"), args.get("tag"), args.get("vlans"), args.get("seqno"), Long.parseLong(args.get("vmId"))); OvsSetTagAndFlowAnswer r = execute(flowCmd); if (!r.getResult()) { s_logger.warn("Failed to set flow for VM " + r.getVmId()); @@ -1728,7 +1760,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe NicTO[] nics = vmSpec.getNics(); boolean secGrpEnabled = false; for (NicTO nic : nics) { - if (nic.isSecurityGroupEnabled() || (nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString()))) { + if (nic.isSecurityGroupEnabled() || + (nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString()))) { secGrpEnabled = true; break; } @@ -1746,7 +1779,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe //For user vm, program the rules for each nic if the isolation uri scheme is ec2 NicTO[] nics = vmSpec.getNics(); for (NicTO nic : nics) { - if (nic.isSecurityGroupEnabled() || nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) { + if (nic.isSecurityGroupEnabled() || nic.getIsolationUri() != null && + nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) { List nicSecIps = nic.getNicSecIps(); String secIpsStr; StringBuilder sb = new StringBuilder(); @@ -1758,8 +1792,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } else { secIpsStr = "0:"; } - result = callHostPlugin(conn, "vmops", "default_network_rules", "vmName", vmName, "vmIP", nic.getIp(), "vmMAC", nic.getMac(), "vmID", - Long.toString(vmSpec.getId()), "secIps", secIpsStr); + result = + callHostPlugin(conn, "vmops", "default_network_rules", "vmName", vmName, "vmIP", nic.getIp(), "vmMAC", nic.getMac(), "vmID", + Long.toString(vmSpec.getId()), "secIps", secIpsStr); if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) { s_logger.warn("Failed to program default network rules for " + vmName + " on nic with ip:" + nic.getIp() + " mac:" + nic.getMac()); @@ -2357,8 +2392,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return new Answer(cmd); } - protected void assignPublicIpAddress(Connection conn, String vmName, String privateIpAddress, String publicIpAddress, boolean add, boolean firstIP, boolean sourceNat, - String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, Integer networkRate, TrafficType trafficType, String name) throws InternalErrorException { + protected void assignPublicIpAddress(Connection conn, String vmName, String privateIpAddress, String publicIpAddress, boolean add, boolean firstIP, + boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, Integer networkRate, TrafficType trafficType, String name) + throws InternalErrorException { try { VM router = getVM(conn, vmName); @@ -2554,8 +2590,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe IpAddressTO[] ips = cmd.getIpAddresses(); for (IpAddressTO ip : ips) { - assignPublicIpAddress(conn, routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(), - ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getNetworkRate(), ip.getTrafficType(), ip.getNetworkName()); + assignPublicIpAddress(conn, routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), + ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getNetworkRate(), ip.getTrafficType(), ip.getNetworkName()); results[i++] = ip.getPublicIp() + " - success"; } } catch (InternalErrorException e) { @@ -3169,8 +3205,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String createTemplateFromSnapshot(Connection conn, String templatePath, String snapshotPath, int wait) { String tmpltLocalDir = UUID.randomUUID().toString(); - String results = callHostPluginAsync(conn, "vmopspremium", "create_privatetemplate_from_snapshot", wait, "templatePath", templatePath, "snapshotPath", snapshotPath, - "tmpltLocalDir", tmpltLocalDir); + String results = + callHostPluginAsync(conn, "vmopspremium", "create_privatetemplate_from_snapshot", wait, "templatePath", templatePath, "snapshotPath", snapshotPath, + "tmpltLocalDir", tmpltLocalDir); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "create_privatetemplate_from_snapshot return null"; @@ -3220,7 +3257,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String copy_vhd_from_secondarystorage(Connection conn, String mountpoint, String sruuid, int wait) { String nameLabel = "cloud-" + UUID.randomUUID().toString(); - String results = callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel", nameLabel); + String results = + callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel", nameLabel); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "copy_vhd_from_secondarystorage return null"; @@ -3665,7 +3703,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe long beginTime = System.currentTimeMillis(); if (s_logger.isTraceEnabled()) { s_logger.trace("Task " + task.getNameLabel(c) + " (" + task.getUuid(c) + ") sent to " + c.getSessionReference() + " is pending completion with a " + timeout + - "ms timeout"); + "ms timeout"); } while (task.getStatus(c) == Types.TaskStatusType.PENDING) { try { @@ -3888,8 +3926,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe boolean swiftDownload(Connection conn, SwiftTO swift, String container, String rfilename, String dir, String lfilename, Boolean remote) { String result = null; try { - result = callHostPluginAsync(conn, "swiftxen", "swift", 60 * 60, "op", "download", "url", swift.getUrl(), "account", swift.getAccount(), "username", - swift.getUserName(), "key", swift.getKey(), "rfilename", rfilename, "dir", dir, "lfilename", lfilename, "remote", remote.toString()); + result = + callHostPluginAsync(conn, "swiftxen", "swift", 60 * 60, "op", "download", "url", swift.getUrl(), "account", swift.getAccount(), "username", + swift.getUserName(), "key", swift.getKey(), "rfilename", rfilename, "dir", dir, "lfilename", lfilename, "remote", remote.toString()); if (result != null && result.equals("true")) { return true; } @@ -3902,8 +3941,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe boolean swiftUpload(Connection conn, SwiftTO swift, String container, String ldir, String lfilename, Boolean isISCSI, int wait) { String result = null; try { - result = callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username", swift.getUserName(), - "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString()); + result = + callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username", + swift.getUserName(), "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString()); if (result != null && result.equals("true")) { return true; } @@ -3916,8 +3956,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe boolean swiftDelete(Connection conn, SwiftTO swift, String rfilename) { String result = null; try { - result = callHostPlugin(conn, "swiftxen", "swift", "op", "delete", "url", swift.getUrl(), "account", swift.getAccount(), "username", swift.getUserName(), "key", - swift.getKey(), "rfilename", rfilename); + result = + callHostPlugin(conn, "swiftxen", "swift", "op", "delete", "url", swift.getUrl(), "account", swift.getAccount(), "username", swift.getUserName(), "key", + swift.getKey(), "rfilename", rfilename); if (result != null && result.equals("true")) { return true; } @@ -3941,8 +3982,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return lfilename; } - protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, Long dcId, Long accountId, Long volumeId, String secondaryStorageMountPath, String snapshotUuid, - String prevBackupUuid, Boolean isISCSI, int wait, Long secHostId) { + protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, Long dcId, Long accountId, Long volumeId, String secondaryStorageMountPath, + String snapshotUuid, String prevBackupUuid, Boolean isISCSI, int wait, Long secHostId) { String backupSnapshotUuid = null; if (prevBackupUuid == null) { @@ -3952,13 +3993,15 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe // Each argument is put in a separate line for readability. // Using more lines does not harm the environment. String backupUuid = UUID.randomUUID().toString(); - String results = callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "dcId", dcId.toString(), "accountId", - accountId.toString(), "volumeId", volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", - prevBackupUuid, "backupUuid", backupUuid, "isISCSI", isISCSI.toString(), "secHostId", secHostId.toString()); + String results = + callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "dcId", dcId.toString(), "accountId", + accountId.toString(), "volumeId", volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, + "prevBackupUuid", prevBackupUuid, "backupUuid", backupUuid, "isISCSI", isISCSI.toString(), "secHostId", secHostId.toString()); String errMsg = null; if (results == null || results.isEmpty()) { - errMsg = "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " from primary storage " + primaryStorageSRUuid + " to secondary storage " + - secondaryStorageMountPath + " due to null"; + errMsg = + "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " from primary storage " + primaryStorageSRUuid + + " to secondary storage " + secondaryStorageMountPath + " due to null"; } else { String[] tmp = results.split("#"); @@ -3971,8 +4014,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe s_logger.debug("Successfully copied backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " to secondary storage"); return backupSnapshotUuid; } else { - errMsg = "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " from primary storage " + primaryStorageSRUuid + - " to secondary storage " + secondaryStorageMountPath + " due to " + tmp[1]; + errMsg = + "Could not copy backupUuid: " + backupSnapshotUuid + " of volumeId: " + volumeId + " from primary storage " + primaryStorageSRUuid + + " to secondary storage " + secondaryStorageMountPath + " due to " + tmp[1]; } } String source = backupUuid + ".vhd"; @@ -4004,7 +4048,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } return result.replace("", "").replace("", "").replace("\n", ""); } catch (Types.HandleInvalid e) { - s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to HandleInvalid clazz:" + e.clazz + ", handle:" + e.handle); + s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to HandleInvalid clazz:" + e.clazz + ", handle:" + + e.handle); } catch (XenAPIException e) { s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to " + e.toString(), e); } catch (XmlRpcException e) { @@ -4308,12 +4353,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe PIF.Record rec = pif.getRecord(conn); if (rec.management) { if (rec.VLAN != null && rec.VLAN != -1) { - String msg = new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.uuid) - .append("; pif=") - .append(rec.uuid) - .append("; vlan=") - .append(rec.VLAN) - .toString(); + String msg = + new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.uuid) + .append("; pif=") + .append(rec.uuid) + .append("; vlan=") + .append(rec.VLAN) + .toString(); s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -4332,8 +4378,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } Bond bond = mgmtPifRec.bondSlaveOf; if (!isRefNull(bond)) { - String msg = "Management interface is on slave(" + mgmtPifRec.uuid + ") of bond(" + bond.getUuid(conn) + ") on host(" + _host.uuid + - "), please move management interface to bond!"; + String msg = + "Management interface is on slave(" + mgmtPifRec.uuid + ") of bond(" + bond.getUuid(conn) + ") on host(" + _host.uuid + + "), please move management interface to bond!"; s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -5131,12 +5178,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe PIF.Record rec = pif.getRecord(conn); if (rec.management) { if (rec.VLAN != null && rec.VLAN != -1) { - String msg = new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.uuid) - .append("; pif=") - .append(rec.uuid) - .append("; vlan=") - .append(rec.VLAN) - .toString(); + String msg = + new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(_host.uuid) + .append("; pif=") + .append(rec.uuid) + .append("; vlan=") + .append(rec.VLAN) + .toString(); s_logger.warn(msg); return new SetupAnswer(cmd, msg); } @@ -5164,19 +5212,21 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe s_logger.debug("Found a network called cloud-private. host=" + _host.uuid + "; Network=" + network.uuid + "; pif=" + pr.uuid); } if (pr.VLAN != null && pr.VLAN != -1) { - String msg = new StringBuilder("Unsupported configuration. Network cloud-private is on a VLAN. Network=").append(network.uuid) - .append(" ; pif=") - .append(pr.uuid) - .toString(); + String msg = + new StringBuilder("Unsupported configuration. Network cloud-private is on a VLAN. Network=").append(network.uuid) + .append(" ; pif=") + .append(pr.uuid) + .toString(); s_logger.warn(msg); return new SetupAnswer(cmd, msg); } if (!pr.management && pr.bondMasterOf != null && pr.bondMasterOf.size() > 0) { if (pr.bondMasterOf.size() > 1) { - String msg = new StringBuilder("Unsupported configuration. Network cloud-private has more than one bond. Network=").append(network.uuid) - .append("; pif=") - .append(pr.uuid) - .toString(); + String msg = + new StringBuilder("Unsupported configuration. Network cloud-private has more than one bond. Network=").append(network.uuid) + .append("; pif=") + .append(pr.uuid) + .toString(); s_logger.warn(msg); return new SetupAnswer(cmd, msg); } @@ -5186,8 +5236,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe PIF.Record spr = slave.getRecord(conn); if (spr.management) { if (!transferManagementNetwork(conn, host, slave, spr, pif)) { - String msg = new StringBuilder("Unable to transfer management network. slave=" + spr.uuid + "; master=" + pr.uuid + "; host=" + - _host.uuid).toString(); + String msg = + new StringBuilder("Unable to transfer management network. slave=" + spr.uuid + "; master=" + pr.uuid + "; host=" + + _host.uuid).toString(); s_logger.warn(msg); return new SetupAnswer(cmd, msg); } @@ -5338,17 +5389,23 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String msg = ""; for (PhysicalNetworkSetupInfo info : infoList) { if (!isNetworkSetupByName(info.getGuestNetworkName())) { - msg = "For Physical Network id:" + info.getPhysicalNetworkId() + ", Guest Network is not configured on the backend by name " + info.getGuestNetworkName(); + msg = + "For Physical Network id:" + info.getPhysicalNetworkId() + ", Guest Network is not configured on the backend by name " + + info.getGuestNetworkName(); errorout = true; break; } if (!isNetworkSetupByName(info.getPrivateNetworkName())) { - msg = "For Physical Network id:" + info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + info.getPrivateNetworkName(); + msg = + "For Physical Network id:" + info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + + info.getPrivateNetworkName(); errorout = true; break; } if (!isNetworkSetupByName(info.getPublicNetworkName())) { - msg = "For Physical Network id:" + info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + info.getPublicNetworkName(); + msg = + "For Physical Network id:" + info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + + info.getPublicNetworkName(); errorout = true; break; } @@ -5516,8 +5573,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } return new Answer(cmd, true, "success"); } catch (Exception e) { - String msg = "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" + _host.uuid + " pool: " + - pool.getHost() + pool.getPath(); + String msg = + "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" + _host.uuid + " pool: " + + pool.getHost() + pool.getPath(); s_logger.warn(msg, e); return new Answer(cmd, false, msg); } @@ -5546,7 +5604,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } return result.replace("\n", ""); } catch (Types.HandleInvalid e) { - s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to HandleInvalid clazz:" + e.clazz + ", handle:" + e.handle); + s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to HandleInvalid clazz:" + e.clazz + ", handle:" + + e.handle); } catch (XenAPIException e) { s_logger.warn("callHostPlugin failed for cmd: " + cmd + " with args " + getArgsString(args) + " due to " + e.toString(), e); } catch (XmlRpcException e) { @@ -5704,8 +5763,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe configureTunnelNetwork(conn, cmd.getNetworkId(), cmd.getFrom(), cmd.getKey()); bridge = nw.getBridge(conn); - String result = callHostPlugin(conn, "ovstunnel", "create_tunnel", "bridge", bridge, "remote_ip", cmd.getRemoteIp(), "key", cmd.getKey().toString(), "from", - cmd.getFrom().toString(), "to", cmd.getTo().toString()); + String result = + callHostPlugin(conn, "ovstunnel", "create_tunnel", "bridge", bridge, "remote_ip", cmd.getRemoteIp(), "key", cmd.getKey().toString(), "from", + cmd.getFrom().toString(), "to", cmd.getTo().toString()); String[] res = result.split(":"); if (res.length == 2 && res[0].equalsIgnoreCase("SUCCESS")) { return new OvsCreateTunnelAnswer(cmd, true, result, res[1], bridge); @@ -5777,8 +5837,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * none guest network nic. don't worry, it will fail silently at host * plugin side */ - String result = callHostPlugin(conn, "ovsgre", "ovs_set_tag_and_flow", "bridge", bridge, "vmName", cmd.getVmName(), "tag", cmd.getTag(), "vlans", cmd.getVlans(), - "seqno", cmd.getSeqNo()); + String result = + callHostPlugin(conn, "ovsgre", "ovs_set_tag_and_flow", "bridge", bridge, "vmName", cmd.getVmName(), "tag", cmd.getTag(), "vlans", cmd.getVlans(), + "seqno", cmd.getSeqNo()); s_logger.debug("set flow for " + cmd.getVmName() + " " + result); if (result.equalsIgnoreCase("SUCCESS")) { @@ -5830,8 +5891,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Network nw = setupvSwitchNetwork(conn); bridge = nw.getBridge(conn); - String result = callHostPlugin(conn, "ovsgre", "ovs_create_gre", "bridge", bridge, "remoteIP", cmd.getRemoteIp(), "greKey", cmd.getKey(), "from", - Long.toString(cmd.getFrom()), "to", Long.toString(cmd.getTo())); + String result = + callHostPlugin(conn, "ovsgre", "ovs_create_gre", "bridge", bridge, "remoteIP", cmd.getRemoteIp(), "greKey", cmd.getKey(), "from", + Long.toString(cmd.getFrom()), "to", Long.toString(cmd.getTo())); String[] res = result.split(":"); if (res.length != 2 || (res.length == 2 && res[1].equalsIgnoreCase("[]"))) { return new OvsCreateGreTunnelAnswer(cmd, false, result, _host.ip, bridge); @@ -5857,19 +5919,21 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe if (!_canBridgeFirewall) { s_logger.warn("Host " + _host.ip + " cannot do bridge firewalling"); - return new SecurityGroupRuleAnswer(cmd, false, "Host " + _host.ip + " cannot do bridge firewalling", SecurityGroupRuleAnswer.FailureReason.CANNOT_BRIDGE_FIREWALL); + return new SecurityGroupRuleAnswer(cmd, false, "Host " + _host.ip + " cannot do bridge firewalling", + SecurityGroupRuleAnswer.FailureReason.CANNOT_BRIDGE_FIREWALL); } - String result = callHostPlugin(conn, "vmops", "network_rules", "vmName", cmd.getVmName(), "vmIP", cmd.getGuestIp(), "vmMAC", cmd.getGuestMac(), "vmID", - Long.toString(cmd.getVmId()), "signature", cmd.getSignature(), "seqno", Long.toString(cmd.getSeqNum()), "deflated", "true", "rules", cmd.compressStringifiedRules(), - "secIps", cmd.getSecIpsString()); + String result = + callHostPlugin(conn, "vmops", "network_rules", "vmName", cmd.getVmName(), "vmIP", cmd.getGuestIp(), "vmMAC", cmd.getGuestMac(), "vmID", + Long.toString(cmd.getVmId()), "signature", cmd.getSignature(), "seqno", Long.toString(cmd.getSeqNum()), "deflated", "true", "rules", + cmd.compressStringifiedRules(), "secIps", cmd.getSecIpsString()); if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) { s_logger.warn("Failed to program network rules for vm " + cmd.getVmName()); return new SecurityGroupRuleAnswer(cmd, false, "programming network rules failed"); } else { s_logger.info("Programmed network rules for vm " + cmd.getVmName() + " guestIp=" + cmd.getGuestIp() + ", ingress numrules=" + cmd.getIngressRuleSet().length + - ", egress numrules=" + cmd.getEgressRuleSet().length); + ", egress numrules=" + cmd.getEgressRuleSet().length); return new SecurityGroupRuleAnswer(cmd); } } @@ -6160,7 +6224,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe vdir = vdi.getRecord(conn); s_logger.debug("Succesfully created VDI for " + cmd + ". Uuid = " + vdir.uuid); - VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), vdir.nameLabel, pool.getPath(), vdir.uuid, vdir.virtualSize, null); + VolumeTO vol = + new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), vdir.nameLabel, pool.getPath(), vdir.uuid, vdir.virtualSize, null); return new CreateAnswer(cmd, vol); } catch (Exception e) { s_logger.warn("Unable to create volume; Pool=" + pool + "; Disk: " + dskch, e); @@ -6229,7 +6294,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Host host = Host.getByUuid(conn, _host.uuid); - SR sr = SR.create(conn, host, deviceConfig, new Long(0), name, uri.getHost() + uri.getPath(), SRType.NFS.toString(), "user", shared, new HashMap()); + SR sr = + SR.create(conn, host, deviceConfig, new Long(0), name, uri.getHost() + uri.getPath(), SRType.NFS.toString(), "user", shared, + new HashMap()); if (!checkSR(conn, sr)) { throw new Exception("no attached PBD"); } @@ -6361,7 +6428,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } if (target.equals(dc.get("target")) && targetiqn.equals(dc.get("targetIQN")) && lunid.equals(dc.get("lunid"))) { throw new CloudRuntimeException("There is a SR using the same configuration target:" + dc.get("target") + ", targetIQN:" + dc.get("targetIQN") + - ", lunid:" + dc.get("lunid") + " for pool " + srNameLabel + "on host:" + _host.uuid); + ", lunid:" + dc.get("lunid") + " for pool " + srNameLabel + "on host:" + _host.uuid); } } deviceConfig.put("target", target); @@ -6492,15 +6559,16 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe if (server.equals(dc.get("server")) && serverpath.equals(dc.get("serverpath"))) { throw new CloudRuntimeException("There is a SR using the same configuration server:" + dc.get("server") + ", serverpath:" + dc.get("serverpath") + - " for pool " + pool.getUuid() + "on host:" + _host.uuid); + " for pool " + pool.getUuid() + "on host:" + _host.uuid); } } deviceConfig.put("server", server); deviceConfig.put("serverpath", serverpath); Host host = Host.getByUuid(conn, _host.uuid); - SR sr = SR.create(conn, host, deviceConfig, new Long(0), pool.getUuid(), Long.toString(pool.getId()), SRType.NFS.toString(), "user", true, - new HashMap()); + SR sr = + SR.create(conn, host, deviceConfig, new Long(0), pool.getUuid(), Long.toString(pool.getId()), SRType.NFS.toString(), "user", true, + new HashMap()); sr.scan(conn); return sr; } catch (XenAPIException e) { @@ -6667,7 +6735,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe VDI vdi = null; if (cmd.getAttach() && cmd.isManaged()) { - SR sr = getIscsiSR(conn, cmd.get_iScsiName(), cmd.getStorageHost(), cmd.get_iScsiName(), cmd.getChapInitiatorUsername(), cmd.getChapInitiatorPassword(), true); + SR sr = + getIscsiSR(conn, cmd.get_iScsiName(), cmd.getStorageHost(), cmd.get_iScsiName(), cmd.getChapInitiatorUsername(), cmd.getChapInitiatorPassword(), true); vdi = getVDIbyUuid(conn, cmd.getVolumePath(), false); @@ -6945,7 +7014,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe OperationNotAllowed, XenAPIException, XmlRpcException { String guestOsTypeName = getGuestOsType(guestOSType, false); if (guestOsTypeName == null) { - String msg = " Hypervisor " + this.getClass().getName() + " doesn't support guest OS type " + guestOSType + ". you can choose 'Other install media' to run it as HVM"; + String msg = + " Hypervisor " + this.getClass().getName() + " doesn't support guest OS type " + guestOSType + ". you can choose 'Other install media' to run it as HVM"; s_logger.warn(msg); throw new CloudRuntimeException(msg); } @@ -7388,7 +7458,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe try { SR primaryStorageSR = getSRByNameLabelandHost(conn, primaryStorageNameLabel); if (primaryStorageSR == null) { - throw new InternalErrorException("Could not backup snapshot because the primary Storage SR could not be created from the name label: " + primaryStorageNameLabel); + throw new InternalErrorException("Could not backup snapshot because the primary Storage SR could not be created from the name label: " + + primaryStorageNameLabel); } String psUuid = primaryStorageSR.getUuid(conn); Boolean isISCSI = IsISCSI(primaryStorageSR.getType(conn)); @@ -7458,8 +7529,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } else if (cmd.getS3() != null) { backupSnapshotToS3(conn, cmd.getS3(), primaryStorageSRUuid, snapshotPaUuid, isISCSI, wait); } else { - snapshotBackupUuid = backupSnapshot(conn, primaryStorageSRUuid, dcId, accountId, volumeId, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, - wait, secHostId); + snapshotBackupUuid = + backupSnapshot(conn, primaryStorageSRUuid, dcId, accountId, volumeId, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, wait, + secHostId); success = (snapshotBackupUuid != null); } } @@ -7480,7 +7552,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return new BackupSnapshotAnswer(cmd, success, details, snapshotBackupUuid, fullbackup); } - private boolean backupSnapshotToS3(final Connection connection, final S3TO s3, final String srUuid, final String snapshotUuid, final Boolean iSCSIFlag, final int wait) { + private boolean + backupSnapshotToS3(final Connection connection, final S3TO s3, final String srUuid, final String snapshotUuid, final Boolean iSCSIFlag, final int wait) { final String filename = iSCSIFlag ? "VHD-" + snapshotUuid : snapshotUuid + ".vhd"; final String dir = (iSCSIFlag ? "/dev/VG_XenStorage-" : "/var/run/sr-mount/") + srUuid; @@ -7491,8 +7564,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe final List parameters = newArrayList(flattenProperties(s3, S3Utils.ClientOptions.class)); // https workaround for Introspector bug that does not // recognize Boolean accessor methods ... - parameters.addAll(Arrays.asList("operation", "put", "filename", dir + "/" + filename, "iSCSIFlag", iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key, - "https", s3.isHttps() != null ? s3.isHttps().toString() : "null")); + parameters.addAll(Arrays.asList("operation", "put", "filename", dir + "/" + filename, "iSCSIFlag", iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", + key, "https", s3.isHttps() != null ? s3.isHttps().toString() : "null")); final String result = callHostPluginAsync(connection, "s3xen", "s3", wait, parameters.toArray(new String[parameters.size()])); if (result != null && result.equals("true")) { @@ -7529,7 +7602,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe SR primaryStorageSR = getSRByNameLabelandHost(conn, primaryStorageNameLabel); if (primaryStorageSR == null) { throw new InternalErrorException("Could not create volume from snapshot because the primary Storage SR could not be created from the name label: " + - primaryStorageNameLabel); + primaryStorageNameLabel); } // Get the absolute path of the snapshot on the secondary storage. URI snapshotURI = new URI(secondaryStorageUrl + "/snapshots/" + accountId + "/" + volumeId); @@ -7717,8 +7790,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return (details != null && details.equals("1")); } - protected boolean postCreatePrivateTemplate(Connection conn, String templatePath, String tmpltFilename, String templateName, String templateDescription, String checksum, - long size, long virtualSize, long templateId) { + protected boolean postCreatePrivateTemplate(Connection conn, String templatePath, String tmpltFilename, String templateName, String templateDescription, + String checksum, long size, long virtualSize, long templateId) { if (templateDescription == null) { templateDescription = ""; @@ -7728,9 +7801,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe checksum = ""; } - String result = callHostPlugin(conn, "vmopsSnapshot", "post_create_private_template", "templatePath", templatePath, "templateFilename", tmpltFilename, "templateName", - templateName, "templateDescription", templateDescription, "checksum", checksum, "size", String.valueOf(size), "virtualSize", String.valueOf(virtualSize), "templateId", - String.valueOf(templateId)); + String result = + callHostPlugin(conn, "vmopsSnapshot", "post_create_private_template", "templatePath", templatePath, "templateFilename", tmpltFilename, "templateName", + templateName, "templateDescription", templateDescription, "checksum", checksum, "size", String.valueOf(size), "virtualSize", String.valueOf(virtualSize), + "templateId", String.valueOf(templateId)); boolean success = false; if (result != null && !result.isEmpty()) { @@ -7748,8 +7822,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } protected String getVhdParent(Connection conn, String primaryStorageSRUuid, String snapshotUuid, Boolean isISCSI) { - String parentUuid = callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, "isISCSI", - isISCSI.toString()); + String parentUuid = + callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, "isISCSI", + isISCSI.toString()); if (parentUuid == null || parentUuid.isEmpty() || parentUuid.equalsIgnoreCase("None")) { s_logger.debug("Unable to get parent of VHD " + snapshotUuid + " in SR " + primaryStorageSRUuid); @@ -7783,8 +7858,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe protected String deleteSnapshotBackup(Connection conn, Long dcId, Long accountId, Long volumeId, String secondaryStorageMountPath, String backupUUID) { // If anybody modifies the formatting below again, I'll skin them - String result = callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "dcId", dcId.toString(), "accountId", accountId.toString(), - "volumeId", volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath); + String result = + callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "dcId", dcId.toString(), "accountId", accountId.toString(), + "volumeId", volumeId.toString(), "secondaryStorageMountPath", secondaryStorageMountPath); return result; } @@ -8027,8 +8103,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe boolean success = true; Connection conn = getConnection(); - String result = callHostPlugin(conn, "vmops", "network_rules_vmSecondaryIp", "vmName", cmd.getVmName(), "vmMac", cmd.getVmMac(), "vmSecIp", cmd.getVmSecIp(), "action", - cmd.getAction()); + String result = + callHostPlugin(conn, "vmops", "network_rules_vmSecondaryIp", "vmName", cmd.getVmName(), "vmMac", cmd.getVmMac(), "vmSecIp", cmd.getVmSecIp(), "action", + cmd.getAction()); if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) { success = false; } diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java index 821a14b7403..e1b8050df61 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java @@ -27,6 +27,13 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VBD; +import com.xensource.xenapi.VDI; +import com.xensource.xenapi.VM; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.NetworkUsageAnswer; @@ -43,12 +50,6 @@ import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import com.cloud.vm.VirtualMachine; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Types; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VBD; -import com.xensource.xenapi.VDI; -import com.xensource.xenapi.VM; @Local(value = ServerResource.class) public class XcpOssResource extends CitrixResourceBase { @@ -83,6 +84,7 @@ public class XcpOssResource extends CitrixResourceBase { } } + @Override protected VBD createPatchVbd(Connection conn, String vmName, VM vm) throws XmlRpcException, XenAPIException { if (_host.localSRuuid != null) { //create an iso vdi on it diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java index 2d16656f7da..cc623bfab61 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java @@ -16,6 +16,20 @@ // under the License. package com.cloud.hypervisor.xen.resource; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Local; + +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; + +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VM; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.NetworkUsageAnswer; @@ -23,17 +37,6 @@ import com.cloud.agent.api.NetworkUsageCommand; import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Host; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VM; -import org.apache.log4j.Logger; -import org.apache.xmlrpc.XmlRpcException; - -import javax.ejb.Local; -import java.io.File; -import java.util.ArrayList; -import java.util.List; @Local(value = ServerResource.class) public class XcpServerResource extends CitrixResourceBase { @@ -143,7 +146,7 @@ public class XcpServerResource extends CitrixResourceBase { //setMemoryLimits(staticMin, staticMax, dynamicMin, dynamicMax) if (s_logger.isDebugEnabled()) { s_logger.debug("Memory Limits for VM [" + vm.getNameLabel(conn) + "[staticMin:" + mem_32m + ", staticMax:" + maxMemsize + ", dynamicMin: " + minMemsize + - ", dynamicMax:" + maxMemsize + "]]"); + ", dynamicMax:" + maxMemsize + "]]"); } vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize); } diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java index f9f357c0066..71436277f41 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java @@ -26,27 +26,22 @@ import java.util.Set; import javax.ejb.Local; -import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; -import com.cloud.agent.api.FenceAnswer; -import com.cloud.agent.api.FenceCommand; -import com.cloud.agent.api.to.DiskTO; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.resource.ServerResource; -import com.cloud.storage.Volume; -import com.cloud.template.VirtualMachineTemplate.BootloaderType; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; import com.xensource.xenapi.Connection; import com.xensource.xenapi.Host; -import com.xensource.xenapi.Types; import com.xensource.xenapi.Types.XenAPIException; import com.xensource.xenapi.VBD; import com.xensource.xenapi.VDI; import com.xensource.xenapi.VM; +import com.cloud.agent.api.FenceAnswer; +import com.cloud.agent.api.FenceCommand; +import com.cloud.resource.ServerResource; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; + @Local(value = ServerResource.class) public class XenServer56FP1Resource extends XenServer56Resource { private static final long mem_128m = 134217728L; @@ -120,6 +115,7 @@ public class XenServer56FP1Resource extends XenServer56Resource { } } + @Override public long getStaticMax(String os, boolean b, long dynamicMinRam, long dynamicMaxRam) { long recommendedValue = CitrixHelper.getXenServer56FP1StaticMax(os, b); if (recommendedValue == 0) { @@ -130,12 +126,13 @@ public class XenServer56FP1Resource extends XenServer56Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; } + @Override public long getStaticMin(String os, boolean b, long dynamicMinRam, long dynamicMaxRam) { long recommendedValue = CitrixHelper.getXenServer56FP1StaticMin(os, b); if (recommendedValue == 0) { diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index 062a197739b..df43430d481 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -20,10 +20,21 @@ import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Set; + import javax.ejb.Local; + import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Network; +import com.xensource.xenapi.PIF; +import com.xensource.xenapi.Types.IpConfigurationMode; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VLAN; +import com.xensource.xenapi.VM; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostAnswer; import com.cloud.agent.api.CheckOnHostCommand; @@ -36,14 +47,6 @@ import com.cloud.agent.api.StartupCommand; import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Host; -import com.xensource.xenapi.Network; -import com.xensource.xenapi.PIF; -import com.xensource.xenapi.Types.IpConfigurationMode; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VLAN; -import com.xensource.xenapi.VM; @Local(value = ServerResource.class) public class XenServer56Resource extends CitrixResourceBase { diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java index 94c8c59dad8..89adf55a958 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import javax.ejb.Local; + import org.apache.log4j.Logger; import com.cloud.resource.ServerResource; @@ -65,7 +66,7 @@ public class XenServer56SP2Resource extends XenServer56FP1Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java index 22470aabc75..8f3a030c915 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java @@ -51,7 +51,7 @@ public class XenServer600Resource extends XenServer56FP1Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java index d3a9073e0b6..a57c53b9d05 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java @@ -64,7 +64,7 @@ public class XenServer602Resource extends XenServer56FP1Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java index 52448cc6bab..9a0d5597b9f 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java @@ -25,10 +25,23 @@ import java.util.Set; import javax.ejb.Local; -import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Network; +import com.xensource.xenapi.SR; +import com.xensource.xenapi.Task; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VBD; +import com.xensource.xenapi.VDI; +import com.xensource.xenapi.VIF; +import com.xensource.xenapi.VM; + +import org.apache.cloudstack.storage.to.VolumeObjectTO; + import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.MigrateWithStorageAnswer; @@ -51,17 +64,6 @@ import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import com.cloud.vm.VirtualMachine.State; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Host; -import com.xensource.xenapi.Network; -import com.xensource.xenapi.SR; -import com.xensource.xenapi.Task; -import com.xensource.xenapi.Types; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VBD; -import com.xensource.xenapi.VDI; -import com.xensource.xenapi.VIF; -import com.xensource.xenapi.VM; @Local(value = ServerResource.class) public class XenServer610Resource extends XenServer56FP1Resource { @@ -420,7 +422,7 @@ public class XenServer610Resource extends XenServer56FP1Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java index 90689934fc4..4c0ca8d4f85 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java @@ -64,7 +64,7 @@ public class XenServer620Resource extends XenServer610Resource { long staticMax = Math.min(recommendedValue, 4l * dynamicMinRam); // XS constraint for stability if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <= static max s_logger.warn("dynamixMax " + dynamicMaxRam + " cant be greater than static max " + staticMax + - ", can lead to stability issues. Setting static max as much as dynamic max "); + ", can lead to stability issues. Setting static max as much as dynamic max "); return dynamicMaxRam; } return staticMax; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java index 05eec6b3b9d..90c6003a7f9 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java @@ -36,9 +36,6 @@ import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClientException; -import com.cloud.utils.NumbersUtil; -import com.cloud.utils.PropertiesUtil; -import com.cloud.utils.exception.CloudRuntimeException; import com.xensource.xenapi.APIVersion; import com.xensource.xenapi.Connection; import com.xensource.xenapi.Host; @@ -49,6 +46,10 @@ import com.xensource.xenapi.Types.BadServerResponse; import com.xensource.xenapi.Types.UuidInvalid; import com.xensource.xenapi.Types.XenAPIException; +import com.cloud.utils.NumbersUtil; +import com.cloud.utils.PropertiesUtil; +import com.cloud.utils.exception.CloudRuntimeException; + public class XenServerConnectionPool { private static final Logger s_logger = Logger.getLogger(XenServerConnectionPool.class); protected HashMap _conns = new HashMap(); @@ -537,8 +538,9 @@ public class XenServerConnectionPool { mConn = null; } } catch (UuidInvalid e) { - String msg = "Host(" + hostUuid + ") doesn't belong to pool(" + poolUuid + "), please execute 'xe pool-join master-address=" + mConn.getIp() + - " master-username=" + mConn.getUsername(); + String msg = + "Host(" + hostUuid + ") doesn't belong to pool(" + poolUuid + "), please execute 'xe pool-join master-address=" + mConn.getIp() + + " master-username=" + mConn.getUsername(); if (s_logger.isDebugEnabled()) { s_logger.debug(msg); } @@ -705,7 +707,8 @@ public class XenServerConnectionPool { return s; } - protected Session loginWithPassword(Connection conn, String username, Queue password, String version) throws BadServerResponse, XenAPIException, XmlRpcException { + protected Session loginWithPassword(Connection conn, String username, Queue password, String version) throws BadServerResponse, XenAPIException, + XmlRpcException { Session s = null; boolean logged_in = false; Exception ex = null; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java index e91ec35f11e..209be87ef92 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java @@ -18,14 +18,17 @@ package com.cloud.hypervisor.xen.resource; import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; import java.util.concurrent.ConcurrentHashMap; + +import org.apache.log4j.Logger; + import com.cloud.utils.Ternary; import com.cloud.vm.VirtualMachine.State; public class XenServerPoolVms { private static final Logger s_logger = Logger.getLogger(XenServerPoolVms.class); - private final Map>> _cluster_vms = new ConcurrentHashMap>>(); + private final Map>> _cluster_vms = + new ConcurrentHashMap>>(); public HashMap> getClusterVmState(String clusterId) { HashMap> _vms = _cluster_vms.get(clusterId); diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java index c3a7294ae42..b1ec074bddf 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java @@ -30,6 +30,22 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.apache.log4j.Logger; +import org.apache.xmlrpc.XmlRpcException; + +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.PBD; +import com.xensource.xenapi.Pool; +import com.xensource.xenapi.SR; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.Types.BadServerResponse; +import com.xensource.xenapi.Types.XenAPIException; +import com.xensource.xenapi.VBD; +import com.xensource.xenapi.VDI; +import com.xensource.xenapi.VM; +import com.xensource.xenapi.VMGuestMetrics; + import org.apache.cloudstack.storage.command.AttachAnswer; import org.apache.cloudstack.storage.command.AttachCommand; import org.apache.cloudstack.storage.command.AttachPrimaryDataStoreAnswer; @@ -48,8 +64,6 @@ import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol; import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; -import org.apache.xmlrpc.XmlRpcException; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CreateStoragePoolCommand; @@ -72,18 +86,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.storage.encoding.DecodedDataObject; import com.cloud.utils.storage.encoding.DecodedDataStore; import com.cloud.utils.storage.encoding.Decoder; -import com.xensource.xenapi.Connection; -import com.xensource.xenapi.Host; -import com.xensource.xenapi.PBD; -import com.xensource.xenapi.Pool; -import com.xensource.xenapi.SR; -import com.xensource.xenapi.Types; -import com.xensource.xenapi.Types.BadServerResponse; -import com.xensource.xenapi.Types.XenAPIException; -import com.xensource.xenapi.VBD; -import com.xensource.xenapi.VDI; -import com.xensource.xenapi.VM; -import com.xensource.xenapi.VMGuestMetrics; public class XenServerStorageProcessor implements StorageProcessor { private static final Logger s_logger = Logger.getLogger(XenServerStorageProcessor.class); @@ -346,7 +348,8 @@ public class XenServerStorageProcessor implements StorageProcessor { } if (isHVM && !pvDrvInstalled) { s_logger.warn(": You attempted an operation on a VM which requires PV drivers to be installed but the drivers were not detected"); - return new DettachAnswer("You attempted an operation that requires PV drivers to be installed on the VM. Please install them by inserting xen-pv-drv.iso."); + return new DettachAnswer( + "You attempted an operation that requires PV drivers to be installed on the VM. Please install them by inserting xen-pv-drv.iso."); } // Look up all VBDs for this VDI @@ -510,15 +513,16 @@ public class XenServerStorageProcessor implements StorageProcessor { if (server.equals(dc.get("server")) && serverpath.equals(dc.get("serverpath"))) { throw new CloudRuntimeException("There is a SR using the same configuration server:" + dc.get("server") + ", serverpath:" + dc.get("serverpath") + - " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid); + " for pool " + pool.getUuid() + "on host:" + hypervisorResource.getHost().uuid); } } deviceConfig.put("server", server); deviceConfig.put("serverpath", serverpath); Host host = Host.getByUuid(conn, hypervisorResource.getHost().uuid); - SR sr = SR.create(conn, host, deviceConfig, new Long(0), pool.getUuid(), Long.toString(pool.getId()), SRType.NFS.toString(), "user", true, - new HashMap()); + SR sr = + SR.create(conn, host, deviceConfig, new Long(0), pool.getUuid(), Long.toString(pool.getId()), SRType.NFS.toString(), "user", true, + new HashMap()); sr.scan(conn); return sr; } catch (XenAPIException e) { @@ -573,7 +577,7 @@ public class XenServerStorageProcessor implements StorageProcessor { } if (target.equals(dc.get("target")) && targetiqn.equals(dc.get("targetIQN")) && lunid.equals(dc.get("lunid"))) { throw new CloudRuntimeException("There is a SR using the same configuration target:" + dc.get("target") + ", targetIQN:" + dc.get("targetIQN") + - ", lunid:" + dc.get("lunid") + " for pool " + pool.getUuid() + "on host:" + this.hypervisorResource.getHost().uuid); + ", lunid:" + dc.get("lunid") + " for pool " + pool.getUuid() + "on host:" + this.hypervisorResource.getHost().uuid); } } deviceConfig.put("target", target); @@ -663,8 +667,9 @@ public class XenServerStorageProcessor implements StorageProcessor { } return new Answer(cmd, true, "success"); } catch (Exception e) { - String msg = "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" + this.hypervisorResource.getHost().uuid + - " pool: " + pool.getHost() + pool.getPath(); + String msg = + "Catch Exception " + e.getClass().getName() + ", create StoragePool failed due to " + e.toString() + " on host:" + + this.hypervisorResource.getHost().uuid + " pool: " + pool.getHost() + pool.getPath(); s_logger.warn(msg, e); return new Answer(cmd, false, msg); } @@ -778,8 +783,9 @@ public class XenServerStorageProcessor implements StorageProcessor { private String copy_vhd_from_secondarystorage(Connection conn, String mountpoint, String sruuid, int wait) { String nameLabel = "cloud-" + UUID.randomUUID().toString(); - String results = hypervisorResource.callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, - "namelabel", nameLabel); + String results = + hypervisorResource.callHostPluginAsync(conn, "vmopspremium", "copy_vhd_from_secondarystorage", wait, "mountpoint", mountpoint, "sruuid", sruuid, "namelabel", + nameLabel); String errMsg = null; if (results == null || results.isEmpty()) { errMsg = "copy_vhd_from_secondarystorage return null"; @@ -828,8 +834,9 @@ public class XenServerStorageProcessor implements StorageProcessor { } protected String getVhdParent(Connection conn, String primaryStorageSRUuid, String snapshotUuid, Boolean isISCSI) { - String parentUuid = hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, - "isISCSI", isISCSI.toString()); + String parentUuid = + hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "getVhdParent", "primaryStorageSRUuid", primaryStorageSRUuid, "snapshotUuid", snapshotUuid, + "isISCSI", isISCSI.toString()); if (parentUuid == null || parentUuid.isEmpty() || parentUuid.equalsIgnoreCase("None")) { s_logger.debug("Unable to get parent of VHD " + snapshotUuid + " in SR " + primaryStorageSRUuid); @@ -1033,8 +1040,9 @@ public class XenServerStorageProcessor implements StorageProcessor { boolean swiftUpload(Connection conn, SwiftTO swift, String container, String ldir, String lfilename, Boolean isISCSI, int wait) { String result = null; try { - result = hypervisorResource.callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username", - swift.getUserName(), "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString()); + result = + hypervisorResource.callHostPluginAsync(conn, "swiftxen", "swift", wait, "op", "upload", "url", swift.getUrl(), "account", swift.getAccount(), "username", + swift.getUserName(), "key", swift.getKey(), "container", container, "ldir", ldir, "lfilename", lfilename, "isISCSI", isISCSI.toString()); if (result != null && result.equals("true")) { return true; } @@ -1047,8 +1055,9 @@ public class XenServerStorageProcessor implements StorageProcessor { protected String deleteSnapshotBackup(Connection conn, String localMountPoint, String path, String secondaryStorageMountPath, String backupUUID) { // If anybody modifies the formatting below again, I'll skin them - String result = hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "path", path, "secondaryStorageMountPath", - secondaryStorageMountPath, "localMountPoint", localMountPoint); + String result = + hypervisorResource.callHostPlugin(conn, "vmopsSnapshot", "deleteSnapshotBackup", "backupUUID", backupUUID, "path", path, "secondaryStorageMountPath", + secondaryStorageMountPath, "localMountPoint", localMountPoint); return result; } @@ -1067,8 +1076,8 @@ public class XenServerStorageProcessor implements StorageProcessor { return lfilename; } - private String backupSnapshotToS3(final Connection connection, final S3TO s3, final String srUuid, final String folder, final String snapshotUuid, final Boolean iSCSIFlag, - final int wait) { + private String backupSnapshotToS3(final Connection connection, final S3TO s3, final String srUuid, final String folder, final String snapshotUuid, + final Boolean iSCSIFlag, final int wait) { final String filename = iSCSIFlag ? "VHD-" + snapshotUuid : snapshotUuid + ".vhd"; final String dir = (iSCSIFlag ? "/dev/VG_XenStorage-" : "/var/run/sr-mount/") + srUuid; @@ -1080,8 +1089,8 @@ public class XenServerStorageProcessor implements StorageProcessor { // https workaround for Introspector bug that does not // recognize Boolean accessor methods ... - parameters.addAll(Arrays.asList("operation", "put", "filename", dir + "/" + filename, "iSCSIFlag", iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key, - "https", s3.isHttps() != null ? s3.isHttps().toString() : "null", "maxSingleUploadSizeInBytes", String.valueOf(s3.getMaxSingleUploadSizeInBytes()))); + parameters.addAll(Arrays.asList("operation", "put", "filename", dir + "/" + filename, "iSCSIFlag", iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", + key, "https", s3.isHttps() != null ? s3.isHttps().toString() : "null", "maxSingleUploadSizeInBytes", String.valueOf(s3.getMaxSingleUploadSizeInBytes()))); final String result = hypervisorResource.callHostPluginAsync(connection, "s3xen", "s3", wait, parameters.toArray(new String[parameters.size()])); if (result != null && result.equals("true")) { @@ -1097,8 +1106,8 @@ public class XenServerStorageProcessor implements StorageProcessor { } - protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, String localMountPoint, String path, String secondaryStorageMountPath, String snapshotUuid, - String prevBackupUuid, Boolean isISCSI, int wait) { + protected String backupSnapshot(Connection conn, String primaryStorageSRUuid, String localMountPoint, String path, String secondaryStorageMountPath, + String snapshotUuid, String prevBackupUuid, Boolean isISCSI, int wait) { String backupSnapshotUuid = null; if (prevBackupUuid == null) { @@ -1108,13 +1117,15 @@ public class XenServerStorageProcessor implements StorageProcessor { // Each argument is put in a separate line for readability. // Using more lines does not harm the environment. String backupUuid = UUID.randomUUID().toString(); - String results = hypervisorResource.callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "path", path, - "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "backupUuid", backupUuid, "isISCSI", - isISCSI.toString(), "localMountPoint", localMountPoint); + String results = + hypervisorResource.callHostPluginAsync(conn, "vmopsSnapshot", "backupSnapshot", wait, "primaryStorageSRUuid", primaryStorageSRUuid, "path", path, + "secondaryStorageMountPath", secondaryStorageMountPath, "snapshotUuid", snapshotUuid, "prevBackupUuid", prevBackupUuid, "backupUuid", backupUuid, + "isISCSI", isISCSI.toString(), "localMountPoint", localMountPoint); String errMsg = null; if (results == null || results.isEmpty()) { - errMsg = "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " + secondaryStorageMountPath + - " due to null"; + errMsg = + "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " + + secondaryStorageMountPath + " due to null"; } else { String[] tmp = results.split("#"); @@ -1127,8 +1138,9 @@ public class XenServerStorageProcessor implements StorageProcessor { s_logger.debug("Successfully copied backupUuid: " + backupSnapshotUuid + " to secondary storage"); return backupSnapshotUuid; } else { - errMsg = "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " + - secondaryStorageMountPath + " due to " + tmp[1]; + errMsg = + "Could not copy backupUuid: " + backupSnapshotUuid + " from primary storage " + primaryStorageSRUuid + " to secondary storage " + + secondaryStorageMountPath + " due to " + tmp[1]; } } String source = backupUuid + ".vhd"; @@ -1202,7 +1214,8 @@ public class XenServerStorageProcessor implements StorageProcessor { try { SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel); if (primaryStorageSR == null) { - throw new InternalErrorException("Could not backup snapshot because the primary Storage SR could not be created from the name label: " + primaryStorageNameLabel); + throw new InternalErrorException("Could not backup snapshot because the primary Storage SR could not be created from the name label: " + + primaryStorageNameLabel); } String psUuid = primaryStorageSR.getUuid(conn); Boolean isISCSI = IsISCSI(primaryStorageSR.getType(conn)); @@ -1286,8 +1299,9 @@ public class XenServerStorageProcessor implements StorageProcessor { String primaryStorageSRUuid = primaryStorageSR.getUuid(conn); if (destStore instanceof SwiftTO) { String container = "S-" + snapshotTO.getVolume().getVolumeId().toString(); - snapshotBackupUuid = swiftBackupSnapshot(conn, (SwiftTO)destStore, primaryStorageSRUuid, snapshotPaUuid, - "S-" + snapshotTO.getVolume().getVolumeId().toString(), isISCSI, wait); + snapshotBackupUuid = + swiftBackupSnapshot(conn, (SwiftTO)destStore, primaryStorageSRUuid, snapshotPaUuid, "S-" + snapshotTO.getVolume().getVolumeId().toString(), + isISCSI, wait); finalPath = container + File.separator + snapshotBackupUuid; } else if (destStore instanceof S3TO) { finalPath = backupSnapshotToS3(conn, (S3TO)destStore, primaryStorageSRUuid, folder, snapshotPaUuid, isISCSI, wait); @@ -1295,7 +1309,8 @@ public class XenServerStorageProcessor implements StorageProcessor { throw new CloudRuntimeException("S3 upload of snapshots " + snapshotPaUuid + " failed"); } } else { - snapshotBackupUuid = backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, wait); + snapshotBackupUuid = + backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, isISCSI, wait); finalPath = folder + File.separator + snapshotBackupUuid; } @@ -1369,8 +1384,9 @@ public class XenServerStorageProcessor implements StorageProcessor { long physicalSize = tmpltVDI.getPhysicalUtilisation(conn); // create the template.properties file String templatePath = secondaryStorageMountPath + "/" + installPath; - result = this.hypervisorResource.postCreatePrivateTemplate(conn, templatePath, tmpltFilename, tmpltUUID, userSpecifiedName, null, physicalSize, virtualSize, - template.getId()); + result = + this.hypervisorResource.postCreatePrivateTemplate(conn, templatePath, tmpltFilename, tmpltUUID, userSpecifiedName, null, physicalSize, virtualSize, + template.getId()); if (!result) { throw new CloudRuntimeException("Could not create the template.properties file on secondary storage dir: " + tmpltURI); } @@ -1432,7 +1448,7 @@ public class XenServerStorageProcessor implements StorageProcessor { SR primaryStorageSR = this.hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel); if (primaryStorageSR == null) { throw new InternalErrorException("Could not create volume from snapshot because the primary Storage SR could not be created from the name label: " + - primaryStorageNameLabel); + primaryStorageNameLabel); } // Get the absolute path of the snapshot on the secondary storage. String snapshotInstallPath = snapshot.getPath(); diff --git a/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java b/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java index 0ea202d0217..f2bf47262ca 100644 --- a/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java +++ b/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java @@ -24,6 +24,9 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; @@ -34,8 +37,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -151,7 +152,8 @@ public class XenServerStorageMotionStrategy implements DataMotionStrategy { throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + ". " + receiveAnswer.getDetails()); } - MigrateWithStorageSendCommand sendCmd = new MigrateWithStorageSendCommand(to, receiveAnswer.getVolumeToSr(), receiveAnswer.getNicToNetwork(), receiveAnswer.getToken()); + MigrateWithStorageSendCommand sendCmd = + new MigrateWithStorageSendCommand(to, receiveAnswer.getVolumeToSr(), receiveAnswer.getNicToNetwork(), receiveAnswer.getToken()); MigrateWithStorageSendAnswer sendAnswer = (MigrateWithStorageSendAnswer)agentMgr.send(srcHost.getId(), sendCmd); if (sendAnswer == null) { s_logger.error("Migration with storage of vm " + vm + " to host " + destHost + " failed."); diff --git a/plugins/hypervisors/xen/test/com/cloud/hypervisor/xen/resource/CitrixResourceBaseTest.java b/plugins/hypervisors/xen/test/com/cloud/hypervisor/xen/resource/CitrixResourceBaseTest.java index a969b5d6e53..788ad5a0cee 100644 --- a/plugins/hypervisors/xen/test/com/cloud/hypervisor/xen/resource/CitrixResourceBaseTest.java +++ b/plugins/hypervisors/xen/test/com/cloud/hypervisor/xen/resource/CitrixResourceBaseTest.java @@ -19,24 +19,35 @@ package com.cloud.hypervisor.xen.resource; -import org.junit.Test; -import org.junit.Before; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.MockitoAnnotations; -import static org.mockito.Mockito.*; - -import com.cloud.hypervisor.xen.resource.CitrixResourceBase.XsHost; -import com.cloud.agent.api.ScaleVmCommand; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.agent.api.ScaleVmAnswer; -import com.xensource.xenapi.*; -import org.apache.xmlrpc.XmlRpcException; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; + +import org.apache.xmlrpc.XmlRpcException; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; + +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.VM; +import com.xensource.xenapi.XenAPIObject; + +import com.cloud.agent.api.ScaleVmAnswer; +import com.cloud.agent.api.ScaleVmCommand; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.hypervisor.xen.resource.CitrixResourceBase.XsHost; public class CitrixResourceBaseTest { @@ -48,6 +59,7 @@ public class CitrixResourceBaseTest { return super.execute(cmd); } + @Override public String callHostPlugin(Connection conn, String plugin, String cmd, String... params) { return "Success"; } @@ -90,7 +102,7 @@ public class CitrixResourceBaseTest { @Test(expected = XmlRpcException.class) public void testScaleVMF1() throws Types.BadServerResponse, Types.XenAPIException, XmlRpcException { doReturn(conn).when(_resource).getConnection(); - Set vms = (Set)mock(Set.class); + Set vms = mock(Set.class); Iterator iter = mock(Iterator.class); doReturn(iter).when(vms).iterator(); @@ -124,7 +136,7 @@ public class CitrixResourceBaseTest { doNothing().when(vm).setVCPUsNumberLive(conn, 1L); doReturn(500).when(vmSpec).getMinSpeed(); doReturn(false).when(vmSpec).getLimitCpuUse(); - Map args = (Map)mock(HashMap.class); + Map args = mock(HashMap.class); when(host.callPlugin(conn, "vmops", "add_to_VCPUs_params_live", args)).thenReturn("Success"); doReturn(null).when(_resource).callHostPlugin(conn, "vmops", "add_to_VCPUs_params_live", "key", "weight", "value", "253", "vmname", "i-2-3-VM"); @@ -148,7 +160,7 @@ public class CitrixResourceBaseTest { doReturn(500).when(vmSpec).getMinSpeed(); doReturn(true).when(vmSpec).getLimitCpuUse(); doReturn(null).when(_resource).callHostPlugin(conn, "vmops", "add_to_VCPUs_params_live", "key", "cap", "value", "99", "vmname", "i-2-3-VM"); - Map args = (Map)mock(HashMap.class); + Map args = mock(HashMap.class); when(host.callPlugin(conn, "vmops", "add_to_VCPUs_params_live", args)).thenReturn("Success"); doReturn(null).when(_resource).callHostPlugin(conn, "vmops", "add_to_VCPUs_params_live", "key", "weight", "value", "253", "vmname", "i-2-3-VM"); diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java index b55f4ee9a86..a30059d8e28 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java @@ -74,7 +74,8 @@ public class AddBigSwitchVnsDeviceCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { BigSwitchVnsDeviceVO bigswitchVnsDeviceVO = _bigswitchVnsElementService.addBigSwitchVnsDevice(this); if (bigswitchVnsDeviceVO != null) { diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java index 799d61bf22f..4af45b22d62 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java @@ -65,7 +65,8 @@ public class DeleteBigSwitchVnsDeviceCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _bigswitchVnsElementService.deleteBigSwitchVnsDevice(this); if (result) { diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java index e15789a1a72..6e4ee751212 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.log4j.Logger; import com.cloud.api.response.BigSwitchVnsDeviceResponse; import com.cloud.exception.ConcurrentOperationException; @@ -55,7 +56,10 @@ public class ListBigSwitchVnsDevicesCmd extends BaseListCmd { @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, description = "the Physical Network ID") private Long physicalNetworkId; - @Parameter(name = VnsConstants.BIGSWITCH_VNS_DEVICE_ID, type = CommandType.UUID, entityType = BigSwitchVnsDeviceResponse.class, description = "bigswitch vns device ID") + @Parameter(name = VnsConstants.BIGSWITCH_VNS_DEVICE_ID, + type = CommandType.UUID, + entityType = BigSwitchVnsDeviceResponse.class, + description = "bigswitch vns device ID") private Long bigswitchVnsDeviceId; ///////////////////////////////////////////////////// @@ -75,7 +79,8 @@ public class ListBigSwitchVnsDevicesCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List bigswitchDevices = _bigswitchVnsElementService.listBigSwitchVnsDevices(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/response/BigSwitchVnsDeviceResponse.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/response/BigSwitchVnsDeviceResponse.java index 0d656ce9f8a..790ac9c6afb 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/response/BigSwitchVnsDeviceResponse.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/response/BigSwitchVnsDeviceResponse.java @@ -16,13 +16,15 @@ // under the License. package com.cloud.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; + import com.cloud.api.commands.VnsConstants; import com.cloud.network.BigSwitchVnsDeviceVO; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = BigSwitchVnsDeviceVO.class) public class BigSwitchVnsDeviceResponse extends BaseResponse { diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/BigSwitchVnsDeviceVO.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/BigSwitchVnsDeviceVO.java index c769a02838a..01b5d49a90b 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/BigSwitchVnsDeviceVO.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/BigSwitchVnsDeviceVO.java @@ -64,6 +64,7 @@ public class BigSwitchVnsDeviceVO implements InternalIdentity { this.uuid = UUID.randomUUID().toString(); } + @Override public long getId() { return id; } diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/element/BigSwitchVnsElement.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/element/BigSwitchVnsElement.java index 958584c18de..c2b603221b3 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/element/BigSwitchVnsElement.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/element/BigSwitchVnsElement.java @@ -29,6 +29,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import com.cloud.agent.AgentManager; @@ -84,7 +85,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; @@ -168,8 +168,8 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (!canHandle(network, Service.Connectivity)) { return false; @@ -203,7 +203,8 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { if (!canHandle(network, Service.Connectivity)) { return false; @@ -259,7 +260,8 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // Nothing to do here. return true; } @@ -301,14 +303,14 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem } long zoneId = physicalNetwork.getDataCenterId(); - final PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), - networkDevice.getNetworkServiceProvder()); + final PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), networkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + networkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } if (_bigswitchVnsDao.listByPhysicalNetwork(physicalNetworkId).size() != 0) { @@ -335,7 +337,8 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem return Transaction.execute(new TransactionCallback() { @Override public BigSwitchVnsDeviceVO doInTransaction(TransactionStatus status) { - BigSwitchVnsDeviceVO bigswitchVnsDevice = new BigSwitchVnsDeviceVO(host.getId(), physicalNetworkId, ntwkSvcProvider.getProviderName(), deviceName); + BigSwitchVnsDeviceVO bigswitchVnsDevice = + new BigSwitchVnsDeviceVO(host.getId(), physicalNetworkId, ntwkSvcProvider.getProviderName(), deviceName); _bigswitchVnsDao.persist(bigswitchVnsDevice); DetailVO detail = new DetailVO(host.getId(), "bigswitchvnsdeviceid", String.valueOf(bigswitchVnsDevice.getId())); @@ -389,7 +392,7 @@ public class BigSwitchVnsElement extends AdapterBase implements BigSwitchVnsElem if (network.getBroadcastDomainType() == Networks.BroadcastDomainType.Lswitch) { if ((network.getState() != Network.State.Shutdown) && (network.getState() != Network.State.Destroy)) { throw new CloudRuntimeException("This BigSwitch Controller device can not be deleted as there are one or more " - + "logical networks provisioned by cloudstack."); + + "logical networks provisioned by cloudstack."); } } } diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java index 58975445be9..17a2140a9c2 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java @@ -127,7 +127,8 @@ public class BigSwitchVnsGuestNetworkGuru extends GuestNetworkGuru { } @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (network.getState() == State.Implementing) : "Why are we implementing " + network; long dcId = dest.getDataCenter().getId(); @@ -135,8 +136,9 @@ public class BigSwitchVnsGuestNetworkGuru extends GuestNetworkGuru { //get physical network id long physicalNetworkId = _networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, - network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, + network.getDataCenterId(), physicalNetworkId); if (network.getGateway() != null) { implemented.setGateway(network.getGateway()); @@ -146,7 +148,8 @@ public class BigSwitchVnsGuestNetworkGuru extends GuestNetworkGuru { implemented.setCidr(network.getCidr()); } - String vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), context.getReservationId(), UseSystemGuestVlans.valueIn(network.getAccountId())); + String vnet = + _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), context.getReservationId(), UseSystemGuestVlans.valueIn(network.getAccountId())); if (vnet == null) { throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, dcId); } diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/resource/BigSwitchVnsResource.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/resource/BigSwitchVnsResource.java index dde67a51f04..bee3f00c5f1 100644 --- a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/resource/BigSwitchVnsResource.java +++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/resource/BigSwitchVnsResource.java @@ -38,16 +38,16 @@ import com.cloud.agent.api.MaintainCommand; import com.cloud.agent.api.PingCommand; import com.cloud.agent.api.ReadyAnswer; import com.cloud.agent.api.ReadyCommand; -import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupBigSwitchVnsCommand; +import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.UpdateVnsPortAnswer; import com.cloud.agent.api.UpdateVnsPortCommand; import com.cloud.host.Host; import com.cloud.host.Host.Type; +import com.cloud.network.bigswitch.AttachmentData; import com.cloud.network.bigswitch.BigSwitchVnsApi; import com.cloud.network.bigswitch.BigSwitchVnsApiException; import com.cloud.network.bigswitch.ControlClusterStatus; -import com.cloud.network.bigswitch.AttachmentData; import com.cloud.network.bigswitch.NetworkData; import com.cloud.network.bigswitch.PortData; import com.cloud.resource.ServerResource; diff --git a/plugins/network-elements/bigswitch-vns/test/com/cloud/network/bigswitch/BigSwitchApiTest.java b/plugins/network-elements/bigswitch-vns/test/com/cloud/network/bigswitch/BigSwitchApiTest.java index be42cc084b0..4d8021c5f77 100644 --- a/plugins/network-elements/bigswitch-vns/test/com/cloud/network/bigswitch/BigSwitchApiTest.java +++ b/plugins/network-elements/bigswitch-vns/test/com/cloud/network/bigswitch/BigSwitchApiTest.java @@ -16,7 +16,11 @@ // under the License. package com.cloud.network.bigswitch; -import static org.mockito.Mockito.*; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.IOException; import java.util.Collections; diff --git a/plugins/network-elements/bigswitch-vns/test/com/cloud/network/resource/BigSwitchVnsResourceTest.java b/plugins/network-elements/bigswitch-vns/test/com/cloud/network/resource/BigSwitchVnsResourceTest.java index 31e140c33b7..8cf322ad19f 100644 --- a/plugins/network-elements/bigswitch-vns/test/com/cloud/network/resource/BigSwitchVnsResourceTest.java +++ b/plugins/network-elements/bigswitch-vns/test/com/cloud/network/resource/BigSwitchVnsResourceTest.java @@ -16,8 +16,14 @@ // under the License. package com.cloud.network.resource; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.Collections; import java.util.HashMap; @@ -42,11 +48,11 @@ import com.cloud.agent.api.UpdateVnsPortAnswer; import com.cloud.agent.api.UpdateVnsPortCommand; import com.cloud.host.Host; import com.cloud.network.bigswitch.AttachmentData; +import com.cloud.network.bigswitch.BigSwitchVnsApi; +import com.cloud.network.bigswitch.BigSwitchVnsApiException; import com.cloud.network.bigswitch.ControlClusterStatus; import com.cloud.network.bigswitch.NetworkData; import com.cloud.network.bigswitch.PortData; -import com.cloud.network.bigswitch.BigSwitchVnsApi; -import com.cloud.network.bigswitch.BigSwitchVnsApiException; public class BigSwitchVnsResourceTest { BigSwitchVnsApi _bigswitchVnsApi = mock(BigSwitchVnsApi.class); @@ -56,6 +62,7 @@ public class BigSwitchVnsResourceTest { @Before public void setUp() throws ConfigurationException { _resource = new BigSwitchVnsResource() { + @Override protected BigSwitchVnsApi createBigSwitchVnsApi() { return _bigswitchVnsApi; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java index 16978fc364a..c7e7d30c740 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java @@ -18,6 +18,8 @@ package com.cloud.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -28,8 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoAsa1000vResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -95,7 +95,8 @@ public class AddCiscoAsa1000vResourceCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { CiscoAsa1000vDevice ciscoAsa1000v = _ciscoAsa1000vService.addCiscoAsa1000vResource(this); if (ciscoAsa1000v != null) { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java index d26e495ee10..b33d1a867d7 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java @@ -18,6 +18,8 @@ package com.cloud.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoVnmcResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -91,7 +91,8 @@ public class AddCiscoVnmcResourceCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { CiscoVnmcController CiscoVnmcResourceVO = _ciscoVnmcElementService.addCiscoVnmcResource(this); if (CiscoVnmcResourceVO != null) { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java index 78caae6a709..5af72994004 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java @@ -18,6 +18,8 @@ package com.cloud.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoAsa1000vResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -69,7 +69,8 @@ public class DeleteCiscoAsa1000vResourceCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _ciscoAsa1000vService.deleteCiscoAsa1000vResource(this); if (result) { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java index b423b2dcab5..ee13ae6082e 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java @@ -18,6 +18,8 @@ package com.cloud.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,8 +29,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoVnmcResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -49,7 +49,11 @@ public class DeleteCiscoVnmcResourceCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.UUID, required = true, entityType = CiscoVnmcResourceResponse.class, description = "Cisco Vnmc resource ID") + @Parameter(name = ApiConstants.RESOURCE_ID, + type = CommandType.UUID, + required = true, + entityType = CiscoVnmcResourceResponse.class, + description = "Cisco Vnmc resource ID") private Long ciscoVnmcResourceId; ///////////////////////////////////////////////////// @@ -65,7 +69,8 @@ public class DeleteCiscoVnmcResourceCmd extends BaseCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _ciscoVnmcElementService.deleteCiscoVnmcResource(this); if (result) { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java index f0288c83abe..72898ae16d4 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.log4j.Logger; import com.cloud.api.response.CiscoAsa1000vResourceResponse; import com.cloud.exception.ConcurrentOperationException; @@ -83,7 +84,8 @@ public class ListCiscoAsa1000vResourcesCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List ciscoAsa1000vDevices = _ciscoAsa1000vService.listCiscoAsa1000vResources(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java index 0b73d6f80f2..4b0a6b53ab5 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.log4j.Logger; import com.cloud.api.response.CiscoVnmcResourceResponse; import com.cloud.exception.ConcurrentOperationException; @@ -76,7 +77,8 @@ public class ListCiscoVnmcResourcesCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List ciscoVnmcResources = _ciscoVnmcElementService.listCiscoVnmcResources(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java index 2690e36e89a..b061b4f4605 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -24,7 +26,6 @@ import org.apache.cloudstack.api.response.NetworkResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import com.cloud.network.cisco.CiscoAsa1000vDevice; -import com.google.gson.annotations.SerializedName; @EntityReference(value = CiscoAsa1000vDevice.class) public class CiscoAsa1000vResourceResponse extends BaseResponse { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java index d709ccdb052..b7c19cdeab3 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -23,7 +25,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import com.cloud.network.cisco.CiscoVnmcController; -import com.google.gson.annotations.SerializedName; @EntityReference(value = CiscoVnmcController.class) public class CiscoVnmcResourceResponse extends BaseResponse { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java index 3c5f6827718..210c4f9d109 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java @@ -23,8 +23,10 @@ import com.cloud.org.Grouping; public interface CiscoAsa1000vDevice extends Grouping, InternalIdentity, Identity { + @Override long getId(); + @Override String getUuid(); void setUuid(String uuid); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java index 0838686e060..c6b59f94089 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java @@ -40,7 +40,8 @@ public interface CiscoVnmcConnection { public boolean associateTenantVDCEdgeDhcpPolicy(String tenantName, String intfName) throws ExecutionException; - public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, String startIp, String endIp, String subnet, String nameServerIp, String domain) throws ExecutionException; + public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, String startIp, String endIp, String subnet, String nameServerIp, String domain) + throws ExecutionException; public boolean associateTenantVDCEdgeDhcpServerPolicy(String tenantName, String intfName) throws ExecutionException; @@ -79,8 +80,8 @@ public interface CiscoVnmcConnection { public boolean deleteTenantVDCPFRule(String tenantName, long ruleId, String policyIdentifier) throws ExecutionException; - public boolean createTenantVDCAclRuleForPF(String tenantName, long ruleId, String policyIdentifier, String protocol, String ipAddress, String startPort, String endPort) - throws ExecutionException; + public boolean createTenantVDCAclRuleForPF(String tenantName, long ruleId, String policyIdentifier, String protocol, String ipAddress, String startPort, + String endPort) throws ExecutionException; public boolean createTenantVDCPFPolicy(String tenantName, String identifier) throws ExecutionException; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java index 1be618d7d50..abdf00ea014 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java @@ -366,7 +366,8 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { } @Override - public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, String startIp, String endIp, String subnet, String nameServerIp, String domain) throws ExecutionException { + public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, String startIp, String endIp, String subnet, String nameServerIp, String domain) + throws ExecutionException { String xml = VnmcXml.CREATE_DHCP_POLICY.getXml(); String service = VnmcXml.CREATE_DHCP_POLICY.getService(); xml = replaceXmlValue(xml, "cookie", _cookie); @@ -437,7 +438,8 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { @Override public boolean createTenantVDCSourceNatIpPool(String tenantName, String identifier, String publicIp) throws ExecutionException { - return createTenantVDCIpPool(getDnForSourceNatPool(tenantName), getNameForSourceNatIpPool(tenantName), "Source NAT ip pool for Tenant VDC " + tenantName, publicIp); + return createTenantVDCIpPool(getDnForSourceNatPool(tenantName), getNameForSourceNatIpPool(tenantName), "Source NAT ip pool for Tenant VDC " + tenantName, + publicIp); } private String getNameForSourceNatPolicy(String tenantName) { @@ -922,8 +924,8 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { @Override public boolean createTenantVDCPFPortPool(String tenantName, String identifier, String startPort, String endPort) throws ExecutionException { - return createTenantVDCPortPool(getDnForPFPortPool(tenantName, identifier), getNameForPFPortPool(tenantName, identifier), - "PF port pool for " + getNameForPFPortPool(tenantName, identifier), startPort, endPort); + return createTenantVDCPortPool(getDnForPFPortPool(tenantName, identifier), getNameForPFPortPool(tenantName, identifier), "PF port pool for " + + getNameForPFPortPool(tenantName, identifier), startPort, endPort); } @Override @@ -984,8 +986,8 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { } @Override - public boolean createTenantVDCAclRuleForPF(String tenantName, long ruleId, String policyIdentifier, String protocol, String ipAddress, String startPort, String endPort) - throws ExecutionException { + public boolean createTenantVDCAclRuleForPF(String tenantName, long ruleId, String policyIdentifier, String protocol, String ipAddress, String startPort, + String endPort) throws ExecutionException { String xml = VnmcXml.CREATE_ACL_RULE_FOR_PF.getXml(); String service = VnmcXml.CREATE_ACL_RULE_FOR_PF.getService(); @@ -1032,8 +1034,8 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { @Override public boolean createTenantVDCDNatIpPool(String tenantName, String identifier, String ipAddress) throws ExecutionException { - return createTenantVDCIpPool(getDnForDNatIpPool(tenantName, identifier), getNameForDNatIpPool(tenantName, identifier), - "DNAT ip pool for " + getNameForDNatIpPool(tenantName, identifier), ipAddress); + return createTenantVDCIpPool(getDnForDNatIpPool(tenantName, identifier), getNameForDNatIpPool(tenantName, identifier), "DNAT ip pool for " + + getNameForDNatIpPool(tenantName, identifier), ipAddress); } private String getNameForDNatRule(String tenantName, String identifier) { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java index e756165bdaa..09193a4e433 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java @@ -23,8 +23,10 @@ import com.cloud.org.Grouping; public interface CiscoVnmcController extends Grouping, InternalIdentity, Identity { + @Override long getId(); + @Override String getUuid(); void setUuid(String uuid); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java index 2e004dccd41..3ae0d56fef2 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java @@ -22,6 +22,7 @@ import com.cloud.org.Grouping; public interface NetworkAsa1000vMap extends Grouping, InternalIdentity { + @Override long getId(); long getNetworkId(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java index 6290e1359a7..e8b6aa213fe 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java @@ -29,6 +29,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; @@ -124,7 +125,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.ExceptionUtil; @@ -229,7 +229,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro return Provider.CiscoVnmc; } - private boolean createLogicalEdgeFirewall(long vlanId, String gateway, String gatewayNetmask, String publicIp, String publicNetmask, List publicGateways, long hostId) { + private boolean createLogicalEdgeFirewall(long vlanId, String gateway, String gatewayNetmask, String publicIp, String publicNetmask, List publicGateways, + long hostId) { CreateLogicalEdgeFirewallCommand cmd = new CreateLogicalEdgeFirewallCommand(vlanId, publicIp, gateway, publicNetmask, gatewayNetmask); for (String publicGateway : publicGateways) { cmd.getPublicGateways().add(publicGateway); @@ -246,8 +247,9 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro private boolean configureSourceNat(long vlanId, String guestCidr, PublicIp sourceNatIp, long hostId) { boolean add = (sourceNatIp.getState() == IpAddress.State.Releasing ? false : true); - IpAddressTO ip = new IpAddressTO(sourceNatIp.getAccountId(), sourceNatIp.getAddress().addr(), add, false, sourceNatIp.isSourceNat(), sourceNatIp.getVlanTag(), - sourceNatIp.getGateway(), sourceNatIp.getNetmask(), sourceNatIp.getMacAddress(), null, sourceNatIp.isOneToOneNat()); + IpAddressTO ip = + new IpAddressTO(sourceNatIp.getAccountId(), sourceNatIp.getAddress().addr(), add, false, sourceNatIp.isSourceNat(), sourceNatIp.getVlanTag(), + sourceNatIp.getGateway(), sourceNatIp.getNetmask(), sourceNatIp.getMacAddress(), null, sourceNatIp.isOneToOneNat()); boolean addSourceNat = false; if (sourceNatIp.isSourceNat()) { addSourceNat = add; @@ -362,10 +364,10 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro try { outsideIp = _ipAddrMgr.associateIPToGuestNetwork(outsideIp.getId(), network.getId(), true); } catch (ResourceAllocationException e) { - s_logger.error("Unable to assign allocated additional public Ip " + outsideIp.getAddress().addr() + " to network with vlan " + vlanId + ". Exception details " + - e); - throw new CloudRuntimeException("Unable to assign allocated additional public Ip " + outsideIp.getAddress().addr() + " to network with vlan " + vlanId + - ". Exception details " + e); + s_logger.error("Unable to assign allocated additional public Ip " + outsideIp.getAddress().addr() + " to network with vlan " + vlanId + + ". Exception details " + e); + throw new CloudRuntimeException("Unable to assign allocated additional public Ip " + outsideIp.getAddress().addr() + " to network with vlan " + + vlanId + ". Exception details " + e); } } @@ -380,8 +382,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } // create stuff in VSM for ASA device - if (!configureNexusVsmForAsa(vlanId, network.getGateway(), vsmDevice.getUserName(), vsmDevice.getPassword(), vsmDevice.getipaddr(), assignedAsa.getInPortProfile(), - ciscoVnmcHost.getId())) { + if (!configureNexusVsmForAsa(vlanId, network.getGateway(), vsmDevice.getUserName(), vsmDevice.getPassword(), vsmDevice.getipaddr(), + assignedAsa.getInPortProfile(), ciscoVnmcHost.getId())) { s_logger.error("Failed to configure Cisco Nexus VSM " + vsmDevice.getipaddr() + " for ASA device for network " + network.getName()); throw new CloudRuntimeException("Failed to configure Cisco Nexus VSM " + vsmDevice.getipaddr() + " for ASA device for network " + network.getName()); } @@ -394,9 +396,10 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro // associate Asa 1000v instance with logical edge firewall if (!associateAsaWithLogicalEdgeFirewall(vlanId, assignedAsa.getManagementIp(), ciscoVnmcHost.getId())) { - s_logger.error("Failed to associate Cisco ASA 1000v (" + assignedAsa.getManagementIp() + ") with logical edge firewall in VNMC for network " + network.getName()); - throw new CloudRuntimeException("Failed to associate Cisco ASA 1000v (" + assignedAsa.getManagementIp() + ") with logical edge firewall in VNMC for network " + - network.getName()); + s_logger.error("Failed to associate Cisco ASA 1000v (" + assignedAsa.getManagementIp() + ") with logical edge firewall in VNMC for network " + + network.getName()); + throw new CloudRuntimeException("Failed to associate Cisco ASA 1000v (" + assignedAsa.getManagementIp() + + ") with logical edge firewall in VNMC for network " + network.getName()); } } catch (CloudRuntimeException e) { unassignAsa1000vFromNetwork(network); @@ -414,8 +417,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (vm.getType() != Type.User) { return false; } @@ -430,7 +433,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -462,7 +466,8 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -510,14 +515,14 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro } long zoneId = physicalNetwork.getDataCenterId(); - final PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), - networkDevice.getNetworkServiceProvder()); + final PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), networkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + networkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } if (_ciscoVnmcDao.listByPhysicalNetwork(physicalNetworkId).size() != 0) { @@ -659,7 +664,7 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply firewall rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -717,7 +722,7 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply port forwarding rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -771,7 +776,7 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply static NAT rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -781,8 +786,9 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro List rulesTO = new ArrayList(); for (StaticNat rule : rules) { IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); - StaticNatRuleTO ruleTO = new StaticNatRuleTO(rule.getSourceIpAddressId(), sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, - rule.isForRevoke(), false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(rule.getSourceIpAddressId(), sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), + false); rulesTO.add(ruleTO); } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java index 8c8f089d170..aad9c90e524 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java @@ -83,6 +83,7 @@ public class CiscoVnmcResource implements ServerResource { private final Logger s_logger = Logger.getLogger(CiscoVnmcResource.class); + @Override public Answer executeRequest(Command cmd) { if (cmd instanceof ReadyCommand) { return execute((ReadyCommand)cmd); @@ -113,6 +114,7 @@ public class CiscoVnmcResource implements ServerResource { } } + @Override public boolean configure(String name, Map params) throws ConfigurationException { try { _name = (String)params.get("name"); @@ -167,6 +169,7 @@ public class CiscoVnmcResource implements ServerResource { } + @Override public StartupCommand[] initialize() { StartupExternalFirewallCommand cmd = new StartupExternalFirewallCommand(); cmd.setName(_name); @@ -179,6 +182,7 @@ public class CiscoVnmcResource implements ServerResource { return new StartupCommand[] {cmd}; } + @Override public Host.Type getType() { return Host.Type.ExternalFirewall; } @@ -210,10 +214,12 @@ public class CiscoVnmcResource implements ServerResource { public void disconnected() { } + @Override public IAgentControl getAgentControl() { return null; } + @Override public void setAgentControl(IAgentControl agentControl) { return; } @@ -366,25 +372,25 @@ public class CiscoVnmcResource implements ServerResource { String[] externalIpRange = getIpRangeFromCidr(rule.getSourceCidrList().get(0)); if (rule.getTrafficType() == TrafficType.Ingress) { if (!rule.getProtocol().equalsIgnoreCase("icmp") && rule.getSrcPortRange() != null) { - if (!_connection.createTenantVDCIngressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), externalIpRange[0], - externalIpRange[1], Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]))) { + if (!_connection.createTenantVDCIngressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), + externalIpRange[0], externalIpRange[1], Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]))) { throw new ExecutionException("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); } } else { - if (!_connection.createTenantVDCIngressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), externalIpRange[0], - externalIpRange[1])) { + if (!_connection.createTenantVDCIngressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), + externalIpRange[0], externalIpRange[1])) { throw new ExecutionException("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); } } } else { if ((rule.getProtocol().equalsIgnoreCase("tcp") || rule.getProtocol().equalsIgnoreCase("udp")) && rule.getSrcPortRange() != null) { - if (!_connection.createTenantVDCEgressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), externalIpRange[0], - externalIpRange[1], Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]))) { + if (!_connection.createTenantVDCEgressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), + externalIpRange[0], externalIpRange[1], Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]))) { throw new ExecutionException("Failed to create ACL egress rule in VNMC for guest network with vlan " + vlanId); } } else { - if (!_connection.createTenantVDCEgressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), externalIpRange[0], - externalIpRange[1])) { + if (!_connection.createTenantVDCEgressAclRule(tenant, rule.getId(), policyIdentifier, rule.getProtocol().toUpperCase(), + externalIpRange[0], externalIpRange[1])) { throw new ExecutionException("Failed to create ACL egress rule in VNMC for guest network with vlan " + vlanId); } } diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java index b8b1da0be30..f5fca0aff8c 100644 --- a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java @@ -24,7 +24,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import com.cloud.network.cisco.CiscoVnmcConnectionImpl; import com.cloud.utils.exception.ExecutionException; @Ignore("Requires actual VNMC to connect to") diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java index cc57487c435..a5be7b641c6 100755 --- a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java @@ -16,9 +16,12 @@ // under the License. package com.cloud.network.resource; -import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections; @@ -44,16 +47,9 @@ import com.cloud.agent.api.to.FirewallRuleTO; import com.cloud.agent.api.to.IpAddressTO; import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.agent.api.to.StaticNatRuleTO; -import com.cloud.dc.Vlan; import com.cloud.host.Host; -import com.cloud.network.IpAddress; import com.cloud.network.cisco.CiscoVnmcConnectionImpl; import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.PortForwardingRule; -import com.cloud.network.rules.StaticNat; -import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.network.rules.FirewallRule.TrafficType; -import com.cloud.network.rules.FirewallRuleVO; import com.cloud.utils.exception.ExecutionException; public class CiscoVnmcResourceTest { @@ -159,8 +155,10 @@ public class CiscoVnmcResourceTest { when(_connection.createTenantVDCAclPolicy(anyString(), anyString())).thenReturn(true); when(_connection.createTenantVDCAclPolicyRef(anyString(), anyString(), anyBoolean())).thenReturn(true); when(_connection.deleteTenantVDCAclRule(anyString(), anyLong(), anyString())).thenReturn(true); - when(_connection.createTenantVDCIngressAclRule(anyString(), anyLong(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn(true); - when(_connection.createTenantVDCEgressAclRule(anyString(), anyLong(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCIngressAclRule(anyString(), anyLong(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn( + true); + when(_connection.createTenantVDCEgressAclRule(anyString(), anyLong(), anyString(), anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn( + true); when(_connection.associateAclPolicySet(anyString())).thenReturn(true); Answer answer = _resource.executeRequest(cmd); diff --git a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java index 66ae9101e5a..5d1f02ba552 100644 --- a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java +++ b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Set; import javax.ejb.Local; -import javax.naming.ConfigurationException; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; @@ -38,7 +37,6 @@ import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** @@ -71,8 +69,8 @@ public class DnsNotifier extends AdapterBase implements NetworkElement { } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { // signal to the dns server that this vm is up and running and set the ip address to hostname mapping. vm.getHostName(); nic.getIp4Address(); @@ -81,7 +79,8 @@ public class DnsNotifier extends AdapterBase implements NetworkElement { } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { vm.getHostName(); nic.getIp4Address(); nic.getIp6Address(); @@ -105,7 +104,8 @@ public class DnsNotifier extends AdapterBase implements NetworkElement { } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java index 2154fb6bb36..835dc5448f5 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java @@ -28,9 +28,10 @@ import javax.persistence.SecondaryTable; import javax.persistence.SecondaryTables; import javax.persistence.Table; -import com.cloud.utils.net.Ip; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.net.Ip; + @Entity @Table(name = ("elastic_lb_vm_map")) @SecondaryTables({@SecondaryTable(name = "user_ip_address", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "ip_addr_id", referencedColumnName = "id")})}) @@ -65,6 +66,7 @@ public class ElasticLbVmMapVO implements InternalIdentity { this.lbId = lbId; } + @Override public long getId() { return id; } diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java index 5d0e9684133..1d92d07133f 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java @@ -36,7 +36,6 @@ import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.UnsupportedServiceException; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; @@ -54,7 +53,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Component @@ -129,14 +127,15 @@ public class ElasticLoadBalancerElement extends AdapterBase implements LoadBalan } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { return true; } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -192,7 +191,8 @@ public class ElasticLoadBalancerElement extends AdapterBase implements LoadBalan } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return true; } diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index 6b7c6efd24b..15333304b1e 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -36,6 +36,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -97,8 +98,8 @@ import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; -import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRule.LbSslCert; +import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.dao.ElasticLbVmMapDao; import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.RedundantState; @@ -124,8 +125,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; @@ -309,8 +308,9 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast } else { maxconn = offering.getConcurrentConnections().toString(); } - LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, elbVm.getPublicIpAddress(), _nicDao.getIpAddress(guestNetworkId, elbVm.getId()), - elbVm.getPrivateIpAddress(), null, null, maxconn, offering.isKeepAliveEnabled()); + LoadBalancerConfigCommand cmd = + new LoadBalancerConfigCommand(lbs, elbVm.getPublicIpAddress(), _nicDao.getIpAddress(guestNetworkId, elbVm.getId()), elbVm.getPrivateIpAddress(), null, null, + maxconn, offering.isKeepAliveEnabled()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, elbVm.getPrivateIpAddress()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, elbVm.getInstanceName()); //FIXME: why are we setting attributes directly? Ick!! There should be accessors and @@ -394,8 +394,9 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast _elasticLbVmRamSize = NumbersUtil.parseInt(configs.get(Config.ElasticLoadBalancerVmMemory.key()), DEFAULT_ELB_VM_RAMSIZE); _elasticLbvmCpuMHz = NumbersUtil.parseInt(configs.get(Config.ElasticLoadBalancerVmCpuMhz.key()), DEFAULT_ELB_VM_CPU_MHZ); _elasticLbvmNumCpu = NumbersUtil.parseInt(configs.get(Config.ElasticLoadBalancerVmNumVcpu.key()), 1); - _elasticLbVmOffering = new ServiceOfferingVO("System Offering For Elastic LB VM", _elasticLbvmNumCpu, _elasticLbVmRamSize, _elasticLbvmCpuMHz, 0, 0, true, null, - useLocalStorage, true, null, true, VirtualMachine.Type.ElasticLoadBalancerVm, true); + _elasticLbVmOffering = + new ServiceOfferingVO("System Offering For Elastic LB VM", _elasticLbvmNumCpu, _elasticLbVmRamSize, _elasticLbvmCpuMHz, 0, 0, true, null, useLocalStorage, + true, null, true, VirtualMachine.Type.ElasticLoadBalancerVm, true); _elasticLbVmOffering.setUniqueName(ServiceOffering.elbVmDefaultOffUniqueName); _elasticLbVmOffering = _serviceOfferingDao.persistSystemServiceOffering(_elasticLbVmOffering); @@ -457,8 +458,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast if (s_logger.isDebugEnabled()) { s_logger.debug("Starting a ELB vm for network configurations: " + guestNetwork + " in " + dest); } - assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + - guestNetwork; + assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || + guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + guestNetwork; DataCenterDeployment plan = null; DomainRouterVO elbVm = null; @@ -494,9 +495,10 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast throw new CloudRuntimeException("Cannot find virtual router provider " + typeString + " as service provider " + provider.getId()); } - elbVm = new DomainRouterVO(id, _elasticLbVmOffering.getId(), vrProvider.getId(), VirtualMachineName.getSystemVmName(id, _instance, _elbVmNamePrefix), - template.getId(), template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false, RedundantState.UNKNOWN, - _elasticLbVmOffering.getOfferHA(), false, VirtualMachine.Type.ElasticLoadBalancerVm, null); + elbVm = + new DomainRouterVO(id, _elasticLbVmOffering.getId(), vrProvider.getId(), VirtualMachineName.getSystemVmName(id, _instance, _elbVmNamePrefix), + template.getId(), template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false, + RedundantState.UNKNOWN, _elasticLbVmOffering.getOfferHA(), false, VirtualMachine.Type.ElasticLoadBalancerVm, null); elbVm.setRole(Role.LB); elbVm = _routerDao.persist(elbVm); _itMgr.allocate(elbVm.getInstanceName(), template, _elasticLbVmOffering, networks, plan, null); @@ -515,8 +517,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast } } - private DomainRouterVO start(DomainRouterVO elbVm, User user, Account caller, Map params) throws StorageUnavailableException, InsufficientCapacityException, - ConcurrentOperationException, ResourceUnavailableException { + private DomainRouterVO start(DomainRouterVO elbVm, User user, Account caller, Map params) throws StorageUnavailableException, + InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { s_logger.debug("Starting ELB VM " + elbVm); _itMgr.start(elbVm.getUuid(), params); return _routerDao.findById(elbVm.getId()); @@ -570,7 +572,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast public PublicIp doInTransaction(TransactionStatus status) throws InsufficientAddressCapacityException { Network frontEndNetwork = _networkModel.getNetwork(guestNetworkId); - PublicIp ip = _ipAddrMgr.assignPublicIpAddress(frontEndNetwork.getDataCenterId(), null, account, VlanType.DirectAttached, frontEndNetwork.getId(), null, true); + PublicIp ip = + _ipAddrMgr.assignPublicIpAddress(frontEndNetwork.getDataCenterId(), null, account, VlanType.DirectAttached, frontEndNetwork.getId(), null, true); IPAddressVO ipvo = _ipAddressDao.findById(ip.getId()); ipvo.setAssociatedWithNetworkId(frontEndNetwork.getId()); _ipAddressDao.update(ipvo.getId(), ipvo); @@ -610,7 +613,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast throw new CloudRuntimeException("Failed to acquire lock on account"); } try { - List existingLbs = findExistingLoadBalancers(lb.getName(), lb.getSourceIpAddressId(), lb.getAccountId(), lb.getDomainId(), lb.getSourcePortStart()); + List existingLbs = + findExistingLoadBalancers(lb.getName(), lb.getSourceIpAddressId(), lb.getAccountId(), lb.getDomainId(), lb.getSourcePortStart()); if (existingLbs == null) { existingLbs = findExistingLoadBalancers(lb.getName(), lb.getSourceIpAddressId(), lb.getAccountId(), lb.getDomainId(), null); if (existingLbs == null) { @@ -641,8 +645,9 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast try { lb.setSourceIpAddressId(ipId); - result = _lbMgr.createPublicLoadBalancer(lb.getXid(), lb.getName(), lb.getDescription(), lb.getSourcePortStart(), lb.getDefaultPortStart(), ipId.longValue(), - lb.getProtocol(), lb.getAlgorithm(), false, CallContext.current(), lb.getLbProtocol()); + result = + _lbMgr.createPublicLoadBalancer(lb.getXid(), lb.getName(), lb.getDescription(), lb.getSourcePortStart(), lb.getDefaultPortStart(), ipId.longValue(), + lb.getProtocol(), lb.getAlgorithm(), false, CallContext.current(), lb.getLbProtocol()); } catch (NetworkRuleConflictException e) { s_logger.warn("Failed to create LB rule, not continuing with ELB deployment"); if (newIp) { @@ -796,8 +801,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast if (dest.getHost().getHypervisorType() == HypervisorType.VMware) { if (s_logger.isInfoEnabled()) { s_logger.info("Check if we need to add management server explicit route to ELB vm. pod cidr: " + dest.getPod().getCidrAddress() + "/" + - dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + - ClusterManager.ManagementHostIPAdr.value()); + dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + + ClusterManager.ManagementHostIPAdr.value()); } if (s_logger.isDebugEnabled()) { @@ -839,7 +844,8 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast } @Override - public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException { + public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) + throws ResourceUnavailableException { DomainRouterVO elbVm = _routerDao.findById(profile.getVirtualMachine().getId()); List nics = profile.getNics(); diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java index d36d3ea2ac3..5b2b63aeb6c 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java @@ -26,18 +26,14 @@ import org.springframework.stereotype.Component; import com.cloud.network.ElasticLbVmMapVO; import com.cloud.network.dao.LoadBalancerDao; -import com.cloud.network.dao.LoadBalancerDaoImpl; import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.router.VirtualRouter.Role; -import com.cloud.network.router.VirtualRouter.Role; - import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.dao.DomainRouterDao; -import com.cloud.vm.dao.DomainRouterDaoImpl; @Component @Local(value = {ElasticLbVmMapDao.class}) @@ -77,8 +73,8 @@ public class ElasticLbVmMapDaoImpl extends GenericDaoBase listUnusedElbVms() { SearchCriteria sc = ElbVmSearch.create(); sc.setParameters("role", Role.LB); diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java index 478ef5dc0ec..ff653e721d3 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java @@ -19,19 +19,20 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.element.F5ExternalLoadBalancerElementService; -import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java index 237aade0aa8..ba98882a1b8 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java @@ -19,12 +19,15 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; - import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.api.response.F5LoadBalancerResponse; @@ -98,7 +101,8 @@ public class AddF5LoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalLoadBalancerDeviceVO lbDeviceVO = _f5DeviceManagerService.addF5LoadBalancer(this); if (lbDeviceVO != null) { diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java index d1331c7d886..dc33984b736 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java @@ -19,11 +19,14 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.*; - import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.context.CallContext; import com.cloud.api.response.F5LoadBalancerResponse; @@ -79,7 +82,8 @@ public class ConfigureF5LoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalLoadBalancerDeviceVO lbDeviceVO = _f5DeviceManagerService.configureF5LoadBalancer(this); if (lbDeviceVO != null) { diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java index f359280f395..63a9041942b 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java @@ -19,12 +19,17 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.HostResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.user.Account; @@ -40,7 +45,11 @@ public class DeleteExternalLoadBalancerCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "Id of the external loadbalancer appliance.") + @Parameter(name = ApiConstants.ID, + type = CommandType.UUID, + entityType = HostResponse.class, + required = true, + description = "Id of the external loadbalancer appliance.") private Long id; /////////////////////////////////////////////////// diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java index 9a34e66ef1a..2bb6c1c36e9 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java @@ -21,11 +21,10 @@ import javax.inject.Inject; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -72,7 +71,8 @@ public class DeleteF5LoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _f5DeviceManagerService.deleteF5LoadBalancer(this); if (result) { diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java index aebfe07236b..119718cf8fd 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java @@ -22,16 +22,19 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.host.Host; import com.cloud.network.element.F5ExternalLoadBalancerElementService; -import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; @APICommand(name = "listExternalLoadBalancers", description = "Lists F5 external load balancer appliances added in a zone.", responseObject = HostResponse.class) @Deprecated diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java index 8bff0befce4..d671a6b39b4 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java @@ -24,15 +24,15 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + import com.cloud.api.response.F5LoadBalancerResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -75,7 +75,8 @@ public class ListF5LoadBalancerNetworksCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List networks = _f5DeviceManagerService.listNetworks(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java index 0b730b8ec69..ce8eb202005 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java @@ -22,13 +22,18 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; -import com.cloud.api.response.F5LoadBalancerResponse; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + +import com.cloud.api.response.F5LoadBalancerResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -52,7 +57,10 @@ public class ListF5LoadBalancersCmd extends BaseListCmd { @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, description = "the Physical Network ID") private Long physicalNetworkId; - @Parameter(name = ApiConstants.LOAD_BALANCER_DEVICE_ID, type = CommandType.UUID, entityType = F5LoadBalancerResponse.class, description = "f5 load balancer device ID") + @Parameter(name = ApiConstants.LOAD_BALANCER_DEVICE_ID, + type = CommandType.UUID, + entityType = F5LoadBalancerResponse.class, + description = "f5 load balancer device ID") private Long lbDeviceId; ///////////////////////////////////////////////////// @@ -72,7 +80,8 @@ public class ListF5LoadBalancersCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List lbDevices = _f5DeviceManagerService.listF5LoadBalancers(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java index d8d84c74f56..a378fd39c25 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java +++ b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java @@ -16,13 +16,14 @@ // under the License. package com.cloud.api.response; -import org.apache.cloudstack.api.EntityReference; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; +import com.cloud.serializer.Param; @EntityReference(value = ExternalLoadBalancerDeviceVO.class) public class F5LoadBalancerResponse extends BaseResponse { diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index fb17ce763e5..daabf369cf0 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -26,12 +26,14 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + +import com.google.gson.Gson; + import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; -import org.apache.log4j.Logger; - import com.cloud.agent.api.to.LoadBalancerTO; import com.cloud.api.ApiDBUtils; import com.cloud.api.commands.AddExternalLoadBalancerCmd; @@ -89,14 +91,11 @@ import com.cloud.utils.NumbersUtil; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -import com.google.gson.Gson; - @Local(value = {NetworkElement.class, LoadBalancingServiceProvider.class, IpDeployer.class}) -public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, IpDeployer, F5ExternalLoadBalancerElementService, - ExternalLoadBalancerDeviceManager { +public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, IpDeployer, + F5ExternalLoadBalancerElementService, ExternalLoadBalancerDeviceManager { private static final Logger s_logger = Logger.getLogger(F5ExternalLoadBalancerElement.class); @@ -164,8 +163,8 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan } @Override - public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientNetworkCapacityException, ResourceUnavailableException { + public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { return true; } @@ -275,7 +274,8 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return true; } @@ -315,7 +315,8 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { - throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + " to add this device."); + throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + + " to add this device."); } pNetwork = physicalNetworks.get(0); @@ -351,7 +352,7 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + - " to add this device."); + " to add this device."); } pNetwork = physicalNetworks.get(0); return listExternalLoadBalancers(pNetwork.getId(), NetworkDevice.F5BigIpLoadBalancer.getName()); @@ -373,7 +374,8 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan throw new InvalidParameterValueException("Invalid F5 load balancer device type"); } - return addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, new F5BigIpResource(), false, null, null); + return addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, new F5BigIpResource(), false, null, + null); } diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java index ad8c5cbfb83..eacb7cffded 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java @@ -18,6 +18,8 @@ package com.cloud.network.element; import java.util.List; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; + import com.cloud.api.commands.AddExternalLoadBalancerCmd; import com.cloud.api.commands.AddF5LoadBalancerCmd; import com.cloud.api.commands.ConfigureF5LoadBalancerCmd; @@ -30,8 +32,6 @@ import com.cloud.api.response.F5LoadBalancerResponse; import com.cloud.host.Host; import com.cloud.network.Network; import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; - -import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.utils.component.PluggableService; @SuppressWarnings("deprecation") diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java index 150765c712b..e797bac0fa5 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java +++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java @@ -537,7 +537,7 @@ public class F5BigIpResource implements ServerResource { for (String virtualServerName : virtualServersToDelete) { s_logger.debug("Found a virtual server (" + virtualServerName + ") for guest network with self IP " + vlanSelfIp + - " that is active when the guest network is being destroyed."); + " that is active when the guest network is being destroyed."); deleteVirtualServerAndDefaultPool(virtualServerName); } } @@ -619,7 +619,8 @@ public class F5BigIpResource implements ServerResource { // Virtual server methods - private void addVirtualServer(String virtualServerName, LbProtocol protocol, String srcIp, int srcPort, StickinessPolicyTO[] stickyPolicies) throws ExecutionException { + private void addVirtualServer(String virtualServerName, LbProtocol protocol, String srcIp, int srcPort, StickinessPolicyTO[] stickyPolicies) + throws ExecutionException { try { if (!virtualServerExists(virtualServerName)) { s_logger.debug("Adding virtual server " + virtualServerName); @@ -1007,7 +1008,7 @@ public class F5BigIpResource implements ServerResource { private long getFullUsage(long high, long low) { Double full; - Double rollOver = new Double((double)0x7fffffff); + Double rollOver = new Double(0x7fffffff); rollOver = new Double(rollOver.doubleValue() + 1.0); if (high >= 0) { @@ -1020,10 +1021,10 @@ public class F5BigIpResource implements ServerResource { if (low >= 0) { // add low to full and we're good - full = new Double(full.doubleValue() + (double)low); + full = new Double(full.doubleValue() + low); } else { // add full to low after masking off sign bits and adding 1 to the masked off low order value - full = new Double(full.doubleValue() + (double)((low & 0x7fffffff)) + rollOver.doubleValue()); + full = new Double(full.doubleValue() + ((low & 0x7fffffff)) + rollOver.doubleValue()); } return full.longValue(); diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java index 6e768983e6a..fcdbfb75cee 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java @@ -174,8 +174,8 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (!canHandle(network, null)) { s_logger.trace("No need to prepare " + getName()); @@ -198,7 +198,7 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala long active = _appLbDao.countActiveBySourceIp(sourceIp, network.getId()); if (active > 0) { s_logger.debug("Have to implement internal lb vm for source ip " + sourceIp + " as a part of network " + network + " implement as there are " + active + - " internal lb rules exist for this ip"); + " internal lb rules exist for this ip"); List internalLbVms; try { internalLbVms = _internalLbMgr.deployInternalLbVm(network, sourceIp, dest, _accountMgr.getAccount(network.getAccountId()), null); @@ -220,7 +220,8 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -269,7 +270,8 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), Type.InternalLbVm); if (element == null) { return true; @@ -345,7 +347,7 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala //2.3 Apply Internal LB rules on the VM if (!_internalLbMgr.applyLoadBalancingRules(network, rulesToApply.get(sourceIp), internalLbVms)) { throw new CloudRuntimeException("Failed to apply load balancing rules for ip " + sourceIp.addr() + " in network " + network.getId() + " on element " + - getName()); + getName()); } } } @@ -446,7 +448,8 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala public VirtualRouterProvider configureInternalLoadBalancerElement(long id, boolean enable) { VirtualRouterProviderVO element = _vrProviderDao.findById(id); if (element == null || element.getType() != Type.InternalLbVm) { - throw new InvalidParameterValueException("Can't find " + getName() + " element with network service provider id " + id + " to be used as a provider for " + getName()); + throw new InvalidParameterValueException("Can't find " + getName() + " element with network service provider id " + id + " to be used as a provider for " + + getName()); } element.setEnabled(enable); diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java index 537d230d439..4ceb810525b 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java @@ -77,7 +77,6 @@ import com.cloud.network.lb.LoadBalancingRule; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; -import com.cloud.network.lb.LoadBalancingRule.LbSslCert; import com.cloud.network.lb.LoadBalancingRulesManager; import com.cloud.network.router.VirtualNetworkApplianceManager; import com.cloud.network.router.VirtualRouter; @@ -203,7 +202,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In if (dest.getHost().getHypervisorType() == HypervisorType.VMware) { if (s_logger.isInfoEnabled()) { s_logger.info("Check if we need to add management server explicit route to Internal LB. pod cidr: " + dest.getPod().getCidrAddress() + "/" + - dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + _mgmtHost); + dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + _mgmtHost); } if (s_logger.isInfoEnabled()) { @@ -238,7 +237,8 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In } @Override - public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException { + public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) + throws ResourceUnavailableException { DomainRouterVO internalLbVm = _internalLbVmDao.findById(profile.getId()); @@ -376,9 +376,10 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In //if offering wasn't set, try to get the default one if (_internalLbVmOfferingId == 0L) { boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - ServiceOfferingVO newOff = new ServiceOfferingVO("System Offering For Internal LB VM", 1, InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_RAMSIZE, - InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_CPU_MHZ, null, null, true, null, useLocalStorage, true, null, true, VirtualMachine.Type.InternalLoadBalancerVm, - true); + ServiceOfferingVO newOff = + new ServiceOfferingVO("System Offering For Internal LB VM", 1, InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_RAMSIZE, + InternalLoadBalancerVMManager.DEFAULT_INTERNALLB_VM_CPU_MHZ, null, null, true, null, useLocalStorage, true, null, true, + VirtualMachine.Type.InternalLoadBalancerVm, true); newOff.setUniqueName(ServiceOffering.internalLbVmDefaultOffUniqueName); newOff = _serviceOfferingDao.persistSystemServiceOffering(newOff); _internalLbVmOfferingId = newOff.getId(); @@ -459,8 +460,10 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In Network guestNetwork = _ntwkModel.getNetwork(guestNetworkId); Nic guestNic = _nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), internalLbVm.getId()); - NicProfile guestNicProfile = new NicProfile(guestNic, guestNetwork, guestNic.getBroadcastUri(), guestNic.getIsolationUri(), _ntwkModel.getNetworkRate(guestNetwork.getId(), - internalLbVm.getId()), _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(), guestNetwork)); + NicProfile guestNicProfile = + new NicProfile(guestNic, guestNetwork, guestNic.getBroadcastUri(), guestNic.getIsolationUri(), _ntwkModel.getNetworkRate(guestNetwork.getId(), + internalLbVm.getId()), _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(), + guestNetwork)); NetworkOffering offering = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId()); String maxconn = null; @@ -469,8 +472,9 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In } else { maxconn = offering.getConcurrentConnections().toString(); } - LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(), guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), _itMgr.toNicTO( - guestNicProfile, internalLbVm.getHypervisorType()), internalLbVm.getVpcId(), maxconn, offering.isKeepAliveEnabled()); + LoadBalancerConfigCommand cmd = + new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(), guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), _itMgr.toNicTO(guestNicProfile, + internalLbVm.getHypervisorType()), internalLbVm.getVpcId(), maxconn, offering.isKeepAliveEnabled()); cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key()); cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key()); @@ -595,8 +599,8 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In long internalLbProviderId = getInternalLbProviderId(guestNetwork); try { - assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + - guestNetwork; + assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || + guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + guestNetwork; assert guestNetwork.getTrafficType() == TrafficType.Guest; //deploy internal lb vm @@ -611,7 +615,8 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In LinkedHashMap networks = createInternalLbVmNetworks(guestNetwork, plan, requestedGuestIp); //Pass startVm=false as we are holding the network lock that needs to be released at the end of vm allocation - DomainRouterVO internalLbVm = deployInternalLbVm(owner, dest, plan, params, internalLbProviderId, _internalLbVmOfferingId, guestNetwork.getVpcId(), networks, false); + DomainRouterVO internalLbVm = + deployInternalLbVm(owner, dest, plan, params, internalLbProviderId, _internalLbVmOfferingId, guestNetwork.getVpcId(), networks, false); if (internalLbVm != null) { _internalLbVmDao.addRouterToGuestNetwork(internalLbVm, guestNetwork); internalLbVms.add(internalLbVm); @@ -705,9 +710,10 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In return internalLbVms; } - protected DomainRouterVO deployInternalLbVm(Account owner, DeployDestination dest, DeploymentPlan plan, Map params, long internalLbProviderId, long svcOffId, - Long vpcId, LinkedHashMap networks, boolean startVm) throws ConcurrentOperationException, InsufficientAddressCapacityException, - InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, ResourceUnavailableException { + protected DomainRouterVO deployInternalLbVm(Account owner, DeployDestination dest, DeploymentPlan plan, Map params, long internalLbProviderId, + long svcOffId, Long vpcId, LinkedHashMap networks, boolean startVm) throws ConcurrentOperationException, + InsufficientAddressCapacityException, InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, + ResourceUnavailableException { ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(svcOffId); @@ -752,9 +758,10 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In continue; } - internalLbVm = new DomainRouterVO(id, routerOffering.getId(), internalLbProviderId, VirtualMachineName.getSystemVmName(id, _instance, _internalLbVmNamePrefix), - template.getId(), template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false, RedundantState.UNKNOWN, false, - false, VirtualMachine.Type.InternalLoadBalancerVm, vpcId); + internalLbVm = + new DomainRouterVO(id, routerOffering.getId(), internalLbProviderId, VirtualMachineName.getSystemVmName(id, _instance, _internalLbVmNamePrefix), + template.getId(), template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false, + RedundantState.UNKNOWN, false, false, VirtualMachine.Type.InternalLoadBalancerVm, vpcId); internalLbVm.setRole(Role.INTERNAL_LB_VM); internalLbVm = _internalLbVmDao.persist(internalLbVm); _itMgr.allocate(internalLbVm.getInstanceName(), template, routerOffering, networks, plan, null); @@ -777,7 +784,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In } catch (InsufficientCapacityException ex) { if (startRetry < 2 && iter.hasNext()) { s_logger.debug("Failed to start the Internal lb vm " + internalLbVm + " with hypervisor type " + hType + ", " + - "destroying it and recreating one more time"); + "destroying it and recreating one more time"); // destroy the internal lb vm destroyInternalLbVm(internalLbVm.getId(), _accountMgr.getSystemAccount(), User.UID_SYSTEM); continue; @@ -795,8 +802,8 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In return internalLbVm; } - protected DomainRouterVO startInternalLbVm(DomainRouterVO internalLbVm, Account caller, long callerUserId, Map params) throws StorageUnavailableException, - InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { + protected DomainRouterVO startInternalLbVm(DomainRouterVO internalLbVm, Account caller, long callerUserId, Map params) + throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { s_logger.debug("Starting Internal LB VM " + internalLbVm); _itMgr.start(internalLbVm.getUuid(), params, null); if (internalLbVm.isStopPending()) { @@ -829,14 +836,15 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In } if (hypervisors.isEmpty()) { - throw new InsufficientServerCapacityException("Unable to create internal lb vm, " + "there are no clusters in the zone ", DataCenter.class, dest.getDataCenter() - .getId()); + throw new InsufficientServerCapacityException("Unable to create internal lb vm, " + "there are no clusters in the zone ", DataCenter.class, + dest.getDataCenter().getId()); } return hypervisors; } @Override - public boolean applyLoadBalancingRules(Network network, final List rules, List internalLbVms) throws ResourceUnavailableException { + public boolean applyLoadBalancingRules(Network network, final List rules, List internalLbVms) + throws ResourceUnavailableException { if (rules == null || rules.isEmpty()) { s_logger.debug("No lb rules to be applied for network " + network); return true; diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java index d504df9a72f..7bb4db1bb80 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java @@ -23,14 +23,16 @@ import static org.junit.Assert.assertTrue; import javax.inject.Inject; -import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.Type; @@ -84,7 +86,7 @@ public class InternalLbElementServiceTest { Mockito.when(_pNtwkProviderDao.findById(validProviderId)).thenReturn(validProvider); Mockito.when(_pNtwkProviderDao.findById(invalidProviderId)).thenReturn(invalidProvider); - Mockito.when(_vrProviderDao.persist(Mockito.any(VirtualRouterProviderVO.class))).thenReturn(validElement); + Mockito.when(_vrProviderDao.persist(Matchers.any(VirtualRouterProviderVO.class))).thenReturn(validElement); } //TESTS FOR getInternalLoadBalancerElement METHOD diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java index 1757a5159fd..28a78960cdf 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementTest.java @@ -31,6 +31,7 @@ import javax.inject.Inject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -115,10 +116,10 @@ public class InternalLbElementTest { Mockito.when(_pNtwkProviderDao.findById(validProviderId)).thenReturn(validProvider); Mockito.when(_pNtwkProviderDao.findById(invalidProviderId)).thenReturn(invalidProvider); - Mockito.when(_vrProviderDao.persist(Mockito.any(VirtualRouterProviderVO.class))).thenReturn(validElement); + Mockito.when(_vrProviderDao.persist(Matchers.any(VirtualRouterProviderVO.class))).thenReturn(validElement); DataCenterVO dc = new DataCenterVO(1L, null, null, null, null, null, null, null, null, null, NetworkType.Advanced, null, null); - Mockito.when(_entityMgr.findById(Mockito.eq(DataCenter.class), Mockito.anyLong())).thenReturn(dc); + Mockito.when(_entityMgr.findById(Matchers.eq(DataCenter.class), Matchers.anyLong())).thenReturn(dc); } //TEST FOR getProvider() method diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java index fb136431248..f4185860dfc 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java @@ -29,6 +29,7 @@ import junit.framework.TestCase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -116,14 +117,16 @@ public class InternalLBVMManagerTest extends TestCase { public void setUp() { //mock system offering creation as it's used by configure() method called by initComponentsLifeCycle Mockito.when(_accountMgr.getAccount(1L)).thenReturn(new AccountVO()); - ServiceOfferingVO off = new ServiceOfferingVO("alena", 1, 1, 1, 1, 1, false, "alena", false, false, null, false, VirtualMachine.Type.InternalLoadBalancerVm, false); + ServiceOfferingVO off = + new ServiceOfferingVO("alena", 1, 1, 1, 1, 1, false, "alena", false, false, null, false, VirtualMachine.Type.InternalLoadBalancerVm, false); off = setId(off, 1); - Mockito.when(_svcOffDao.persistSystemServiceOffering(Mockito.any(ServiceOfferingVO.class))).thenReturn(off); + Mockito.when(_svcOffDao.persistSystemServiceOffering(Matchers.any(ServiceOfferingVO.class))).thenReturn(off); ComponentContext.initComponentsLifeCycle(); - vm = new DomainRouterVO(1L, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, VirtualMachine.Type.InternalLoadBalancerVm, - null); + vm = + new DomainRouterVO(1L, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, + VirtualMachine.Type.InternalLoadBalancerVm, null); vm.setRole(Role.INTERNAL_LB_VM); vm = setId(vm, 1); vm.setPrivateIpAddress("10.2.2.2"); @@ -145,7 +148,7 @@ public class InternalLBVMManagerTest extends TestCase { answers[0] = answer; try { - Mockito.when(_agentMgr.send(Mockito.anyLong(), Mockito.any(Commands.class))).thenReturn(answers); + Mockito.when(_agentMgr.send(Matchers.anyLong(), Matchers.any(Commands.class))).thenReturn(answers); } catch (AgentUnavailableException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -155,15 +158,15 @@ public class InternalLBVMManagerTest extends TestCase { } createNetwork(); - Mockito.when(_ntwkModel.getNetwork(Mockito.anyLong())).thenReturn(ntwk); + Mockito.when(_ntwkModel.getNetwork(Matchers.anyLong())).thenReturn(ntwk); - Mockito.when(_itMgr.toNicTO(Mockito.any(NicProfile.class), Mockito.any(HypervisorType.class))).thenReturn(null); - Mockito.when(_domainRouterDao.findById(Mockito.anyLong())).thenReturn(vm); + Mockito.when(_itMgr.toNicTO(Matchers.any(NicProfile.class), Matchers.any(HypervisorType.class))).thenReturn(null); + Mockito.when(_domainRouterDao.findById(Matchers.anyLong())).thenReturn(vm); DataCenterVO dc = new DataCenterVO(1L, null, null, null, null, null, null, null, null, null, NetworkType.Advanced, null, null); - Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dc); + Mockito.when(_dcDao.findById(Matchers.anyLong())).thenReturn(dc); NetworkOfferingVO networkOfferingVO = new NetworkOfferingVO(); networkOfferingVO.setConcurrentConnections(500); - Mockito.when(_offeringDao.findById(Mockito.anyLong())).thenReturn(networkOfferingVO); + Mockito.when(_offeringDao.findById(Matchers.anyLong())).thenReturn(networkOfferingVO); Mockito.when(_domainRouterDao.findById(validVmId)).thenReturn(vm); Mockito.when(_domainRouterDao.findById(invalidVmId)).thenReturn(null); diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java index 80887099925..62ca09b9c76 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java @@ -26,6 +26,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -86,22 +87,25 @@ public class InternalLBVMServiceTest extends TestCase { public void setUp() { //mock system offering creation as it's used by configure() method called by initComponentsLifeCycle Mockito.when(_accountMgr.getAccount(1L)).thenReturn(new AccountVO()); - ServiceOfferingVO off = new ServiceOfferingVO("alena", 1, 1, 1, 1, 1, false, "alena", false, false, null, false, VirtualMachine.Type.InternalLoadBalancerVm, false); + ServiceOfferingVO off = + new ServiceOfferingVO("alena", 1, 1, 1, 1, 1, false, "alena", false, false, null, false, VirtualMachine.Type.InternalLoadBalancerVm, false); off = setId(off, 1); - Mockito.when(_svcOffDao.persistSystemServiceOffering(Mockito.any(ServiceOfferingVO.class))).thenReturn(off); + Mockito.when(_svcOffDao.persistSystemServiceOffering(Matchers.any(ServiceOfferingVO.class))).thenReturn(off); ComponentContext.initComponentsLifeCycle(); Mockito.when(_accountMgr.getSystemUser()).thenReturn(new UserVO(1)); Mockito.when(_accountMgr.getSystemAccount()).thenReturn(new AccountVO(2)); - Mockito.when(_accountDao.findByIdIncludingRemoved(Mockito.anyLong())).thenReturn(new AccountVO(2)); + Mockito.when(_accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(new AccountVO(2)); CallContext.register(_accountMgr.getSystemUser(), _accountMgr.getSystemAccount()); - DomainRouterVO validVm = new DomainRouterVO(validVmId, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, - VirtualMachine.Type.InternalLoadBalancerVm, null); + DomainRouterVO validVm = + new DomainRouterVO(validVmId, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, + VirtualMachine.Type.InternalLoadBalancerVm, null); validVm.setRole(Role.INTERNAL_LB_VM); - DomainRouterVO nonInternalLbVm = new DomainRouterVO(validVmId, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, - VirtualMachine.Type.DomainRouter, null); + DomainRouterVO nonInternalLbVm = + new DomainRouterVO(validVmId, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, false, 0, false, null, false, false, + VirtualMachine.Type.DomainRouter, null); nonInternalLbVm.setRole(Role.VIRTUAL_ROUTER); Mockito.when(_domainRouterDao.findById(validVmId)).thenReturn(validVm); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java index 7c7ab8f019f..50457d8f7c7 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java @@ -19,10 +19,6 @@ package org.apache.cloudstack.network.contrail.api.command; import javax.inject.Inject; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.network.contrail.api.response.ServiceInstanceResponse; -import org.apache.cloudstack.network.contrail.management.ServiceManager; -import org.apache.cloudstack.network.contrail.management.ServiceVirtualMachine; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -35,6 +31,10 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.ZoneResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.network.contrail.api.response.ServiceInstanceResponse; +import org.apache.cloudstack.network.contrail.management.ServiceManager; +import org.apache.cloudstack.network.contrail.management.ServiceVirtualMachine; import com.cloud.dc.DataCenter; import com.cloud.event.EventTypes; @@ -50,51 +50,67 @@ import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; @APICommand(name = "createServiceInstance", - description="Creates a system virtual-machine that implements network services", - responseObject=ServiceInstanceResponse.class) + description = "Creates a system virtual-machine that implements network services", + responseObject = ServiceInstanceResponse.class) public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { private static final String s_name = "createserviceinstanceresponse"; /// API parameters - @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, - required = true, description = "Availability zone for the service instance") + @Parameter(name = ApiConstants.ZONE_ID, + type = CommandType.UUID, + entityType = ZoneResponse.class, + required = true, + description = "Availability zone for the service instance") private Long zoneId; //Owner information - @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, - description="An optional account for the virtual machine. Must be used with domainId.") + @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "An optional account for the virtual machine. Must be used with domainId.") private String accountName; - @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.UUID, entityType=DomainResponse.class, - description="An optional domainId for the virtual machine. If the account parameter is used, domainId must also be used.") + @Parameter(name = ApiConstants.DOMAIN_ID, + type = CommandType.UUID, + entityType = DomainResponse.class, + description = "An optional domainId for the virtual machine. If the account parameter is used, domainId must also be used.") private Long domainId; - @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, - description = "Project ID for the service instance") + @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Project ID for the service instance") private Long projectId; - @Parameter(name = "leftnetworkid", type = CommandType.UUID, entityType = NetworkResponse.class, - required = true, description = "The left (inside) network for service instance") + @Parameter(name = "leftnetworkid", + type = CommandType.UUID, + entityType = NetworkResponse.class, + required = true, + description = "The left (inside) network for service instance") private Long leftNetworkId; - @Parameter(name = "rightnetworkid", type = CommandType.UUID, entityType = NetworkResponse.class, - required = true, description = "The right (outside) network ID for the service instance") + @Parameter(name = "rightnetworkid", + type = CommandType.UUID, + entityType = NetworkResponse.class, + required = true, + description = "The right (outside) network ID for the service instance") private Long rightNetworkId; - @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, - required = true, description = "The template ID that specifies the image for the service appliance") + @Parameter(name = ApiConstants.TEMPLATE_ID, + type = CommandType.UUID, + entityType = TemplateResponse.class, + required = true, + description = "The template ID that specifies the image for the service appliance") private Long templateId; - @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, - entityType = ServiceOfferingResponse.class, required = true, - description = "The service offering ID that defines the resources consumed by the service appliance") + @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, + type = CommandType.UUID, + entityType = ServiceOfferingResponse.class, + required = true, + description = "The service offering ID that defines the resources consumed by the service appliance") private Long serviceOfferingId; @Parameter(name = ApiConstants.NAME, type = CommandType.STRING) private String name; /// Implementation - @Inject ServiceManager _vrouterService; + @Inject + ServiceManager _vrouterService; + @Override public void create() throws ResourceAllocationException { // Parameter validation @@ -126,8 +142,7 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { throw new InvalidParameterValueException("Invalid ID for right network " + rightNetworkId); } - ServiceVirtualMachine svm = _vrouterService.createServiceInstance(zone, owner, template, serviceOffering, - name, left, right); + ServiceVirtualMachine svm = _vrouterService.createServiceInstance(zone, owner, template, serviceOffering, name, left, right); if (svm == null) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Unable to create service instance"); } @@ -149,10 +164,8 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { } @Override - public void execute() throws ResourceUnavailableException, - InsufficientCapacityException, ServerApiException, - ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { _vrouterService.startServiceInstance(getEntityId()); ServiceInstanceResponse response = _vrouterService.createServiceInstanceResponse(getEntityId()); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java index 95e85f1518b..00eb7f3098b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java @@ -17,38 +17,46 @@ package org.apache.cloudstack.network.contrail.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.response.ControlledEntityResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; -public class ServiceInstanceResponse extends BaseResponse implements - ControlledEntityResponse { +public class ServiceInstanceResponse extends BaseResponse implements ControlledEntityResponse { - @SerializedName(ApiConstants.ID) @Param(description="the ID of the virtual machine") + @SerializedName(ApiConstants.ID) + @Param(description = "the ID of the virtual machine") private String id; - @SerializedName(ApiConstants.NAME) @Param(description="the name of the virtual machine") + @SerializedName(ApiConstants.NAME) + @Param(description = "the name of the virtual machine") private String name; - @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.") + @SerializedName("displayname") + @Param(description = "user generated name. The name of the virtual machine is returned if no displayname exists.") private String displayName; - @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the virtual machine") + @SerializedName(ApiConstants.ACCOUNT) + @Param(description = "the account associated with the virtual machine") private String accountName; - @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vm") + @SerializedName(ApiConstants.PROJECT_ID) + @Param(description = "the project id of the vm") private String projectId; - @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm") + @SerializedName(ApiConstants.PROJECT) + @Param(description = "the project name of the vm") private String projectName; - @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain in which the virtual machine exists") + @SerializedName(ApiConstants.DOMAIN_ID) + @Param(description = "the ID of the domain in which the virtual machine exists") private String domainId; - @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain in which the virtual machine exists") + @SerializedName(ApiConstants.DOMAIN) + @Param(description = "the name of the domain in which the virtual machine exists") private String domainName; public void setId(String id) { diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java index 9e610112b32..e6a06969ecf 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java @@ -28,18 +28,20 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.network.contrail.api.command.CreateServiceInstanceCmd; import org.apache.cloudstack.network.contrail.model.InstanceIpModel; import org.apache.cloudstack.network.contrail.model.VMInterfaceModel; import org.apache.cloudstack.network.contrail.model.VirtualMachineModel; import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; @@ -47,40 +49,31 @@ import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PublicIpAddress; -import com.cloud.network.element.DhcpServiceProvider; import com.cloud.network.element.IpDeployer; -import com.cloud.network.element.NetworkACLServiceProvider; -import com.cloud.network.element.SourceNatServiceProvider; import com.cloud.network.element.StaticNatServiceProvider; -import com.cloud.network.element.VpcProvider; import com.cloud.network.rules.StaticNat; -import com.cloud.network.vpc.NetworkACLItem; -import com.cloud.network.vpc.PrivateGateway; -import com.cloud.network.vpc.StaticRouteProfile; -import com.cloud.network.vpc.Vpc; import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.NicProfile; import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -import com.cloud.network.IpAddress; @Component @Local(value = {ContrailElement.class, StaticNatServiceProvider.class}) -public class ContrailElementImpl extends AdapterBase - implements ContrailElement, IpDeployer, StaticNatServiceProvider { +public class ContrailElementImpl extends AdapterBase implements ContrailElement, IpDeployer, StaticNatServiceProvider { private static final Map> _capabilities = InitCapabilities(); - @Inject ContrailManager _manager; - @Inject NicDao _nicDao; - @Inject ServerDBSync _dbSync; - private static final Logger s_logger = - Logger.getLogger(ContrailElement.class); + @Inject + ContrailManager _manager; + @Inject + NicDao _nicDao; + @Inject + ServerDBSync _dbSync; + private static final Logger s_logger = Logger.getLogger(ContrailElement.class); @Override public boolean configure(String name, Map params) throws ConfigurationException { @@ -121,21 +114,17 @@ public class ContrailElementImpl extends AdapterBase * Network add/update. */ @Override - public boolean implement(Network network, NetworkOffering offering, - DeployDestination dest, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { s_logger.debug("NetworkElement implement: " + network.getName() + ", traffic type: " + network.getTrafficType()); if (network.getTrafficType() == TrafficType.Guest) { s_logger.debug("ignore network " + network.getName()); return true; } - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), - _manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { - vnModel = new VirtualNetworkModel(network, network.getUuid(), - _manager.getCanonicalName(network), network.getTrafficType()); + vnModel = new VirtualNetworkModel(network, network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); vnModel.setProperties(_manager.getModelController(), network); } try { @@ -150,11 +139,8 @@ public class ContrailElementImpl extends AdapterBase } @Override - public boolean prepare(Network network, NicProfile nicProfile, - VirtualMachineProfile vm, - DeployDestination dest, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nicProfile, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { s_logger.debug("NetworkElement prepare: " + network.getName() + ", traffic type: " + network.getTrafficType()); @@ -165,8 +151,7 @@ public class ContrailElementImpl extends AdapterBase s_logger.debug("network: " + network.getId()); - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), - _manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { // There is no notification after a physical network is associated with the VRouter NetworkOffering @@ -176,7 +161,7 @@ public class ContrailElementImpl extends AdapterBase VirtualMachineModel vmModel = _manager.getDatabase().lookupVirtualMachine(vm.getUuid()); if (vmModel == null) { - VMInstanceVO vmVo = (VMInstanceVO) vm.getVirtualMachine(); + VMInstanceVO vmVo = (VMInstanceVO)vm.getVirtualMachine(); vmModel = new VirtualMachineModel(vmVo, vm.getUuid()); vmModel.setProperties(_manager.getModelController(), vmVo); } @@ -188,11 +173,11 @@ public class ContrailElementImpl extends AdapterBase if (vmiModel == null) { vmiModel = new VMInterfaceModel(nic.getUuid()); vmiModel.addToVirtualMachine(vmModel); - vmiModel.addToVirtualNetwork(vnModel); + vmiModel.addToVirtualNetwork(vnModel); } try { - vmiModel.build(_manager.getModelController(), (VMInstanceVO) vm.getVirtualMachine(), nic); + vmiModel.build(_manager.getModelController(), (VMInstanceVO)vm.getVirtualMachine(), nic); } catch (IOException ex) { s_logger.warn("vm interface set", ex); return false; @@ -217,10 +202,8 @@ public class ContrailElementImpl extends AdapterBase } @Override - public boolean release(Network network, NicProfile nicProfile, - VirtualMachineProfile vm, - ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException { + public boolean release(Network network, NicProfile nicProfile, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { if (network.getTrafficType() == TrafficType.Guest) { return true; } else if (!_manager.isManagedPhysicalNetwork(network)) { @@ -262,9 +245,7 @@ public class ContrailElementImpl extends AdapterBase * Network disable */ @Override - public boolean shutdown(Network network, ReservationContext context, - boolean cleanup) throws ConcurrentOperationException, - ResourceUnavailableException { + public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException { s_logger.debug("NetworkElement shutdown"); return true; } @@ -273,8 +254,7 @@ public class ContrailElementImpl extends AdapterBase * Network delete */ @Override - public boolean destroy(Network network, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException { + public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { s_logger.debug("NetworkElement destroy"); return true; } @@ -285,9 +265,8 @@ public class ContrailElementImpl extends AdapterBase } @Override - public boolean shutdownProviderInstances( - PhysicalNetworkServiceProvider provider, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { s_logger.debug("NetworkElement shutdown ProviderInstances"); return true; } @@ -305,18 +284,15 @@ public class ContrailElementImpl extends AdapterBase return true; } - @Override public IpDeployer getIpDeployer(Network network) { - return this; + return this; } @Override - public boolean applyIps(Network network, - List ipAddress, Set services) - throws ResourceUnavailableException { + public boolean applyIps(Network network, List ipAddress, Set services) throws ResourceUnavailableException { - for (PublicIpAddress ip: ipAddress) { + for (PublicIpAddress ip : ipAddress) { if (ip.isSourceNat()) { continue; } @@ -334,9 +310,7 @@ public class ContrailElementImpl extends AdapterBase } @Override - public boolean applyStaticNats(Network config, - List rules) - throws ResourceUnavailableException { + public boolean applyStaticNats(Network config, List rules) throws ResourceUnavailableException { return true; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java index a1ef8fdeec6..ea52be9d912 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java @@ -17,7 +17,6 @@ package org.apache.cloudstack.network.contrail.management; - import java.io.IOException; import javax.inject.Inject; @@ -25,12 +24,13 @@ import javax.inject.Inject; import net.juniper.contrail.api.types.MacAddressesType; import net.juniper.contrail.api.types.VirtualMachineInterface; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.network.contrail.model.InstanceIpModel; import org.apache.cloudstack.network.contrail.model.VMInterfaceModel; import org.apache.cloudstack.network.contrail.model.VirtualMachineModel; import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; @@ -54,18 +54,20 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.Nic.ReservationStrategy; import com.cloud.vm.NicProfile; +import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -import com.cloud.vm.NicVO; @Component public class ContrailGuru extends AdapterBase implements NetworkGuru { - @Inject NetworkDao _networkDao; - @Inject ContrailManager _manager; - @Inject NicDao _nicDao; + @Inject + NetworkDao _networkDao; + @Inject + ContrailManager _manager; + @Inject + NicDao _nicDao; private static final Logger s_logger = Logger.getLogger(ContrailGuru.class); private static final TrafficType[] _trafficTypes = {TrafficType.Guest}; @@ -76,37 +78,33 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { @Override public String getName() { - return "ContrailGuru"; + return "ContrailGuru"; } @Override - public Network design(NetworkOffering offering, DeploymentPlan plan, - Network userSpecified, Account owner) { + public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) { if (!canHandle(offering)) { return null; } - NetworkVO network = new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Lswitch, - offering.getId(), State.Allocated, plan.getDataCenterId(), plan.getPhysicalNetworkId()); + NetworkVO network = + new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Lswitch, offering.getId(), State.Allocated, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); if (userSpecified.getCidr() != null) { network.setCidr(userSpecified.getCidr()); network.setGateway(userSpecified.getGateway()); } - s_logger.debug("Allocated network " + userSpecified.getName() + - (network.getCidr() == null ? "" : " subnet: " + network.getCidr())); + s_logger.debug("Allocated network " + userSpecified.getName() + (network.getCidr() == null ? "" : " subnet: " + network.getCidr())); return network; } @Override - public Network implement(Network network, NetworkOffering offering, - DeployDestination destination, ReservationContext context) - throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { s_logger.debug("Implement network: " + network.getName() + ", traffic type: " + network.getTrafficType()); - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork( - network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { - vnModel = new VirtualNetworkModel(network, network.getUuid(), - _manager.getCanonicalName(network), network.getTrafficType()); + vnModel = new VirtualNetworkModel(network, network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); vnModel.setProperties(_manager.getModelController(), network); } @@ -128,10 +126,8 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { * until the reserve API is called because of this reason. */ @Override - public NicProfile allocate(Network network, NicProfile profile, - VirtualMachineProfile vm) - throws InsufficientVirtualNetworkCapcityException, - InsufficientAddressCapacityException, ConcurrentOperationException { + public NicProfile allocate(Network network, NicProfile profile, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException { s_logger.debug("allocate NicProfile on " + network.getName()); if (profile != null && profile.getRequestedIpv4() != null) { @@ -150,26 +146,21 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { * Allocate the ip address (and mac) for the specified VM device. */ @Override - public void reserve(NicProfile nic, Network network, - VirtualMachineProfile vm, - DeployDestination dest, ReservationContext context) - throws InsufficientVirtualNetworkCapcityException, - InsufficientAddressCapacityException, ConcurrentOperationException { - s_logger.debug("reserve NicProfile on network id: " + network.getId() + - " " + network.getName()); + public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException { + s_logger.debug("reserve NicProfile on network id: " + network.getId() + " " + network.getName()); s_logger.debug("deviceId: " + nic.getDeviceId()); NicVO nicVO = _nicDao.findById(nic.getId()); assert nicVO != null; - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork( - network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); /* Network must have been implemented */ assert vnModel != null; VirtualMachineModel vmModel = _manager.getDatabase().lookupVirtualMachine(vm.getUuid()); if (vmModel == null) { - VMInstanceVO vmVo = (VMInstanceVO) vm.getVirtualMachine(); + VMInstanceVO vmVo = (VMInstanceVO)vm.getVirtualMachine(); vmModel = new VirtualMachineModel(vmVo, vm.getUuid()); vmModel.setProperties(_manager.getModelController(), vmVo); } @@ -181,7 +172,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { vmiModel.addToVirtualNetwork(vnModel); } try { - vmiModel.build(_manager.getModelController(), (VMInstanceVO) vm.getVirtualMachine(), nicVO); + vmiModel.build(_manager.getModelController(), (VMInstanceVO)vm.getVirtualMachine(), nicVO); vmiModel.setActive(); } catch (IOException ex) { s_logger.error("virtual-machine-interface set", ex); @@ -196,7 +187,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { s_logger.debug("Reuse existing instance-ip object on " + ipModel.getName()); } if (nic.getIp4Address() != null) { - s_logger.debug("Nic using existing IP address " + nic.getIp4Address()); + s_logger.debug("Nic using existing IP address " + nic.getIp4Address()); ipModel.setAddress(nic.getIp4Address()); } @@ -216,8 +207,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { if (macs == null) { s_logger.debug("no mac address is allocated for Nic " + nicVO.getUuid()); } else { - s_logger.info("VMI " + _manager.getVifNameByVmUuid(vm.getUuid(), nicVO.getDeviceId()) + " got mac address: " + - macs.getMacAddress().get(0)); + s_logger.info("VMI " + _manager.getVifNameByVmUuid(vm.getUuid(), nicVO.getDeviceId()) + " got mac address: " + macs.getMacAddress().get(0)); nic.setMacAddress(macs.getMacAddress().get(0)); } } @@ -235,9 +225,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { * When a VM is stopped this API is called to release transient resources. */ @Override - public boolean release(NicProfile nic, - VirtualMachineProfile vm, - String reservationId) { + public boolean release(NicProfile nic, VirtualMachineProfile vm, String reservationId) { s_logger.debug("release NicProfile " + nic.getId()); @@ -248,8 +236,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { * Release permanent resources of a Nic (VMI and addresses). */ @Override - public void deallocate(Network network, NicProfile nic, - VirtualMachineProfile vm) { + public void deallocate(Network network, NicProfile nic, VirtualMachineProfile vm) { s_logger.debug("deallocate NicProfile " + nic.getId() + " on " + network.getName()); NicVO nicVO = _nicDao.findById(nic.getId()); assert nicVO != null; @@ -288,10 +275,9 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { } @Override - public void shutdown(NetworkProfile network, NetworkOffering offering) { + public void shutdown(NetworkProfile network, NetworkOffering offering) { s_logger.debug("NetworkGuru shutdown"); - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), - _manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { return; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java index ff82b703e21..98b02b8f96c 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java @@ -17,24 +17,24 @@ package org.apache.cloudstack.network.contrail.management; -import java.util.List; import java.io.IOException; - -import org.apache.cloudstack.network.contrail.model.ModelController; -import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; +import java.util.List; import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.types.FloatingIp; import net.juniper.contrail.api.types.VirtualNetwork; +import org.apache.cloudstack.network.contrail.model.ModelController; +import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; + +import com.cloud.domain.DomainVO; import com.cloud.network.Network; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PublicIpAddress; -import com.cloud.offering.NetworkOffering; import com.cloud.network.dao.IPAddressVO; -import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.dao.NetworkVO; -import com.cloud.domain.DomainVO; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.offering.NetworkOffering; import com.cloud.projects.ProjectVO; public interface ContrailManager { @@ -46,6 +46,7 @@ public interface ContrailManager { public static final String managementNetworkName = "ip-fabric"; public NetworkOffering getOffering(); + public void syncNetworkDB(short syncMode) throws IOException; public boolean isManagedPhysicalNetwork(Network network); @@ -57,37 +58,64 @@ public interface ContrailManager { * specified CloudStack network. */ public String findVirtualNetworkId(Network net) throws IOException; + public void findInfrastructureNetworks(PhysicalNetworkVO phys, List dbList); + public String getPhysicalNetworkName(PhysicalNetworkVO phys_net); + public String getCanonicalName(Network net); + public String getDomainCanonicalName(DomainVO domain); + public String getProjectCanonicalName(ProjectVO project); + public String getFQN(Network net); + public String getDomainName(long domainId); + public String getProjectName(long accountId); + public String getDefaultPublicNetworkFQN(); + public String getProjectId(long domainId, long accountId) throws IOException; + public net.juniper.contrail.api.types.Project getVncProject(long domainId, long accountId) throws IOException; + public boolean isSystemRootDomain(net.juniper.contrail.api.types.Domain vnc); + public boolean isSystemRootDomain(DomainVO domain); + public boolean isSystemDefaultProject(net.juniper.contrail.api.types.Project project); + public boolean isSystemDefaultProject(ProjectVO project); + public boolean isSystemDefaultNetwork(VirtualNetwork vnet); + public boolean isSystemDefaultNetwork(NetworkVO dbNet); + public String getVifNameByVmName(String vm_name, Integer device_id); + public String getVifNameByVmUuid(String vm_uuid, Integer device_id); public ApiConnector getApiConnector(); + public ModelDatabase getDatabase(); + public ModelController getModelController(); + public List findJuniperManagedNetworks(List types); + public List findJuniperManagedPublicIps(); - public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType) - throws IOException; + + public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType) throws IOException; + public List getFloatingIps(); + public VirtualNetworkModel lookupPublicNetworkModel(); + public void createPublicNetworks(); + public boolean createFloatingIp(PublicIpAddress ip); + public boolean deleteFloatingIp(PublicIpAddress ip); } - diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java index df21db405e8..abf2dd09b24 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.network.contrail.management; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +27,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.Timer; import java.util.TimerTask; @@ -40,13 +43,16 @@ import net.juniper.contrail.api.types.FloatingIp; import net.juniper.contrail.api.types.FloatingIpPool; import net.juniper.contrail.api.types.VirtualNetwork; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.google.common.collect.ImmutableList; + import org.apache.cloudstack.network.contrail.model.FloatingIpModel; import org.apache.cloudstack.network.contrail.model.FloatingIpPoolModel; import org.apache.cloudstack.network.contrail.model.ModelController; import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationService; @@ -57,9 +63,6 @@ import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.exception.InternalErrorException; -import com.cloud.projects.ProjectVO; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.Account; import com.cloud.network.Network; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; @@ -72,49 +75,61 @@ import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.offering.NetworkOffering.State; import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.Availability; +import com.cloud.offering.NetworkOffering.State; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; +import com.cloud.projects.ProjectVO; import com.cloud.projects.dao.ProjectDao; +import com.cloud.user.Account; +import com.cloud.user.dao.AccountDao; +import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import com.google.common.collect.ImmutableList; - -import java.util.Properties; - -import com.cloud.utils.PropertiesUtil; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import java.io.File; -import java.io.FileInputStream; - @Component public class ContrailManagerImpl extends ManagerBase implements ContrailManager { - @Inject public ConfigurationService _configService; - @Inject NetworkOfferingDao _networkOfferingDao; + @Inject + public ConfigurationService _configService; + @Inject + NetworkOfferingDao _networkOfferingDao; - @Inject DomainDao _domainDao; - @Inject NetworkDao _networksDao; - @Inject VMInstanceDao _vmInstanceDao; - @Inject ProjectDao _projectDao; - @Inject AccountDao _accountDao; - @Inject DataCenterDao _dcDao; - @Inject PhysicalNetworkDao _physicalNetworkDao; - @Inject PhysicalNetworkServiceProviderDao _physProviderDao; - @Inject NicDao _nicDao; - @Inject ServerDBSync _dbSync; - @Inject ServerEventHandler _eventHandler; - @Inject IPAddressDao _ipAddressDao; - @Inject VlanDao _vlanDao; - @Inject UserVmDao _vmDao; + @Inject + DomainDao _domainDao; + @Inject + NetworkDao _networksDao; + @Inject + VMInstanceDao _vmInstanceDao; + @Inject + ProjectDao _projectDao; + @Inject + AccountDao _accountDao; + @Inject + DataCenterDao _dcDao; + @Inject + PhysicalNetworkDao _physicalNetworkDao; + @Inject + PhysicalNetworkServiceProviderDao _physProviderDao; + @Inject + NicDao _nicDao; + @Inject + ServerDBSync _dbSync; + @Inject + ServerEventHandler _eventHandler; + @Inject + IPAddressDao _ipAddressDao; + @Inject + VlanDao _vlanDao; + @Inject + UserVmDao _vmDao; private static final Logger s_logger = Logger.getLogger(ContrailManager.class); @@ -122,7 +137,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager private NetworkOffering _offering; private Timer _dbSyncTimer; - private int _dbSyncInterval = DB_SYNC_INTERVAL_DEFAULT; + private int _dbSyncInterval = DB_SYNC_INTERVAL_DEFAULT; private final String configuration = "contrail.properties"; private ModelDatabase _database; private ModelController _controller; @@ -144,19 +159,21 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } return true; } + @Override public boolean stop() { - _dbSyncTimer.cancel(); - return true; + _dbSyncTimer.cancel(); + return true; } + @Override public ModelDatabase getDatabase() { return _database; } private NetworkOffering LocateOffering() { List offerList = _configService.listNetworkOfferings(TrafficType.Guest, false); - for (NetworkOffering offer: offerList) { + for (NetworkOffering offer : offerList) { if (offer.getName().equals(offeringName)) { if (offer.getState() != State.Enabled) { return EnableNetworkOffering(offer.getId()); @@ -168,19 +185,13 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager // Map> serviceCapabilityMap = new HashMap>(); Set providerSet = new HashSet(); providerSet.add(Provider.JuniperContrail); - final Service[] services = { - Service.Connectivity, - Service.Dhcp, - Service.NetworkACL, - Service.StaticNat, - Service.SourceNat - }; - for (Service svc: services) { + final Service[] services = {Service.Connectivity, Service.Dhcp, Service.NetworkACL, Service.StaticNat, Service.SourceNat}; + for (Service svc : services) { serviceProviderMap.put(svc, providerSet); } - ConfigurationManager configMgr = (ConfigurationManager) _configService; - NetworkOfferingVO voffer = configMgr.createNetworkOffering(offeringName, offeringDisplayText, - TrafficType.Guest, null, false, Availability.Optional, null, serviceProviderMap, true, + ConfigurationManager configMgr = (ConfigurationManager)_configService; + NetworkOfferingVO voffer = + configMgr.createNetworkOffering(offeringName, offeringDisplayText, TrafficType.Guest, null, false, Availability.Optional, null, serviceProviderMap, true, Network.GuestType.Isolated, false, null, false, null, false, true, null, true, null, false); voffer.setState(State.Enabled); @@ -318,8 +329,8 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } DomainVO domain = _domainDao.findById(domainId); if (domain.getId() != Domain.ROOT_DOMAIN) { - net.juniper.contrail.api.types.Domain vncDomain = (net.juniper.contrail.api.types.Domain) - _api.findById(net.juniper.contrail.api.types.Domain.class, domain.getUuid()); + net.juniper.contrail.api.types.Domain vncDomain = + (net.juniper.contrail.api.types.Domain)_api.findById(net.juniper.contrail.api.types.Domain.class, domain.getUuid()); return _api.findByName(net.juniper.contrail.api.types.Project.class, vncDomain, VNC_DEFAULT_PROJECT); } return null; @@ -331,8 +342,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager if (projectId == null) { return null; } - return (net.juniper.contrail.api.types.Project) - _api.findById(net.juniper.contrail.api.types.Project.class, projectId); + return (net.juniper.contrail.api.types.Project)_api.findById(net.juniper.contrail.api.types.Project.class, projectId); } @Override @@ -343,13 +353,12 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager return fqname + getCanonicalName(net); } + @Override public void findInfrastructureNetworks(PhysicalNetworkVO phys, List dbList) { - final TrafficType[] ttypes = { - TrafficType.Control, // maps to __link_local__ - TrafficType.Management, // maps to ip-fabric - TrafficType.Public, - TrafficType.Storage // maps to ip-fabric - }; + final TrafficType[] ttypes = {TrafficType.Control, // maps to __link_local__ + TrafficType.Management, // maps to ip-fabric + TrafficType.Public, TrafficType.Storage // maps to ip-fabric + }; for (int i = 0; i < ttypes.length; i++) { List phys_nets; @@ -359,13 +368,14 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } + @Override public void syncNetworkDB(short syncMode) throws IOException { if (_dbSync.syncAll(syncMode) == ServerDBSync.SYNC_STATE_OUT_OF_SYNC) { - if (syncMode == DBSyncGeneric.SYNC_MODE_CHECK) { + if (syncMode == DBSyncGeneric.SYNC_MODE_CHECK) { s_logger.info("# Cloudstack DB & VNC are out of sync #"); - } else { + } else { s_logger.info("# Cloudstack DB & VNC were out of sync, performed re-sync operation #"); - } + } } else { s_logger.info("# Cloudstack DB & VNC are in sync #"); } @@ -373,6 +383,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager public class DBSyncTask extends TimerTask { private short _syncMode = DBSyncGeneric.SYNC_MODE_UPDATE; + @Override public void run() { try { @@ -387,18 +398,18 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } } - @Override public boolean isManagedPhysicalNetwork(Network network) { List net_list = _physicalNetworkDao.listByZone(network.getDataCenterId()); for (PhysicalNetworkVO phys : net_list) { - if(_physProviderDao.findByServiceProvider(phys.getId(), Network.Provider.JuniperContrail.getName()) != null) { + if (_physProviderDao.findByServiceProvider(phys.getId(), Network.Provider.JuniperContrail.getName()) != null) { return true; } } return false; } + @Override public String findVirtualNetworkId(Network net) throws IOException { if (net.getTrafficType() == TrafficType.Guest) { return net.getUuid(); @@ -418,8 +429,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Override public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType) throws IOException { - if (trafficType == TrafficType.Guest || - trafficType == TrafficType.Public) { + if (trafficType == TrafficType.Guest || trafficType == TrafficType.Public) { return null; } String netname = VNC_ROOT_DOMAIN + ":" + VNC_DEFAULT_PROJECT + ":"; @@ -462,17 +472,17 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager List phys_list = _physicalNetworkDao.listAll(); final String provider = Network.Provider.JuniperContrail.getName(); - for (Iterator iter = phys_list.iterator(); iter.hasNext(); ) { + for (Iterator iter = phys_list.iterator(); iter.hasNext();) { PhysicalNetworkVO phys = iter.next(); if (_physProviderDao.findByServiceProvider(phys.getId(), provider) != null) { List infraNets = new ArrayList(); findInfrastructureNetworks(phys, infraNets); - for (NetworkVO net:infraNets) { + for (NetworkVO net : infraNets) { if (types == null || types.isEmpty()) { dbNets.add(net); continue; } - for(TrafficType type:types) { + for (TrafficType type : types) { if (net.getTrafficType() == type) { dbNets.add(net); break; @@ -504,7 +514,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager searchBuilder.and("associatedWithVmId", searchBuilder.entity().getAssociatedWithVmId(), Op.NNULL); List netIds = new ArrayList(); - for (NetworkVO net:dbNets) { + for (NetworkVO net : dbNets) { netIds.add(net.getId()); } @@ -529,7 +539,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager types.add(TrafficType.Control); List dbNets = findJuniperManagedNetworks(types); - for (NetworkVO net:dbNets) { + for (NetworkVO net : dbNets) { VirtualNetworkModel vnModel = getDatabase().lookupVirtualNetwork(null, getCanonicalName(net), net.getTrafficType()); if (vnModel == null) { @@ -573,8 +583,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Override public boolean isSystemDefaultNetwork(NetworkVO net) { - if (net.getTrafficType() == TrafficType.Management || net.getTrafficType() == TrafficType.Storage - || net.getTrafficType() == TrafficType.Control) { + if (net.getTrafficType() == TrafficType.Management || net.getTrafficType() == TrafficType.Storage || net.getTrafficType() == TrafficType.Control) { return true; } return false; @@ -590,8 +599,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Override public boolean isSystemRootDomain(DomainVO domain) { - if (domain.getId() == Domain.ROOT_DOMAIN || domain.getName().compareTo("ROOT") == 0 || - domain.getParent() == null) { + if (domain.getId() == Domain.ROOT_DOMAIN || domain.getName().compareTo("ROOT") == 0 || domain.getParent() == null) { return true; } return false; @@ -635,6 +643,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager return _api; } + @Override public VirtualNetworkModel lookupPublicNetworkModel() { List types = new ArrayList(); types.add(TrafficType.Public); @@ -655,9 +664,8 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager if (dbNets == null) { return; } - for (NetworkVO net: dbNets) { - VirtualNetworkModel vnModel = _database.lookupVirtualNetwork(net.getUuid(), getCanonicalName(net), - TrafficType.Public); + for (NetworkVO net : dbNets) { + VirtualNetworkModel vnModel = _database.lookupVirtualNetwork(net.getUuid(), getCanonicalName(net), TrafficType.Public); if (vnModel != null) { continue; } @@ -681,6 +689,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } } + @Override public boolean createFloatingIp(PublicIpAddress ip) { VirtualNetworkModel vnModel = lookupPublicNetworkModel(); assert vnModel != null : "public network vn model is null"; @@ -716,6 +725,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager return true; } + @Override public boolean deleteFloatingIp(PublicIpAddress ip) { VirtualNetworkModel vnModel = lookupPublicNetworkModel(); assert vnModel != null : "public network model is null"; @@ -757,8 +767,8 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager List> ips = fipPool.getFloatingIps(); if (ips != null) { try { - return (List) _api.getObjects(FloatingIp.class, ips); - } catch(IOException ex) { + return (List)_api.getObjects(FloatingIp.class, ips); + } catch (IOException ex) { s_logger.debug(ex); return null; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java index 6f81ad7f27b..3842caaa2d8 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java @@ -17,19 +17,19 @@ package org.apache.cloudstack.network.contrail.management; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; import java.util.List; -import org.apache.cloudstack.api.Identity; - import net.juniper.contrail.api.ApiObjectBase; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.Identity; + public class DBSyncGeneric { private static final Logger s_logger = Logger.getLogger(DBSyncGeneric.class); @@ -55,7 +55,7 @@ public class DBSyncGeneric { */ private Object _scope; private HashMap _methodMap; - private short _syncMode; + private short _syncMode; public static final short SYNC_MODE_UPDATE = 0; public static final short SYNC_MODE_CHECK = 1; @@ -89,7 +89,7 @@ public class DBSyncGeneric { _methodMap = new HashMap(); Method methods[] = _scope.getClass().getMethods(); for (int i = 0; i < methods.length; i++) { - _methodMap.put(methods[i].getName(), methods[i]); + _methodMap.put(methods[i].getName(), methods[i]); } } @@ -108,28 +108,32 @@ public class DBSyncGeneric { public Boolean sync(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String syncMethod = syncMethodPrefix + getClassName(cls); Method method = _methodMap.get(syncMethod); - if (method == null) throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + syncMethod); + if (method == null) + throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + syncMethod); return (Boolean)method.invoke(_scope, parameters); } private void create(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String createMethod = createMethodPrefix + getClassName(cls); Method method = _methodMap.get(createMethod); - if (method == null) throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + createMethod); + if (method == null) + throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + createMethod); method.invoke(_scope, parameters); } private void delete(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String deleteMethod = deleteMethodPrefix + getClassName(cls); Method method = _methodMap.get(deleteMethod); - if (method == null) throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + deleteMethod); + if (method == null) + throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + deleteMethod); method.invoke(_scope, parameters); } private Integer compare(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String compareMethod = compareMethodPrefix + getClassName(cls); Method method = _methodMap.get(compareMethod); - if (method == null) throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + compareMethod); + if (method == null) + throw new NoSuchMethodException(getClassName(_scope.getClass()) + ":" + compareMethod); return (Integer)method.invoke(_scope, parameters); } @@ -157,7 +161,8 @@ public class DBSyncGeneric { private Comparator dbComparator(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String dbComparatorMethod = dbComparatorMethodPrefix + getClassName(cls); Method method = _methodMap.get(dbComparatorMethod); - if (method == null) return dbComparatorDefault(); + if (method == null) + return dbComparatorDefault(); return (Comparator)method.invoke(_scope, parameters); } @@ -165,14 +170,15 @@ public class DBSyncGeneric { private Comparator vncComparator(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String vncComparatorMethod = vncComparatorMethodPrefix + getClassName(cls); Method method = _methodMap.get(vncComparatorMethod); - if (method == null) return vncComparatorDefault(); + if (method == null) + return vncComparatorDefault(); return (Comparator)method.invoke(_scope, parameters); } - @SuppressWarnings("rawtypes") public Comparator dbComparatorDefault() { Comparator comparator = new Comparator() { + @Override public int compare(Identity u1, Identity u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -183,6 +189,7 @@ public class DBSyncGeneric { @SuppressWarnings("rawtypes") public Comparator vncComparatorDefault() { Comparator comparator = new Comparator() { + @Override public int compare(ApiObjectBase u1, ApiObjectBase u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -190,7 +197,6 @@ public class DBSyncGeneric { return comparator; } - public static class SyncStats { public int create; public int delete; @@ -198,16 +204,21 @@ public class DBSyncGeneric { public int diff; public int filter; public StringBuffer logMsg; + SyncStats() { logMsg = new StringBuffer(); } + void log(String str) { logMsg.append(str); logMsg.append('\n'); } + public boolean isSynchronized() { return create == 0 && delete == 0 && diff == 0; } + + @Override public String toString() { StringBuffer str = new StringBuffer(); str.append("create: " + create); @@ -221,10 +232,10 @@ public class DBSyncGeneric { } } - public void syncCollections(Class cls, Collection lhsList, Collection rhsList, boolean modifyMode, - SyncStats stats) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { + public void syncCollections(Class cls, Collection lhsList, Collection rhsList, boolean modifyMode, SyncStats stats) throws InvocationTargetException, + IllegalAccessException, NoSuchMethodException { java.util.Iterator lhsIter = lhsList.iterator(); - java.util.Iterator rhsIter = rhsList.iterator(); + java.util.Iterator rhsIter = rhsList.iterator(); Object lhsItem = lhsIter.hasNext() ? lhsIter.next() : null; Object rhsItem = rhsIter.hasNext() ? rhsIter.next() : null; @@ -264,7 +275,7 @@ public class DBSyncGeneric { while (lhsItem != null) { // Create if (modifyMode) { - this.create(cls, lhsItem, stats.logMsg); + this.create(cls, lhsItem, stats.logMsg); } stats.create++; lhsItem = lhsIter.hasNext() ? lhsIter.next() : null; @@ -319,4 +330,3 @@ public class DBSyncGeneric { } } - diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java index c11315f8939..a06b0b35746 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java @@ -17,25 +17,27 @@ package org.apache.cloudstack.network.contrail.management; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.messagebus.MessageBus; +import org.apache.cloudstack.framework.messagebus.MessageBusBase; + import com.cloud.event.ActionEvent; import com.cloud.event.Event; import com.cloud.event.EventCategory; import com.cloud.event.EventTypes; import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ComponentMethodInterceptor; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.messagebus.MessageBusBase; -import org.apache.cloudstack.framework.messagebus.MessageBus; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.stereotype.Component; - -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - @Component public class EventUtils { private static final Logger s_logger = Logger.getLogger(EventUtils.class); @@ -45,24 +47,20 @@ public class EventUtils { public EventUtils() { } - private static void publishOnMessageBus(String eventCategory, - String eventType, String details, Event.State state) { + private static void publishOnMessageBus(String eventCategory, String eventType, String details, Event.State state) { if (state != com.cloud.event.Event.State.Completed) { return; } try { - _messageBus = (MessageBus)ComponentContext.getComponent(MessageBusBase.class); - } catch(NoSuchBeanDefinitionException nbe) { + _messageBus = ComponentContext.getComponent(MessageBusBase.class); + } catch (NoSuchBeanDefinitionException nbe) { return; // no provider is configured to provide events bus, so just return } - org.apache.cloudstack.framework.events.Event event = new org.apache.cloudstack.framework.events.Event( - ManagementServer.Name, - eventCategory, - eventType, - EventTypes.getEntityForEvent(eventType), null); + org.apache.cloudstack.framework.events.Event event = + new org.apache.cloudstack.framework.events.Event(ManagementService.Name, eventCategory, eventType, EventTypes.getEntityForEvent(eventType), null); Map eventDescription = new HashMap(); eventDescription.put("event", eventType); @@ -96,8 +94,7 @@ public class EventUtils { if (actionEvent != null) { CallContext ctx = CallContext.current(); if (!actionEvent.create()) { - publishOnMessageBus(EventCategory.ACTION_EVENT.getName(), - actionEvent.eventType(), ctx.getEventDetails(), com.cloud.event.Event.State.Completed); + publishOnMessageBus(EventCategory.ACTION_EVENT.getName(), actionEvent.eventType(), ctx.getEventDetails(), com.cloud.event.Event.State.Completed); } } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java index 2b57ec1259d..e86e98a215b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java @@ -94,20 +94,19 @@ public class ManagementNetworkGuru extends ContrailGuru { } @Override - public Network design(NetworkOffering offering, DeploymentPlan plan, - Network userSpecified, Account owner) { + public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) { if (!canHandle(offering)) { return null; } - NetworkVO network = new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Lswitch, - offering.getId(), Network.State.Allocated, plan.getDataCenterId(), plan.getPhysicalNetworkId()); + NetworkVO network = + new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Lswitch, offering.getId(), Network.State.Allocated, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); if (_mgmt_cidr != null) { network.setCidr(_mgmt_cidr); network.setGateway(_mgmt_gateway); } - s_logger.debug("Allocated network " + userSpecified.getName() + - (network.getCidr() == null ? "" : " subnet: " + network.getCidr())); + s_logger.debug("Allocated network " + userSpecified.getName() + (network.getCidr() == null ? "" : " subnet: " + network.getCidr())); return network; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java index 3cbc9088ece..7f66a3b8290 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java @@ -48,7 +48,7 @@ public class ModelDatabase { public ServiceInstanceModel lookupServiceInstance(String uuid) { ServiceInstanceModel siKey = new ServiceInstanceModel(uuid); ServiceInstanceModel current = _serviceInstanceTable.ceiling(siKey); - if (current != null && current.getUuid().equals(uuid)) { + if (current != null && current.getUuid().equals(uuid)) { return current; } return null; @@ -75,8 +75,7 @@ public class ModelDatabase { VirtualNetworkModel vnKey = new VirtualNetworkModel(null, uuid, name, ttype); VirtualNetworkModel current = _vnTable.ceiling(vnKey); if (current != null) { - if (ttype == TrafficType.Management || ttype == TrafficType.Storage - || ttype == TrafficType.Control) { + if (ttype == TrafficType.Management || ttype == TrafficType.Storage || ttype == TrafficType.Control) { if (current.getName().equals(name)) { return current; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java index fea9a951e68..4333ac5b374 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSync.java @@ -24,16 +24,19 @@ import com.cloud.projects.ProjectVO; public interface ServerDBSync { - public final static short SYNC_STATE_IN_SYNC = 0; public final static short SYNC_STATE_OUT_OF_SYNC = 1; public final static short SYNC_STATE_UNKNOWN = -1; + /* * API for syncing all classes of vnc objects with cloudstack * Sync cloudstack and vnc objects. */ public short syncAll(short syncMode); + public void syncClass(Class cls); + public void createProject(ProjectVO project, StringBuffer syncLogMesg) throws IOException; - public void createDomain(DomainVO domain, StringBuffer logMesg)throws IOException; + + public void createDomain(DomainVO domain, StringBuffer logMesg) throws IOException; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java index 5968da8e557..22543dd542f 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java @@ -19,23 +19,29 @@ package org.apache.cloudstack.network.contrail.management; import java.io.IOException; import java.io.Serializable; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import java.lang.reflect.Method; -import net.juniper.contrail.api.types.FloatingIp; -import net.juniper.contrail.api.types.FloatingIpPool; -import net.juniper.contrail.api.types.ServiceInstance; -import net.juniper.contrail.api.types.VirtualNetwork; -import net.juniper.contrail.api.types.VirtualMachine; -import net.juniper.contrail.api.types.VirtualMachineInterface; -import net.juniper.contrail.api.types.InstanceIp; +import javax.inject.Inject; + import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.ApiObjectBase; import net.juniper.contrail.api.ApiPropertyBase; import net.juniper.contrail.api.ObjectReference; +import net.juniper.contrail.api.types.FloatingIp; +import net.juniper.contrail.api.types.FloatingIpPool; +import net.juniper.contrail.api.types.InstanceIp; +import net.juniper.contrail.api.types.ServiceInstance; +import net.juniper.contrail.api.types.VirtualMachine; +import net.juniper.contrail.api.types.VirtualMachineInterface; +import net.juniper.contrail.api.types.VirtualNetwork; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import org.apache.cloudstack.network.contrail.model.FloatingIpModel; import org.apache.cloudstack.network.contrail.model.FloatingIpPoolModel; @@ -43,43 +49,47 @@ import org.apache.cloudstack.network.contrail.model.ServiceInstanceModel; import org.apache.cloudstack.network.contrail.model.VMInterfaceModel; import org.apache.cloudstack.network.contrail.model.VirtualMachineModel; import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.dao.VlanDao; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.exception.InternalErrorException; -import com.cloud.projects.ProjectVO; -import com.cloud.projects.dao.ProjectDao; import com.cloud.network.IpAddress; import com.cloud.network.Networks.TrafficType; -import com.cloud.vm.dao.NicDao; -import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.NicVO; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; - -import javax.inject.Inject; +import com.cloud.projects.ProjectVO; +import com.cloud.projects.dao.ProjectDao; +import com.cloud.vm.NicVO; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.dao.NicDao; +import com.cloud.vm.dao.VMInstanceDao; @Component public class ServerDBSyncImpl implements ServerDBSync { - @Inject DomainDao _domainDao; - @Inject ProjectDao _projectDao; - @Inject NetworkDao _networksDao; - @Inject VMInstanceDao _vmInstanceDao; - @Inject NicDao _nicDao; - @Inject VlanDao _vlanDao; - @Inject PhysicalNetworkDao _physicalNetworkDao; - @Inject PhysicalNetworkServiceProviderDao _physProviderDao; - @Inject ContrailManager _manager; + @Inject + DomainDao _domainDao; + @Inject + ProjectDao _projectDao; + @Inject + NetworkDao _networksDao; + @Inject + VMInstanceDao _vmInstanceDao; + @Inject + NicDao _nicDao; + @Inject + VlanDao _vlanDao; + @Inject + PhysicalNetworkDao _physicalNetworkDao; + @Inject + PhysicalNetworkServiceProviderDao _physProviderDao; + @Inject + ContrailManager _manager; DBSyncGeneric _dbSync; Class[] _vncClasses; // Read-Write (true) or Read-Only mode. @@ -87,14 +97,9 @@ public class ServerDBSyncImpl implements ServerDBSync { private final ReentrantLock _lockSyncMode = new ReentrantLock(); ServerDBSyncImpl() { - _vncClasses = new Class[] { - net.juniper.contrail.api.types.Domain.class, - net.juniper.contrail.api.types.Project.class, - VirtualNetwork.class, - VirtualMachine.class, - ServiceInstance.class, - FloatingIp.class - }; + _vncClasses = + new Class[] {net.juniper.contrail.api.types.Domain.class, net.juniper.contrail.api.types.Project.class, VirtualNetwork.class, VirtualMachine.class, + ServiceInstance.class, FloatingIp.class}; _dbSync = new DBSyncGeneric(this); } @@ -113,7 +118,7 @@ public class ServerDBSyncImpl implements ServerDBSync { /* vnc classes need to be synchronized with cloudstack */ s_logger.debug("syncing cloudstack db with vnc"); try { - for(Class cls : _vncClasses) { + for (Class cls : _vncClasses) { /* lock the sync mode*/ _lockSyncMode.lock(); @@ -142,7 +147,7 @@ public class ServerDBSyncImpl implements ServerDBSync { /* unlock the sync mode */ _lockSyncMode.unlock(); } - } catch(Exception ex) { + } catch (Exception ex) { s_logger.warn("DB Synchronization", ex); syncState = SYNC_STATE_UNKNOWN; if (_lockSyncMode.isLocked()) { @@ -164,7 +169,7 @@ public class ServerDBSyncImpl implements ServerDBSync { _dbSync.sync(cls); _lockSyncMode.unlock(); s_logger.debug("sync finish: " + DBSyncGeneric.getClassName(cls)); - } catch(Exception ex) { + } catch (Exception ex) { s_logger.warn("Sync error: " + cls.getName(), ex); if (_lockSyncMode.isLocked()) { _lockSyncMode.unlock(); @@ -172,7 +177,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } } - public void deleteChildren(List> childs, Class childCls, StringBuffer syncLogMesg) throws Exception { + public void deleteChildren(List> childs, Class childCls, StringBuffer syncLogMesg) throws Exception { final ApiConnector api = _manager.getApiConnector(); if (childs == null) { syncLogMesg.append("no children of type: " + childCls.getName() + "\n"); @@ -184,21 +189,21 @@ public class ServerDBSyncImpl implements ServerDBSync { Method method = null; Method methods[] = this.getClass().getMethods(); for (int i = 0; i < methods.length; i++) { - if(methods[i].getName().equalsIgnoreCase(deleteChildMethod)) { + if (methods[i].getName().equalsIgnoreCase(deleteChildMethod)) { method = methods[i]; break; } } int count = 0; - for (ObjectReference childRef: childs) { + for (ObjectReference childRef : childs) { @SuppressWarnings("unchecked") - ApiObjectBase child = (ApiObjectBase) api.findById((Class)childCls, childRef.getUuid()); + ApiObjectBase child = api.findById((Class)childCls, childRef.getUuid()); if (method != null) { - method.invoke(this, child, syncLogMesg); + method.invoke(this, child, syncLogMesg); } else { deleteDefault(child, childCls, syncLogMesg); } - count ++; + count++; } syncLogMesg.append("deleted children count : " + count + "\n"); } @@ -217,7 +222,7 @@ public class ServerDBSyncImpl implements ServerDBSync { try { List dbList = _domainDao.listAll(); @SuppressWarnings("unchecked") - List vncList = (List) api.list(net.juniper.contrail.api.types.Domain.class, null); + List vncList = api.list(net.juniper.contrail.api.types.Domain.class, null); return _dbSync.syncGeneric(net.juniper.contrail.api.types.Domain.class, dbList, vncList); } catch (Exception ex) { s_logger.warn("syncDomain", ex); @@ -233,8 +238,7 @@ public class ServerDBSyncImpl implements ServerDBSync { vnc.setUuid(db.getUuid()); if (!api.create(vnc)) { s_logger.error("Unable to create domain " + vnc.getName()); - syncLogMesg.append("Error: Virtual domain# VNC : Unable to create domain: " + - vnc.getName() + "\n"); + syncLogMesg.append("Error: Virtual domain# VNC : Unable to create domain: " + vnc.getName() + "\n"); return; } syncLogMesg.append("Domain# VNC: " + vnc.getName() + " created \n"); @@ -243,8 +247,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void deleteDomain(net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); api.read(vnc); - syncLogMesg.append("Domain# DB: none; VNC: " + vnc.getName() + "(" + - vnc.getUuid() + "); action: delete\n"); + syncLogMesg.append("Domain# DB: none; VNC: " + vnc.getName() + "(" + vnc.getUuid() + "); action: delete\n"); /* delete all projects under this domain */ try { @@ -268,7 +271,7 @@ public class ServerDBSyncImpl implements ServerDBSync { return db.getUuid().compareTo(vnc.getUuid()); } - public Boolean filterDomain(net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) { + public Boolean filterDomain(net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) { if (_manager.isSystemRootDomain(vnc)) { return true; } @@ -276,13 +279,13 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalDomain(DomainVO db, net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) { - syncLogMesg.append("Domain# DB: " + db.getName() + "; VNC: " + - vnc.getName() + "; action: equal, no action\n"); + syncLogMesg.append("Domain# DB: " + db.getName() + "; VNC: " + vnc.getName() + "; action: equal, no action\n"); return true; } public Comparator dbComparatorDomain() { Comparator comparator = new Comparator() { + @Override public int compare(DomainVO u1, DomainVO u2) { if (_manager.isSystemRootDomain(u1)) { return -1; @@ -297,7 +300,8 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Comparator vncComparatorDomain() { - Comparator comparator = new Comparator () { + Comparator comparator = new Comparator() { + @Override public int compare(net.juniper.contrail.api.types.Domain u1, net.juniper.contrail.api.types.Domain u2) { if (_manager.isSystemRootDomain(u1)) { return -1; @@ -319,7 +323,7 @@ public class ServerDBSyncImpl implements ServerDBSync { final ApiConnector api = _manager.getApiConnector(); try { List dbList = _projectDao.listAll(); - List vncList = (List) api.list(net.juniper.contrail.api.types.Project.class, null); + List vncList = api.list(net.juniper.contrail.api.types.Project.class, null); return _dbSync.syncGeneric(net.juniper.contrail.api.types.Project.class, dbList, vncList); } catch (Exception ex) { s_logger.warn("syncProject", ex); @@ -335,8 +339,7 @@ public class ServerDBSyncImpl implements ServerDBSync { vnc.setUuid(db.getUuid()); if (!api.create(vnc)) { s_logger.error("Unable to create project: " + vnc.getName()); - syncLogMesg.append("Error: Virtual project# VNC : Unable to create project: " + - vnc.getName() + "\n"); + syncLogMesg.append("Error: Virtual project# VNC : Unable to create project: " + vnc.getName() + "\n"); return; } syncLogMesg.append("Project# VNC: " + vnc.getName() + " created \n"); @@ -345,8 +348,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void deleteProject(net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); api.read(vnc); - syncLogMesg.append("Project# DB: none; VNC: " + vnc.getName() + "(" + - vnc.getUuid() + "); action: delete\n"); + syncLogMesg.append("Project# DB: none; VNC: " + vnc.getName() + "(" + vnc.getUuid() + "); action: delete\n"); try { deleteChildren(vnc.getVirtualNetworks(), VirtualNetwork.class, syncLogMesg); @@ -372,7 +374,7 @@ public class ServerDBSyncImpl implements ServerDBSync { return db.getUuid().compareTo(vnc.getUuid()); } - public Boolean filterProject(net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) { + public Boolean filterProject(net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) { if (_manager.isSystemDefaultProject(vnc)) { syncLogMesg.append("VNC: " + vnc.getName() + " filtered; action: don't delete\n"); return true; @@ -381,13 +383,13 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalProject(ProjectVO db, net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) { - syncLogMesg.append("Project# DB: " + db.getName() + "; VNC: " + - vnc.getName() + "; action: equal, no action\n"); + syncLogMesg.append("Project# DB: " + db.getName() + "; VNC: " + vnc.getName() + "; action: equal, no action\n"); return true; } public Comparator dbComparatorProject() { Comparator comparator = new Comparator() { + @Override public int compare(ProjectVO u1, ProjectVO u2) { if (_manager.isSystemDefaultProject(u1)) { return -1; @@ -402,7 +404,8 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Comparator vncComparatorProject() { - Comparator comparator = new Comparator () { + Comparator comparator = new Comparator() { + @Override public int compare(net.juniper.contrail.api.types.Project u1, net.juniper.contrail.api.types.Project u2) { if (_manager.isSystemDefaultProject(u1)) { return -1; @@ -429,7 +432,7 @@ public class ServerDBSyncImpl implements ServerDBSync { /* * Virtual Network Synchronization methods */ - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) public boolean syncVirtualNetwork() throws Exception { final ApiConnector api = _manager.getApiConnector(); try { @@ -439,9 +442,9 @@ public class ServerDBSyncImpl implements ServerDBSync { types.add(TrafficType.Guest); List dbNets = _manager.findJuniperManagedNetworks(types); - List vList = (List) api.list(VirtualNetwork.class, null); + List vList = (List)api.list(VirtualNetwork.class, null); List vncList = new ArrayList(); - for (VirtualNetwork vn:vList) { + for (VirtualNetwork vn : vList) { if (!_manager.isSystemDefaultNetwork(vn)) { vncList.add(vn); } @@ -456,6 +459,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public Comparator dbComparatorVirtualNetwork() { Comparator comparator = new Comparator() { + @Override public int compare(NetworkVO u1, NetworkVO u2) { if (_manager.isSystemDefaultNetwork(u1) && _manager.isSystemDefaultNetwork(u2)) { return _manager.getCanonicalName(u1).compareTo(_manager.getCanonicalName(u2)); @@ -472,6 +476,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public Comparator vncComparatorVirtualNetwork() { Comparator comparator = new Comparator() { + @Override public int compare(VirtualNetwork u1, VirtualNetwork u2) { if (_manager.isSystemDefaultNetwork(u1) && _manager.isSystemDefaultNetwork(u2)) { return u1.getName().compareTo(u2.getName()); @@ -487,17 +492,13 @@ public class ServerDBSyncImpl implements ServerDBSync { } public void createVirtualNetwork(NetworkVO dbNet, StringBuffer syncLogMesg) throws IOException { - syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbNet) + - "(" + dbNet.getUuid() + "); VNC: none; action: create\n"); + syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbNet) + "(" + dbNet.getUuid() + "); VNC: none; action: create\n"); - if (_manager.getDatabase().lookupVirtualNetwork(dbNet.getUuid(), - _manager.getCanonicalName(dbNet), dbNet.getTrafficType()) != null) { - s_logger.warn("VN model object is already present in DB: " + - dbNet.getUuid() + ", name: " + dbNet.getName()); + if (_manager.getDatabase().lookupVirtualNetwork(dbNet.getUuid(), _manager.getCanonicalName(dbNet), dbNet.getTrafficType()) != null) { + s_logger.warn("VN model object is already present in DB: " + dbNet.getUuid() + ", name: " + dbNet.getName()); } - VirtualNetworkModel vnModel = new VirtualNetworkModel(dbNet, - dbNet.getUuid(), _manager.getCanonicalName(dbNet), dbNet.getTrafficType()); + VirtualNetworkModel vnModel = new VirtualNetworkModel(dbNet, dbNet.getUuid(), _manager.getCanonicalName(dbNet), dbNet.getTrafficType()); vnModel.build(_manager.getModelController(), dbNet); if (_rw_mode) { @@ -507,8 +508,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } } catch (InternalErrorException ex) { s_logger.warn("create virtual-network", ex); - syncLogMesg.append("Error: VN# VNC : Unable to create network " + - dbNet.getName() + "\n"); + syncLogMesg.append("Error: VN# VNC : Unable to create network " + dbNet.getName() + "\n"); return; } s_logger.debug("add model " + vnModel.getName()); @@ -519,7 +519,6 @@ public class ServerDBSyncImpl implements ServerDBSync { } } - public void deleteVirtualNetwork(VirtualNetwork vnet, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); if (_manager.isSystemDefaultNetwork(vnet)) { @@ -532,8 +531,8 @@ public class ServerDBSyncImpl implements ServerDBSync { List> fipPools = vnet.getFloatingIpPools(); if (fipPools != null && !fipPools.isEmpty()) { - FloatingIpPool floatingIpPool = (FloatingIpPool) api.findById(FloatingIpPool.class, fipPools.get(0).getUuid()); - if (floatingIpPool != null ) { + FloatingIpPool floatingIpPool = (FloatingIpPool)api.findById(FloatingIpPool.class, fipPools.get(0).getUuid()); + if (floatingIpPool != null) { deleteFloatingIps(floatingIpPool.getFloatingIps(), syncLogMesg); } } @@ -556,7 +555,7 @@ public class ServerDBSyncImpl implements ServerDBSync { return dbn.getUuid().compareTo(vnet.getUuid()); } - public Boolean filterVirtualNetwork(VirtualNetwork vnet, StringBuffer syncLogMesg) { + public Boolean filterVirtualNetwork(VirtualNetwork vnet, StringBuffer syncLogMesg) { if (_manager.isSystemDefaultNetwork(vnet)) { syncLogMesg.append("VN# VNC: " + vnet.getName() + " filtered; action: don't delete\n"); return true; @@ -565,22 +564,19 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalVirtualNetwork(NetworkVO dbn, VirtualNetwork vnet, StringBuffer syncLogMesg) { - syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + - "; VNC: " + vnet.getName() + "; action: equal\n"); + syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + "; VNC: " + vnet.getName() + "; action: equal\n"); - VirtualNetworkModel current = _manager.getDatabase().lookupVirtualNetwork(vnet.getUuid(), - _manager.getCanonicalName(dbn), dbn.getTrafficType()); + VirtualNetworkModel current = _manager.getDatabase().lookupVirtualNetwork(vnet.getUuid(), _manager.getCanonicalName(dbn), dbn.getTrafficType()); - VirtualNetworkModel vnModel = new VirtualNetworkModel(dbn, vnet.getUuid(), - _manager.getCanonicalName(dbn), dbn.getTrafficType()); + VirtualNetworkModel vnModel = new VirtualNetworkModel(dbn, vnet.getUuid(), _manager.getCanonicalName(dbn), dbn.getTrafficType()); vnModel.build(_manager.getModelController(), dbn); if (_rw_mode) { if (current != null) { FloatingIpPoolModel fipPoolModel = current.getFipPoolModel(); if (fipPoolModel != null) { - vnModel.setFipPoolModel(fipPoolModel); - fipPoolModel.addToVirtualNetwork(vnModel); + vnModel.setFipPoolModel(fipPoolModel); + fipPoolModel.addToVirtualNetwork(vnModel); } _manager.getDatabase().getVirtualNetworks().remove(current); } @@ -596,8 +592,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } else { //compare if (current != null && current.compare(_manager.getModelController(), vnModel) == false) { - syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + - "; VNC: " + vnet.getName() + "; attributes differ\n"); + syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + "; VNC: " + vnet.getName() + "; attributes differ\n"); return false; } } @@ -613,7 +608,7 @@ public class ServerDBSyncImpl implements ServerDBSync { try { List vmDbList = _vmInstanceDao.listAll(); @SuppressWarnings("unchecked") - List vncVmList = (List) api.list(VirtualMachine.class, null); + List vncVmList = (List)api.list(VirtualMachine.class, null); s_logger.debug("sync VM: CS size: " + vmDbList.size() + " VNC size: " + vncVmList.size()); return _dbSync.syncGeneric(VirtualMachine.class, vmDbList, vncVmList); } catch (Exception ex) { @@ -624,6 +619,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public Comparator dbComparatorVirtualMachine() { Comparator comparator = new Comparator() { + @Override public int compare(VMInstanceVO u1, VMInstanceVO u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -632,7 +628,8 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Comparator vncComparatorVirtualMachine() { - Comparator comparator = new Comparator () { + Comparator comparator = new Comparator() { + @Override public int compare(VirtualMachine u1, VirtualMachine u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -663,8 +660,8 @@ public class ServerDBSyncImpl implements ServerDBSync { return; } final ApiConnector api = _manager.getApiConnector(); - for (ObjectReference vmiRef: list) { - VirtualMachineInterface vmi = (VirtualMachineInterface) api.findById(VirtualMachineInterface.class, vmiRef.getUuid()); + for (ObjectReference vmiRef : list) { + VirtualMachineInterface vmi = (VirtualMachineInterface)api.findById(VirtualMachineInterface.class, vmiRef.getUuid()); deleteInstanceIps(vmi.getInstanceIpBackRefs(), syncLogMesg); deleteFloatingIps(vmi.getFloatingIpBackRefs(), syncLogMesg); api.delete(VirtualMachineInterface.class, vmiRef.getUuid()); @@ -677,7 +674,7 @@ public class ServerDBSyncImpl implements ServerDBSync { return; } final ApiConnector api = _manager.getApiConnector(); - for (ObjectReference instIp: list) { + for (ObjectReference instIp : list) { api.delete(InstanceIp.class, instIp.getUuid()); syncLogMesg.append("VNC instance ip: " + instIp.getUuid() + " deleted\n"); } @@ -689,7 +686,7 @@ public class ServerDBSyncImpl implements ServerDBSync { return; } final ApiConnector api = _manager.getApiConnector(); - for (ObjectReference floatingIp: list) { + for (ObjectReference floatingIp : list) { api.delete(FloatingIp.class, floatingIp.getUuid()); syncLogMesg.append("VNC instance ip: " + floatingIp.getUuid() + " deleted\n"); } @@ -703,7 +700,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } try { if (!api.read(vncVm)) { - return; + return; } deleteVirtualMachineInterfaces(vncVm.getVirtualMachineInterfaces(), syncLogMesg); api.delete(VirtualMachine.class, vncVm.getUuid()); @@ -724,17 +721,16 @@ public class ServerDBSyncImpl implements ServerDBSync { return false; } - private void buildNicResources(VirtualMachineModel vmModel, VMInstanceVO dbVm, StringBuffer syncLogMsg) - throws IOException { + private void buildNicResources(VirtualMachineModel vmModel, VMInstanceVO dbVm, StringBuffer syncLogMsg) throws IOException { List nics = _nicDao.listByVmId(dbVm.getId()); for (NicVO nic : nics) { VMInterfaceModel vmiModel = vmModel.getVMInterface(nic.getUuid()); if (vmiModel == null) { vmiModel = new VMInterfaceModel(nic.getUuid()); NetworkVO network = _networksDao.findById(nic.getNetworkId()); - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork( - network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); - if (vnModel == null) { + VirtualNetworkModel vnModel = + _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); + if (vnModel == null) { s_logger.warn("Unable to locate virtual-network for network id " + network.getId()); continue; } @@ -747,8 +743,8 @@ public class ServerDBSyncImpl implements ServerDBSync { public Boolean equalVirtualMachine(VMInstanceVO dbVm, VirtualMachine vncVm, StringBuffer syncLogMsg) { - syncLogMsg.append("VM# DB: " + dbVm.getInstanceName() + "/" + dbVm.getUuid() + - "; VNC: " + vncVm.getUuid() + "; action: equal; DB VM State: " + dbVm.getState() + "\n"); + syncLogMsg.append("VM# DB: " + dbVm.getInstanceName() + "/" + dbVm.getUuid() + "; VNC: " + vncVm.getUuid() + "; action: equal; DB VM State: " + dbVm.getState() + + "\n"); VirtualMachineModel vmModel = new VirtualMachineModel(dbVm, dbVm.getUuid()); vmModel.build(_manager.getModelController(), dbVm); @@ -775,15 +771,13 @@ public class ServerDBSyncImpl implements ServerDBSync { } else { //compare if (current != null && current.compare(_manager.getModelController(), vmModel) == false) { - syncLogMsg.append("VM # DB: " + dbVm.getInstanceName() + - "; VNC: " + vncVm.getName() + "; attributes differ\n"); + syncLogMsg.append("VM # DB: " + dbVm.getInstanceName() + "; VNC: " + vncVm.getName() + "; attributes differ\n"); return false; } } return true; } - public boolean syncFloatingIp() throws Exception { List ipList = _manager.findJuniperManagedPublicIps(); @@ -797,7 +791,7 @@ public class ServerDBSyncImpl implements ServerDBSync { boolean status = false; try { - status = _dbSync.syncGeneric(FloatingIp.class, ipList, vncList); + status = _dbSync.syncGeneric(FloatingIp.class, ipList, vncList); } catch (Exception ex) { s_logger.warn("sync floating-ips", ex); throw ex; @@ -807,6 +801,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public Comparator dbComparatorFloatingIp() { Comparator comparator = new Comparator() { + @Override public int compare(IpAddress u1, IpAddress u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -815,7 +810,8 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Comparator vncComparatorFloatingIp() { - Comparator comparator = new Comparator () { + Comparator comparator = new Comparator() { + @Override public int compare(FloatingIp u1, FloatingIp u2) { return u1.getUuid().compareTo(u2.getUuid()); } @@ -839,24 +835,21 @@ public class ServerDBSyncImpl implements ServerDBSync { syncLogMesg.append("fip# DB: " + dbIp.getAddress().addr() + "; VNC: none; action: create\n"); if (!_manager.createFloatingIp(PublicIp.createFromAddrAndVlan(dbIp, _vlanDao.findById(dbIp.getVlanId())))) { syncLogMesg.append("fip# VNC: " + dbIp.getAddress().addr() + " unable to create\n"); - return ; + return; } syncLogMesg.append("fip# VNC: " + dbIp.getUuid() + " created\n"); } public void deleteFloatingIp(FloatingIp vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); - syncLogMesg.append("fip# DB: none; VNC: " + vnc.getAddress() + "(" + - vnc.getUuid() + "); action: delete\n"); + syncLogMesg.append("fip# DB: none; VNC: " + vnc.getAddress() + "(" + vnc.getUuid() + "); action: delete\n"); api.delete(vnc); syncLogMesg.append("fip# VNC: " + vnc.getUuid() + " deleted\n"); } - public Boolean equalFloatingIp(IPAddressVO db, FloatingIp vnc, StringBuffer syncLogMsg) - throws IOException { + public Boolean equalFloatingIp(IPAddressVO db, FloatingIp vnc, StringBuffer syncLogMsg) throws IOException { - syncLogMsg.append("fip# DB: " + db.getAddress().addr() + - "; VNC: " + vnc.getAddress() + "; action: equal" + "\n"); + syncLogMsg.append("fip# DB: " + db.getAddress().addr() + "; VNC: " + vnc.getAddress() + "; action: equal" + "\n"); VirtualNetworkModel vnModel = _manager.lookupPublicNetworkModel(); assert vnModel != null : "public network vn model is null"; @@ -880,8 +873,7 @@ public class ServerDBSyncImpl implements ServerDBSync { s_logger.debug("add model " + db.getAddress().addr()); FloatingIpModel fipModel = new FloatingIpModel(db.getUuid()); fipModel.addToFloatingIpPool(fipPoolModel); - fipModel.build(_manager.getModelController(), - PublicIp.createFromAddrAndVlan(db, _vlanDao.findById(db.getVlanId()))); + fipModel.build(_manager.getModelController(), PublicIp.createFromAddrAndVlan(db, _vlanDao.findById(db.getVlanId()))); try { fipModel.update(_manager.getModelController()); } catch (Exception ex) { @@ -941,6 +933,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } } + /** * The service-instance model list is build as a result of synchronizing virtual-machines. * @return @@ -950,11 +943,10 @@ public class ServerDBSyncImpl implements ServerDBSync { boolean inSync; try { @SuppressWarnings("unchecked") - List siList = (List) api.list(ServiceInstance.class, null); + List siList = (List)api.list(ServiceInstance.class, null); java.util.Collections.sort(siList, new ServiceInstanceComparator()); DBSyncGeneric.SyncStats stats = new DBSyncGeneric.SyncStats(); - _dbSync.syncCollections(ServiceInstance.class, _manager.getDatabase().getServiceInstances(), siList, - _rw_mode, stats); + _dbSync.syncCollections(ServiceInstance.class, _manager.getDatabase().getServiceInstances(), siList, _rw_mode, stats); inSync = stats.create == 0 && stats.delete == 0; } catch (Exception ex) { s_logger.warn("synchronize service-instances", ex); @@ -963,4 +955,3 @@ public class ServerDBSyncImpl implements ServerDBSync { return inSync; } } - diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java index af1d50b47ef..5030bb71d09 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java @@ -25,6 +25,10 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.framework.messagebus.MessageBus; +import org.apache.cloudstack.framework.messagebus.MessageDispatcher; +import org.apache.cloudstack.framework.messagebus.MessageHandler; + import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventTypes; @@ -32,10 +36,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.projects.ProjectVO; import com.cloud.projects.dao.ProjectDao; -import org.apache.cloudstack.framework.messagebus.MessageBus; -import org.apache.cloudstack.framework.messagebus.MessageDispatcher; -import org.apache.cloudstack.framework.messagebus.MessageHandler; - /* * When an Object is created/deleted in cloudstack DB, it has to be reflected in VNC. * This class handles create, delete and update events of cloudstack db objects. @@ -47,12 +47,18 @@ import org.apache.cloudstack.framework.messagebus.MessageHandler; */ @Component public class ServerEventHandlerImpl implements ServerEventHandler { - @Inject NetworkOfferingDao _networkOfferingDao; - @Inject DomainDao _domainDao; - @Inject ProjectDao _projectDao; - @Inject private MessageBus _messageBus; - @Inject ServerDBSync _dbSync; - @Inject ContrailManager _manager; + @Inject + NetworkOfferingDao _networkOfferingDao; + @Inject + DomainDao _domainDao; + @Inject + ProjectDao _projectDao; + @Inject + private MessageBus _messageBus; + @Inject + ServerDBSync _dbSync; + @Inject + ContrailManager _manager; private HashMap _methodMap; private HashMap> _classMap; @@ -67,7 +73,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { _methodMap = new HashMap(); Method methods[] = this.getClass().getMethods(); for (int i = 0; i < methods.length; i++) { - _methodMap.put(methods[i].getName(), methods[i]); + _methodMap.put(methods[i].getName(), methods[i]); } } @@ -77,7 +83,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { _classMap.put("Project", net.juniper.contrail.api.types.Project.class); } - @MessageHandler(topic=".*") + @MessageHandler(topic = ".*") public void defaultMessageHandler(String subject, String topic, Object args) { s_logger.info("DB Event Received - topic: " + topic + "; subject: " + subject); @@ -115,7 +121,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } /* Default create handler */ - void defaultCreateHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { + void defaultCreateHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); s_logger.debug("description: " + event.getDescription()); @@ -125,7 +131,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { Class cls = _classMap.get(event.getResourceType()); - if ( cls != null ) { + if (cls != null) { _dbSync.syncClass(cls); } @@ -133,7 +139,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } /* Default handler */ - void defaultDeleteHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { + void defaultDeleteHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); @@ -142,14 +148,14 @@ public class ServerEventHandlerImpl implements ServerEventHandler { s_logger.debug("type: " + event.getResourceType()); s_logger.debug("event-type: " + event.getEventType()); Class cls = _classMap.get(event.getResourceType()); - if ( cls != null ) { + if (cls != null) { _dbSync.syncClass(cls); } return; } /* Default handler */ - void defaultHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { + void defaultHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); @@ -158,7 +164,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { s_logger.debug("type: " + event.getResourceType()); s_logger.debug("event-type: " + event.getEventType()); Class cls = _classMap.get(event.getResourceType()); - if ( cls != null ) { + if (cls != null) { _dbSync.syncClass(cls); } return; @@ -184,7 +190,6 @@ public class ServerEventHandlerImpl implements ServerEventHandler { return id; } - public void onDomainCreate(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.info("onDomainCreate; topic: " + topic + "; subject: " + subject); try { @@ -232,7 +237,6 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } - @Override public void subscribe() { /* subscribe to DB events */ @@ -244,4 +248,3 @@ public class ServerEventHandlerImpl implements ServerEventHandler { _messageBus.subscribe(EventTypes.EVENT_VLAN_IP_RANGE_DELETE, MessageDispatcher.getDispatcher(this)); } } - diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java index dcc643cd7a7..e4ef26d4a4d 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManager.java @@ -32,9 +32,10 @@ public interface ServiceManager { * @param right Right or outside network (e.g. public network). * @return */ - public ServiceVirtualMachine createServiceInstance(DataCenter zone, Account owner, VirtualMachineTemplate template, - ServiceOffering serviceOffering, String name, Network left, Network right); + public ServiceVirtualMachine createServiceInstance(DataCenter zone, Account owner, VirtualMachineTemplate template, ServiceOffering serviceOffering, String name, + Network left, Network right); public void startServiceInstance(long instanceId); + public ServiceInstanceResponse createServiceInstanceResponse(long instanceId); } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java index a9e5f4a1190..ca44757d07c 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java @@ -18,17 +18,26 @@ package org.apache.cloudstack.network.contrail.management; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import net.juniper.contrail.api.ApiConnector; +import net.juniper.contrail.api.types.ServiceInstance; +import net.juniper.contrail.api.types.VirtualNetwork; + import org.apache.log4j.Logger; +import com.google.gson.Gson; + +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.network.contrail.api.response.ServiceInstanceResponse; +import org.apache.cloudstack.network.contrail.model.ServiceInstanceModel; +import org.apache.cloudstack.network.contrail.model.VirtualMachineModel; + import com.cloud.api.ApiDBUtils; import com.cloud.dc.DataCenter; import com.cloud.deploy.DataCenterDeployment; @@ -36,49 +45,39 @@ import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; import com.cloud.network.NetworkModel; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkVO; import com.cloud.offering.ServiceOffering; import com.cloud.projects.Project; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.VMTemplateVO; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.user.AccountService; -import com.cloud.user.User; -import com.cloud.user.UserVO; import com.cloud.user.dao.UserDao; -import com.cloud.utils.Pair; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineName; import com.cloud.vm.dao.UserVmDao; -import com.google.gson.Gson; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.network.contrail.api.response.ServiceInstanceResponse; -import org.apache.cloudstack.network.contrail.model.ServiceInstanceModel; -import org.apache.cloudstack.network.contrail.model.VirtualMachineModel; - -import net.juniper.contrail.api.ApiConnector; -import net.juniper.contrail.api.types.ServiceInstance; -import net.juniper.contrail.api.types.VirtualNetwork; - -@Local(value = {ServiceManager.class}) +@Local(value = {ServiceManager.class}) public class ServiceManagerImpl implements ServiceManager { private static final Logger s_logger = Logger.getLogger(ServiceManager.class); - @Inject UserDao _userDao; - @Inject UserVmDao _vmDao; - @Inject VirtualMachineManager _vmManager; - @Inject NetworkModel _networkModel; - @Inject AccountService _accountService; - @Inject ContrailManager _manager; + @Inject + UserDao _userDao; + @Inject + UserVmDao _vmDao; + @Inject + VirtualMachineManager _vmManager; + @Inject + NetworkModel _networkModel; + @Inject + AccountService _accountService; + @Inject + ContrailManager _manager; /** * In the case of service instance the master object is in the contrail API server. This object stores the @@ -93,29 +92,27 @@ public class ServiceManagerImpl implements ServiceManager { * @return */ - /** * create a new ServiceVM object. * @return */ - @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription="createServiceInstance", create = true) - private ServiceVirtualMachine createServiceVM(DataCenter zone, Account owner, VirtualMachineTemplate template, - ServiceOffering serviceOffering, String name, ServiceInstance siObj, Network left, Network right) { + @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "createServiceInstance", create = true) + private ServiceVirtualMachine createServiceVM(DataCenter zone, Account owner, VirtualMachineTemplate template, ServiceOffering serviceOffering, String name, + ServiceInstance siObj, Network left, Network right) { long id = _vmDao.getNextInSequence(Long.class, "id"); DataCenterDeployment plan = new DataCenterDeployment(zone.getId()); LinkedHashMap networks = new LinkedHashMap(); - NetworkVO linklocal = (NetworkVO) _networkModel.getSystemNetworkByZoneAndTrafficType(zone.getId(), - TrafficType.Management); + NetworkVO linklocal = (NetworkVO)_networkModel.getSystemNetworkByZoneAndTrafficType(zone.getId(), TrafficType.Management); networks.put(linklocal, null); - networks.put((NetworkVO) left, null); - networks.put((NetworkVO) right, null); + networks.put((NetworkVO)left, null); + networks.put((NetworkVO)right, null); String instanceName = VirtualMachineName.getVmName(id, owner.getId(), "SRV"); - ServiceVirtualMachine svm = new ServiceVirtualMachine(id, instanceName, name, template.getId(), - serviceOffering.getId(), template.getHypervisorType(), template.getGuestOSId(), zone.getId(), owner.getDomainId(), - owner.getAccountId(), false); + ServiceVirtualMachine svm = + new ServiceVirtualMachine(id, instanceName, name, template.getId(), serviceOffering.getId(), template.getHypervisorType(), template.getGuestOSId(), + zone.getId(), owner.getDomainId(), owner.getAccountId(), false); // database synchronization code must be able to distinguish service instance VMs. Map kvmap = new HashMap(); @@ -125,8 +122,7 @@ public class ServiceManagerImpl implements ServiceManager { svm.setUserData(userData); try { - _vmManager.allocate(instanceName, template, serviceOffering, networks, - plan, template.getHypervisorType()); + _vmManager.allocate(instanceName, template, serviceOffering, networks, plan, template.getHypervisorType()); } catch (InsufficientCapacityException ex) { throw new CloudRuntimeException("Insufficient capacity", ex); } @@ -135,8 +131,8 @@ public class ServiceManagerImpl implements ServiceManager { } @Override - public ServiceVirtualMachine createServiceInstance(DataCenter zone, Account owner, VirtualMachineTemplate template, - ServiceOffering serviceOffering, String name, Network left, Network right) { + public ServiceVirtualMachine createServiceInstance(DataCenter zone, Account owner, VirtualMachineTemplate template, ServiceOffering serviceOffering, String name, + Network left, Network right) { s_logger.debug("createServiceInstance by " + owner.getAccountName()); // TODO: permission model. // service instances need to be able to access the public network. @@ -150,13 +146,13 @@ public class ServiceManagerImpl implements ServiceManager { final ApiConnector api = _manager.getApiConnector(); final VirtualNetwork netLeft; try { - netLeft = (VirtualNetwork) api.findById(VirtualNetwork.class, left.getUuid()); + netLeft = (VirtualNetwork)api.findById(VirtualNetwork.class, left.getUuid()); } catch (IOException ex) { throw new CloudRuntimeException("Unable to read virtual-network object", ex); } final VirtualNetwork netRight; try { - netRight = (VirtualNetwork) api.findById(VirtualNetwork.class, right.getUuid()); + netRight = (VirtualNetwork)api.findById(VirtualNetwork.class, right.getUuid()); } catch (IOException ex) { throw new CloudRuntimeException("Unable to read virtual-network object", ex); } @@ -180,8 +176,7 @@ public class ServiceManagerImpl implements ServiceManager { } // 1. Create service-instance. - ServiceInstanceModel serviceModel = new ServiceInstanceModel(project, name, template, serviceOffering, - netLeft, netRight); + ServiceInstanceModel serviceModel = new ServiceInstanceModel(project, name, template, serviceOffering, netLeft, netRight); try { serviceModel.update(_manager.getModelController()); @@ -196,7 +191,7 @@ public class ServiceManagerImpl implements ServiceManager { try { _manager.getDatabase().getServiceInstances().add(serviceModel); siObj = serviceModel.getServiceInstance(); - } catch (Exception ex){ + } catch (Exception ex) { s_logger.warn("DB add", ex); throw new CloudRuntimeException(ex); } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java index 741879241a3..8985bc1bf32 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceVirtualMachine.java @@ -21,10 +21,8 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.vm.UserVmVO; public class ServiceVirtualMachine extends UserVmVO { - public ServiceVirtualMachine(long id, String instanceName, String name, long templateId, long serviceOfferingId, - HypervisorType hypervisorType, long guestOSId, long dataCenterId, long domainId, long accountId, - boolean haEnabled) { - super(id, instanceName, name, templateId, hypervisorType, guestOSId, false, false, domainId, accountId, - serviceOfferingId, null, name, null); + public ServiceVirtualMachine(long id, String instanceName, String name, long templateId, long serviceOfferingId, HypervisorType hypervisorType, long guestOSId, + long dataCenterId, long domainId, long accountId, boolean haEnabled) { + super(id, instanceName, name, templateId, hypervisorType, guestOSId, false, false, domainId, accountId, serviceOfferingId, null, name, null); } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java index 617b5605c0e..23bd911d8fe 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java @@ -19,9 +19,13 @@ package org.apache.cloudstack.network.contrail.model; import java.io.IOException; -import org.apache.cloudstack.network.contrail.management.ContrailManager; +import net.juniper.contrail.api.ApiConnector; +import net.juniper.contrail.api.types.FloatingIp; + import org.apache.log4j.Logger; +import org.apache.cloudstack.network.contrail.management.ContrailManager; + import com.cloud.exception.InternalErrorException; import com.cloud.network.PublicIpAddress; import com.cloud.network.dao.IPAddressVO; @@ -29,9 +33,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicVO; import com.cloud.vm.VMInstanceVO; -import net.juniper.contrail.api.types.FloatingIp; -import net.juniper.contrail.api.ApiConnector; - public class FloatingIpModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(FloatingIpModel.class); @@ -48,7 +49,7 @@ public class FloatingIpModel extends ModelObjectBase { private FloatingIpPoolModel _fipPoolModel; public FloatingIpModel(String uuid) { - _uuid = uuid; + _uuid = uuid; } public void addToFloatingIpPool(FloatingIpPoolModel fipPoolModel) { @@ -75,7 +76,7 @@ public class FloatingIpModel extends ModelObjectBase { public int compareTo(ModelObject o) { FloatingIpModel other; try { - other = (FloatingIpModel) o; + other = (FloatingIpModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return FloatingIpModel.class.getName().compareTo(clsname); @@ -87,7 +88,7 @@ public class FloatingIpModel extends ModelObjectBase { @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.delete(controller); } @@ -102,7 +103,7 @@ public class FloatingIpModel extends ModelObjectBase { public void destroy(ModelController controller) throws IOException { delete(controller); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.destroy(controller); } clearSuccessors(); @@ -116,7 +117,6 @@ public class FloatingIpModel extends ModelObjectBase { return _uuid; } - public FloatingIp getFloatingIp() { return _fip; } @@ -144,7 +144,7 @@ public class FloatingIpModel extends ModelObjectBase { FloatingIp fip = _fip; if (_fip == null) { - _fip = fip = (FloatingIp) controller.getApiAccessor().findById(FloatingIp.class, _uuid); + _fip = fip = (FloatingIp)controller.getApiAccessor().findById(FloatingIp.class, _uuid); if (fip == null) { fip = new FloatingIp(); fip.setUuid(_uuid); @@ -195,7 +195,7 @@ public class FloatingIpModel extends ModelObjectBase { addToVMInterface(vmiModel); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.update(controller); } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java index 891a4bde499..31a29b79abb 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java @@ -20,15 +20,16 @@ package org.apache.cloudstack.network.contrail.model; import java.io.IOException; import java.util.TreeSet; -import org.apache.cloudstack.network.contrail.management.ContrailManager; +import net.juniper.contrail.api.ApiConnector; +import net.juniper.contrail.api.types.FloatingIpPool; + import org.apache.log4j.Logger; +import org.apache.cloudstack.network.contrail.management.ContrailManager; + import com.cloud.exception.InternalErrorException; import com.cloud.utils.exception.CloudRuntimeException; -import net.juniper.contrail.api.types.FloatingIpPool; -import net.juniper.contrail.api.ApiConnector; - public class FloatingIpPoolModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(FloatingIpPoolModel.class); @@ -54,7 +55,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { public FloatingIpModel getFloatingIpModel(String uuid) { TreeSet tree = successors(); FloatingIpModel fipKey = new FloatingIpModel(uuid); - FloatingIpModel current = (FloatingIpModel) tree.ceiling(fipKey); + FloatingIpModel current = (FloatingIpModel)tree.ceiling(fipKey); if (current != null && current.getUuid().equals(uuid)) { return current; } @@ -77,7 +78,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.delete(controller); } try { @@ -93,7 +94,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { @Override public void destroy(ModelController controller) throws IOException { delete(controller); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.destroy(controller); } clearSuccessors(); @@ -127,7 +128,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { if (fipPool == null) { String fipPoolName = manager.getDefaultPublicNetworkFQN() + ":PublicIpPool"; - _fipPool = fipPool = (FloatingIpPool) controller.getApiAccessor().findByFQN(FloatingIpPool.class, fipPoolName); + _fipPool = fipPool = (FloatingIpPool)controller.getApiAccessor().findByFQN(FloatingIpPool.class, fipPoolName); if (fipPool == null) { fipPool = new FloatingIpPool(); fipPool.setName(_name); @@ -152,7 +153,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { } } - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.update(controller); } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java index 547775b4d43..8693e61a72b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java @@ -19,13 +19,13 @@ package org.apache.cloudstack.network.contrail.model; import java.io.IOException; -import org.apache.log4j.Logger; - +import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.ObjectReference; import net.juniper.contrail.api.types.InstanceIp; import net.juniper.contrail.api.types.VirtualMachineInterface; import net.juniper.contrail.api.types.VirtualNetwork; -import net.juniper.contrail.api.ApiConnector; + +import org.apache.log4j.Logger; import com.cloud.exception.InternalErrorException; @@ -55,7 +55,7 @@ public class InstanceIpModel extends ModelObjectBase { public int compareTo(ModelObject o) { InstanceIpModel other; try { - other = (InstanceIpModel) o; + other = (InstanceIpModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return InstanceIpModel.class.getName().compareTo(clsname); @@ -89,8 +89,7 @@ public class InstanceIpModel extends ModelObjectBase { } @Override - public void update(ModelController controller) - throws InternalErrorException, IOException { + public void update(ModelController controller) throws InternalErrorException, IOException { assert _vmiModel != null; ApiConnector api = controller.getApiAccessor(); @@ -100,7 +99,7 @@ public class InstanceIpModel extends ModelObjectBase { VirtualMachineInterface vmi = _vmiModel.getVMInterface(); VirtualNetwork vnet = vnModel.getVirtualNetwork(); if (vnet == null) { - vnet = (VirtualNetwork) api.findById(VirtualNetwork.class, _vmiModel.getNetworkUuid()); + vnet = (VirtualNetwork)api.findById(VirtualNetwork.class, _vmiModel.getNetworkUuid()); } String ipid = api.findByName(InstanceIp.class, null, _name); @@ -113,21 +112,21 @@ public class InstanceIpModel extends ModelObjectBase { } ip_obj.setVirtualMachineInterface(vmi); if (!api.create(ip_obj)) { - throw new InternalErrorException("Unable to create instance-ip " + _name); + throw new InternalErrorException("Unable to create instance-ip " + _name); } api.read(ip_obj); _uuid = ip_obj.getUuid(); if (_ipAddress == null) { if (!api.read(ip_obj)) { - throw new InternalErrorException("Unable to read instance-ip " + _name); + throw new InternalErrorException("Unable to read instance-ip " + _name); } } _ipAddress = ip_obj.getAddress(); } else { // Ensure that the instance-ip has the correct value and is pointing at the VMI. - InstanceIp ip_obj = (InstanceIp) api.findById(InstanceIp.class, ipid); + InstanceIp ip_obj = (InstanceIp)api.findById(InstanceIp.class, ipid); if (ip_obj == null) { - throw new InternalErrorException("Unable to read instance-ip " + _name); + throw new InternalErrorException("Unable to read instance-ip " + _name); } boolean update = false; String ipnet_id = ObjectReference.getReferenceListUuid(ip_obj.getVirtualNetwork()); @@ -170,5 +169,4 @@ public class InstanceIpModel extends ModelObjectBase { return false; } - } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java index 9781c6f49a3..08b8e345668 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.network.contrail.model; +import net.juniper.contrail.api.ApiConnector; + import org.apache.cloudstack.network.contrail.management.ContrailManager; import com.cloud.dc.dao.VlanDao; @@ -25,8 +27,6 @@ import com.cloud.network.dao.NetworkDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; -import net.juniper.contrail.api.ApiConnector; - /** * Collection of state necessary for model object to update the Contrail API server. * @@ -35,13 +35,12 @@ public class ModelController { ApiConnector _api; ContrailManager _manager; UserVmDao _vmDao; - NetworkDao _networkDao; + NetworkDao _networkDao; NicDao _nicDao; - VlanDao _vlanDao; + VlanDao _vlanDao; IPAddressDao _ipAddressDao; - public ModelController(ContrailManager manager, ApiConnector api, UserVmDao vmDao, NetworkDao networkDao, - NicDao nicDao, VlanDao vlanDao, IPAddressDao ipAddressDao) { + public ModelController(ContrailManager manager, ApiConnector api, UserVmDao vmDao, NetworkDao networkDao, NicDao nicDao, VlanDao vlanDao, IPAddressDao ipAddressDao) { _manager = manager; assert api != null; _api = api; @@ -56,9 +55,11 @@ public class ModelController { assert ipAddressDao != null; _ipAddressDao = ipAddressDao; } + ApiConnector getApiAccessor() { return _api; } + ContrailManager getManager() { return _manager; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java index 8aa05bb4e8c..1b048ed440b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java @@ -41,6 +41,7 @@ import com.cloud.exception.InternalErrorException; public interface ModelObject { public static class ModelReference implements Comparable, Serializable { WeakReference reference; + ModelReference(ModelObject obj) { reference = new WeakReference(obj); } @@ -63,8 +64,7 @@ public interface ModelObject { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result - + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + ((reference == null) ? 0 : reference.hashCode()); return result; } @@ -75,23 +75,25 @@ public interface ModelObject { if (other == null) return false; try { - ModelReference rhs = (ModelReference) other; + ModelReference rhs = (ModelReference)other; return compareTo(rhs) == 0; } catch (ClassCastException ex) { } return false; } + public ModelObject get() { return reference.get(); } - }; public void addSuccessor(ModelObject child); public TreeSet ancestors(); + public void clearSuccessors(); + public int compareTo(ModelObject o); /** diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java index e3e6788b6bc..52bcd939226 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java @@ -37,6 +37,7 @@ public abstract class ModelObjectBase implements ModelObject { return lhs.compareTo(rhs); } } + private TreeSet _ancestors; private TreeSet _successors; @@ -49,7 +50,7 @@ public abstract class ModelObjectBase implements ModelObject { @Override public void addSuccessor(ModelObject child) { _successors.add(child); - ModelObjectBase base = (ModelObjectBase) child; + ModelObjectBase base = (ModelObjectBase)child; base._ancestors.add(new ModelReference(this)); } @@ -74,7 +75,7 @@ public abstract class ModelObjectBase implements ModelObject { @Override public void clearSuccessors() { for (ModelObject successor : _successors) { - clearAncestorReference((ModelObjectBase) successor); + clearAncestorReference((ModelObjectBase)successor); } _successors.clear(); } @@ -83,10 +84,8 @@ public abstract class ModelObjectBase implements ModelObject { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result - + ((_ancestors == null) ? 0 : _ancestors.hashCode()); - result = prime * result - + ((_successors == null) ? 0 : _successors.hashCode()); + result = prime * result + ((_ancestors == null) ? 0 : _ancestors.hashCode()); + result = prime * result + ((_successors == null) ? 0 : _successors.hashCode()); return result; } @@ -98,7 +97,7 @@ public abstract class ModelObjectBase implements ModelObject { return false; ModelObject other; try { - other = (ModelObject) rhs; + other = (ModelObject)rhs; } catch (ClassCastException ex) { return false; } @@ -116,7 +115,7 @@ public abstract class ModelObjectBase implements ModelObject { @Override public void removeSuccessor(ModelObject child) { - clearAncestorReference((ModelObjectBase) child); + clearAncestorReference((ModelObjectBase)child); _successors.remove(child); } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java index 7796fbbb169..d0664238a79 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java @@ -21,12 +21,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - -import org.apache.cloudstack.network.contrail.management.ContrailManager; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - +import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.ObjectReference; import net.juniper.contrail.api.types.NetworkPolicy; import net.juniper.contrail.api.types.PolicyEntriesType; @@ -38,7 +33,11 @@ import net.juniper.contrail.api.types.ServiceTemplate; import net.juniper.contrail.api.types.ServiceTemplateType; import net.juniper.contrail.api.types.VirtualNetwork; import net.juniper.contrail.api.types.VirtualNetworkPolicyType; -import net.juniper.contrail.api.ApiConnector; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.network.contrail.management.ContrailManager; import com.cloud.offering.ServiceOffering; import com.cloud.template.VirtualMachineTemplate; @@ -73,8 +72,7 @@ public class ServiceInstanceModel extends ModelObjectBase { * @param left * @param right */ - public ServiceInstanceModel(Project project, String name, VirtualMachineTemplate template, - ServiceOffering serviceOffering, VirtualNetwork left, VirtualNetwork right) { + public ServiceInstanceModel(Project project, String name, VirtualMachineTemplate template, ServiceOffering serviceOffering, VirtualNetwork left, VirtualNetwork right) { String parent_name; if (project != null) { parent_name = StringUtils.join(project.getQualifiedName(), ':'); @@ -83,8 +81,7 @@ public class ServiceInstanceModel extends ModelObjectBase { } _fq_name = parent_name + ":" + name; - _mgmtName = ContrailManager.VNC_ROOT_DOMAIN + ":" + ContrailManager.VNC_DEFAULT_PROJECT + ":" - + ContrailManager.managementNetworkName; + _mgmtName = ContrailManager.VNC_ROOT_DOMAIN + ":" + ContrailManager.VNC_DEFAULT_PROJECT + ":" + ContrailManager.managementNetworkName; _left = left; _right = right; _leftName = StringUtils.join(left.getQualifiedName(), ":"); @@ -102,7 +99,7 @@ public class ServiceInstanceModel extends ModelObjectBase { * @param uuid */ public ServiceInstanceModel(String uuid) { - _uuid = uuid; + _uuid = uuid; } public String getQualifiedName() { @@ -113,10 +110,8 @@ public class ServiceInstanceModel extends ModelObjectBase { return _fq_name.substring(_fq_name.lastIndexOf(':') + 1); } - private void applyNetworkPolicy(ModelController controller, NetworkPolicy policy, - VirtualNetwork left, VirtualNetwork right) { - left.setNetworkPolicy(policy, new VirtualNetworkPolicyType( - new VirtualNetworkPolicyType.SequenceType(1, 0), null)); + private void applyNetworkPolicy(ModelController controller, NetworkPolicy policy, VirtualNetwork left, VirtualNetwork right) { + left.setNetworkPolicy(policy, new VirtualNetworkPolicyType(new VirtualNetworkPolicyType.SequenceType(1, 0), null)); // TODO: network_ipam_refs attr is missing left.clearNetworkIpam(); try { @@ -126,8 +121,7 @@ public class ServiceInstanceModel extends ModelObjectBase { throw new CloudRuntimeException("Unable to update virtual-network", ex); } - right.setNetworkPolicy(policy, new VirtualNetworkPolicyType( - new VirtualNetworkPolicyType.SequenceType(1, 0), null)); + right.setNetworkPolicy(policy, new VirtualNetworkPolicyType(new VirtualNetworkPolicyType.SequenceType(1, 0), null)); // TODO: network_ipam_refs attr is missing right.clearNetworkIpam(); try { @@ -151,20 +145,20 @@ public class ServiceInstanceModel extends ModelObjectBase { ObjectReference ref = siObj.getServiceTemplate().get(0); if (ref != null) { try { - ServiceTemplate tmpl = (ServiceTemplate) api.findById(ServiceTemplate.class, ref.getUuid()); + ServiceTemplate tmpl = (ServiceTemplate)api.findById(ServiceTemplate.class, ref.getUuid()); _templateId = tmpl.getUuid(); } catch (IOException ex) { s_logger.warn("service-template read", ex); } } try { - Project project = (Project) api.findById(Project.class, siObj.getParentUuid()); + Project project = (Project)api.findById(Project.class, siObj.getParentUuid()); if (project != null) { _projectId = project.getUuid(); } String policyId = api.findByName(NetworkPolicy.class, project, siObj.getName()); if (policyId != null) { - _policy = (NetworkPolicy) api.findById(NetworkPolicy.class, policyId); + _policy = (NetworkPolicy)api.findById(NetworkPolicy.class, policyId); } } catch (IOException ex) { s_logger.warn("network-policy read", ex); @@ -175,7 +169,7 @@ public class ServiceInstanceModel extends ModelObjectBase { public int compareTo(ModelObject o) { ServiceInstanceModel other; try { - other = (ServiceInstanceModel) o; + other = (ServiceInstanceModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return ServiceInstanceModel.class.getName().compareTo(clsname); @@ -184,15 +178,15 @@ public class ServiceInstanceModel extends ModelObjectBase { } private ServiceInstance createServiceInstance(ModelController controller) { - Project project = null; + Project project = null; if (_projectId != null) { try { ApiConnector api = controller.getApiAccessor(); - project = (Project) api.findById(Project.class, _projectId); - } catch (IOException ex) { + project = (Project)api.findById(Project.class, _projectId); + } catch (IOException ex) { s_logger.warn("project read", ex); throw new CloudRuntimeException("Unable to create service-instance object", ex); - } + } } ServiceInstance si_obj = new ServiceInstance(); @@ -201,8 +195,7 @@ public class ServiceInstanceModel extends ModelObjectBase { } si_obj.setName(getName()); si_obj.setServiceTemplate(_tmpl); - si_obj.setProperties(new ServiceInstanceType(false, _mgmtName, _leftName, null, _rightName, null, - new ServiceInstanceType.ServiceScaleOutType(1, false))); + si_obj.setProperties(new ServiceInstanceType(false, _mgmtName, _leftName, null, _rightName, null, new ServiceInstanceType.ServiceScaleOutType(1, false))); try { ApiConnector api = controller.getApiAccessor(); api.create(si_obj); @@ -228,9 +221,8 @@ public class ServiceInstanceModel extends ModelObjectBase { List portAny = new ArrayList(); portAny.add(new PolicyRuleType.PortType(0, 65535)); - PolicyRuleType rule = new PolicyRuleType( - new PolicyRuleType.SequenceType(1, 0), /* uuid */ null, "<>", "any", - srcList, portAny, /* application */ null, dstList, portAny, + PolicyRuleType rule = + new PolicyRuleType(new PolicyRuleType.SequenceType(1, 0), /* uuid */null, "<>", "any", srcList, portAny, /* application */null, dstList, portAny, new PolicyRuleType.ActionListType("pass", "in-network", siList, null)); policy_map.addPolicyRule(rule); policy.setEntries(policy_map); @@ -270,7 +262,7 @@ public class ServiceInstanceModel extends ModelObjectBase { ServiceTemplate tmpl; try { ApiConnector api = controller.getApiAccessor(); - tmpl = (ServiceTemplate) api.findById(ServiceTemplate.class, _templateId); + tmpl = (ServiceTemplate)api.findById(ServiceTemplate.class, _templateId); } catch (IOException ex) { s_logger.warn("service-template read", ex); throw new CloudRuntimeException("Unable to create service-template object", ex); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java index 904cbe89f2b..49060f1bd3b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java @@ -19,13 +19,14 @@ package org.apache.cloudstack.network.contrail.model; import java.io.IOException; -import org.apache.cloudstack.network.contrail.management.ContrailManager; -import org.apache.log4j.Logger; - +import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.types.MacAddressesType; import net.juniper.contrail.api.types.VirtualMachineInterface; import net.juniper.contrail.api.types.VirtualMachineInterfacePropertiesType; -import net.juniper.contrail.api.ApiConnector; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.network.contrail.management.ContrailManager; import com.cloud.exception.InternalErrorException; import com.cloud.network.Network; @@ -95,7 +96,7 @@ public class VMInterfaceModel extends ModelObjectBase { public int compareTo(ModelObject o) { VMInterfaceModel other; try { - other = (VMInterfaceModel) o; + other = (VMInterfaceModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return VMInterfaceModel.class.getName().compareTo(clsname); @@ -105,7 +106,7 @@ public class VMInterfaceModel extends ModelObjectBase { @Override public void delete(ModelController controller) throws IOException { - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.delete(controller); } @@ -117,7 +118,7 @@ public class VMInterfaceModel extends ModelObjectBase { public void destroy(ModelController controller) throws IOException { delete(controller); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.destroy(controller); } clearSuccessors(); @@ -126,7 +127,7 @@ public class VMInterfaceModel extends ModelObjectBase { public InstanceIpModel getInstanceIp() { for (ModelObject successor : successors()) { if (successor.getClass() == InstanceIpModel.class) { - return (InstanceIpModel) successor; + return (InstanceIpModel)successor; } } return null; @@ -154,23 +155,23 @@ public class VMInterfaceModel extends ModelObjectBase { Network network = controller.getNetworkDao().findById(nic.getNetworkId()); switch (nic.getState()) { - case Allocated: - case Reserved: - _nicActive = true; - break; - default: - _nicActive = false; - break; + case Allocated: + case Reserved: + _nicActive = true; + break; + default: + _nicActive = false; + break; } switch (network.getState()) { - case Implemented: - case Setup: - _netActive = true; - break; - default: - _netActive = false; - break; + case Implemented: + case Setup: + _netActive = true; + break; + default: + _netActive = false; + break; } assert _vnModel != null; _networkId = _vnModel.getUuid(); @@ -200,7 +201,7 @@ public class VMInterfaceModel extends ModelObjectBase { ContrailManager manager = controller.getManager(); ApiConnector api = controller.getApiAccessor(); - VirtualMachineInterface vmi = (VirtualMachineInterface) api.findById(VirtualMachineInterface.class, _uuid); + VirtualMachineInterface vmi = (VirtualMachineInterface)api.findById(VirtualMachineInterface.class, _uuid); boolean create = false; if (vmi == null) { create = true; @@ -226,18 +227,18 @@ public class VMInterfaceModel extends ModelObjectBase { if (create) { if (!api.create(vmi)) { - throw new InternalErrorException("Unable to create virtual-machine-interface " + _uuid); + throw new InternalErrorException("Unable to create virtual-machine-interface " + _uuid); } } else { if (!api.update(vmi)) { - throw new InternalErrorException("Unable to update virtual-machine-interface " + _uuid); + throw new InternalErrorException("Unable to update virtual-machine-interface " + _uuid); } } api.read(vmi); int ipCount = 0; - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { if (successor.getClass() == InstanceIpModel.class) { ipCount++; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java index 91354d4e4c7..32d5d938996 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java @@ -22,9 +22,18 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; -import org.apache.cloudstack.network.contrail.management.ContrailManager; +import net.juniper.contrail.api.ApiConnector; +import net.juniper.contrail.api.types.Project; +import net.juniper.contrail.api.types.ServiceInstance; +import net.juniper.contrail.api.types.VirtualMachine; + import org.apache.log4j.Logger; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import org.apache.cloudstack.network.contrail.management.ContrailManager; + import com.cloud.exception.InternalErrorException; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; @@ -33,13 +42,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicVO; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.NicDao; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - -import net.juniper.contrail.api.types.Project; -import net.juniper.contrail.api.types.ServiceInstance; -import net.juniper.contrail.api.types.VirtualMachine; -import net.juniper.contrail.api.ApiConnector; public class VirtualMachineModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(VirtualMachineModel.class); @@ -80,8 +82,8 @@ public class VirtualMachineModel extends ModelObjectBase { if (userVm != null && userVm.getUserData() != null) { s_logger.debug("vm " + instance.getInstanceName() + " user data: " + userVm.getUserData()); final Gson json = new Gson(); - Map kvmap = json.fromJson(userVm.getUserData(), - new TypeToken>(){}.getType()); + Map kvmap = json.fromJson(userVm.getUserData(), new TypeToken>() { + }.getType()); String data = kvmap.get("service-instance"); if (data != null) { /* link the object with the service instance */ @@ -105,7 +107,7 @@ public class VirtualMachineModel extends ModelObjectBase { if (siModel == null) { ServiceInstance siObj; try { - siObj = (ServiceInstance) api.findById(ServiceInstance.class, serviceUuid); + siObj = (ServiceInstance)api.findById(ServiceInstance.class, serviceUuid); } catch (IOException ex) { s_logger.warn("service-instance read", ex); throw new CloudRuntimeException("Unable to read service-instance object", ex); @@ -122,7 +124,7 @@ public class VirtualMachineModel extends ModelObjectBase { public int compareTo(ModelObject o) { VirtualMachineModel other; try { - other = (VirtualMachineModel) o; + other = (VirtualMachineModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return VirtualMachineModel.class.getName().compareTo(clsname); @@ -133,7 +135,7 @@ public class VirtualMachineModel extends ModelObjectBase { @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.delete(controller); } @@ -143,7 +145,6 @@ public class VirtualMachineModel extends ModelObjectBase { s_logger.warn("virtual-machine delete", ex); } - if (_serviceModel != null) { _serviceModel.delete(controller); } @@ -153,7 +154,7 @@ public class VirtualMachineModel extends ModelObjectBase { public void destroy(ModelController controller) throws IOException { delete(controller); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.destroy(controller); } @@ -176,7 +177,6 @@ public class VirtualMachineModel extends ModelObjectBase { return _uuid; } - public VirtualMachine getVirtualMachine() { return _vm; } @@ -184,7 +184,7 @@ public class VirtualMachineModel extends ModelObjectBase { public VMInterfaceModel getVMInterface(String uuid) { TreeSet tree = successors(); VMInterfaceModel vmiKey = new VMInterfaceModel(uuid); - VMInterfaceModel current = (VMInterfaceModel) tree.ceiling(vmiKey); + VMInterfaceModel current = (VMInterfaceModel)tree.ceiling(vmiKey); if (current != null && current.getUuid().equals(uuid)) { return current; } @@ -197,21 +197,21 @@ public class VirtualMachineModel extends ModelObjectBase { boolean isActiveInstance(VMInstanceVO instance) { switch (instance.getState()) { - case Migrating: - case Starting: - case Running: - case Shutdowned: - case Stopped: - case Stopping: - return true; + case Migrating: + case Starting: + case Running: + case Shutdowned: + case Stopped: + case Stopping: + return true; - case Destroyed: - case Error: - case Expunging: - return false; + case Destroyed: + case Error: + case Expunging: + return false; - default: - s_logger.warn("Unknown VMInstance state " + instance.getState().getDescription()); + default: + s_logger.warn("Unknown VMInstance state " + instance.getState().getDescription()); } return true; } @@ -238,8 +238,7 @@ public class VirtualMachineModel extends ModelObjectBase { * Link the virtual machine with a service instance via programmatic API call. * @throws IOException */ - public void setServiceInstance(ModelController controller, VMInstanceVO instance, - ServiceInstanceModel serviceModel) throws IOException { + public void setServiceInstance(ModelController controller, VMInstanceVO instance, ServiceInstanceModel serviceModel) throws IOException { _serviceUuid = serviceModel.getUuid(); _serviceModel = serviceModel; serviceModel.addSuccessor(this); @@ -256,17 +255,17 @@ public class VirtualMachineModel extends ModelObjectBase { String tag; switch (nic.getDeviceId()) { - case 0: - tag = "management"; - break; - case 1: - tag = "left"; - break; - case 2: - tag = "right"; - break; - default: - tag = null; + case 0: + tag = "management"; + break; + case 1: + tag = "left"; + break; + case 2: + tag = "right"; + break; + default: + tag = null; } VMInterfaceModel vmiModel = getVMInterface(nic.getUuid()); @@ -274,8 +273,7 @@ public class VirtualMachineModel extends ModelObjectBase { vmiModel = new VMInterfaceModel(nic.getUuid()); vmiModel.addToVirtualMachine(this); NetworkVO network = networkDao.findById(nic.getNetworkId()); - VirtualNetworkModel vnModel = manager.getDatabase().lookupVirtualNetwork( - network.getUuid(), manager.getCanonicalName(network), network.getTrafficType()); + VirtualNetworkModel vnModel = manager.getDatabase().lookupVirtualNetwork(network.getUuid(), manager.getCanonicalName(network), network.getTrafficType()); assert vnModel != null; vmiModel.addToVirtualNetwork(vnModel); } @@ -291,13 +289,13 @@ public class VirtualMachineModel extends ModelObjectBase { VirtualMachine vm = _vm; if (vm == null) { - _vm = vm = (VirtualMachine) api.findById(VirtualMachine.class, _uuid); + _vm = vm = (VirtualMachine)api.findById(VirtualMachine.class, _uuid); if (vm == null) { vm = new VirtualMachine(); if (_projectId != null) { Project project; try { - project = (Project) api.findById(Project.class, _projectId); + project = (Project)api.findById(Project.class, _projectId); } catch (IOException ex) { s_logger.debug("project read", ex); throw new CloudRuntimeException("Failed to read project", ex); @@ -330,7 +328,7 @@ public class VirtualMachineModel extends ModelObjectBase { } } - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.update(controller); } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java index b1321fc1f63..547d4bd8b04 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java @@ -23,9 +23,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.cloudstack.network.contrail.management.ContrailManager; +import net.juniper.contrail.api.ApiConnector; +import net.juniper.contrail.api.ObjectReference; +import net.juniper.contrail.api.types.NetworkIpam; +import net.juniper.contrail.api.types.Project; +import net.juniper.contrail.api.types.SubnetType; +import net.juniper.contrail.api.types.VirtualNetwork; +import net.juniper.contrail.api.types.VnSubnetsType; + import org.apache.log4j.Logger; +import org.apache.cloudstack.network.contrail.management.ContrailManager; + import com.cloud.dc.VlanVO; import com.cloud.dc.dao.VlanDao; import com.cloud.exception.InternalErrorException; @@ -34,14 +43,6 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; -import net.juniper.contrail.api.ObjectReference; -import net.juniper.contrail.api.types.NetworkIpam; -import net.juniper.contrail.api.types.Project; -import net.juniper.contrail.api.types.SubnetType; -import net.juniper.contrail.api.types.VirtualNetwork; -import net.juniper.contrail.api.types.VnSubnetsType; -import net.juniper.contrail.api.ApiConnector; - public class VirtualNetworkModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(VirtualNetworkModel.class); @@ -102,7 +103,7 @@ public class VirtualNetworkModel extends ModelObjectBase { public int compareTo(ModelObject o) { VirtualNetworkModel other; try { - other = (VirtualNetworkModel) o; + other = (VirtualNetworkModel)o; } catch (ClassCastException ex) { String clsname = o.getClass().getName(); return VirtualNetworkModel.class.getName().compareTo(clsname); @@ -128,7 +129,7 @@ public class VirtualNetworkModel extends ModelObjectBase { @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.delete(controller); } @@ -143,7 +144,7 @@ public class VirtualNetworkModel extends ModelObjectBase { public void destroy(ModelController controller) throws IOException { delete(controller); - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.destroy(controller); } clearSuccessors(); @@ -157,7 +158,6 @@ public class VirtualNetworkModel extends ModelObjectBase { return _uuid; } - public VirtualNetwork getVirtualNetwork() { return _vn; } @@ -201,20 +201,20 @@ public class VirtualNetworkModel extends ModelObjectBase { VirtualNetwork vn = _vn; if (!isDynamicNetwork()) { - _vn = (VirtualNetwork) controller.getApiAccessor().findById(VirtualNetwork.class, _uuid); + _vn = (VirtualNetwork)controller.getApiAccessor().findById(VirtualNetwork.class, _uuid); return; } assert _uuid != null : "uuid is not set"; if (_vn == null) { - vn = _vn = (VirtualNetwork) controller.getApiAccessor().findById(VirtualNetwork.class, _uuid); + vn = _vn = (VirtualNetwork)controller.getApiAccessor().findById(VirtualNetwork.class, _uuid); if (vn == null) { vn = new VirtualNetwork(); if (_projectId != null) { Project project; try { - project = (Project) api.findById(Project.class, _projectId); + project = (Project)api.findById(Project.class, _projectId); } catch (IOException ex) { s_logger.debug("project read", ex); throw new CloudRuntimeException("Failed to read project", ex); @@ -234,7 +234,7 @@ public class VirtualNetworkModel extends ModelObjectBase { s_logger.debug("could not find default-network-ipam"); return; } - ipam = (NetworkIpam) api.findById(NetworkIpam.class, ipam_id); + ipam = (NetworkIpam)api.findById(NetworkIpam.class, ipam_id); if (ipam == null) { s_logger.debug("could not find NetworkIpam with ipam_id: " + ipam_id); return; @@ -283,7 +283,7 @@ public class VirtualNetworkModel extends ModelObjectBase { } } - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { successor.update(controller); } } @@ -292,7 +292,7 @@ public class VirtualNetworkModel extends ModelObjectBase { ApiConnector api = controller.getApiAccessor(); VlanDao vlanDao = controller.getVlanDao(); try { - _vn = (VirtualNetwork) api.findById(VirtualNetwork.class, _uuid); + _vn = (VirtualNetwork)api.findById(VirtualNetwork.class, _uuid); } catch (IOException e) { e.printStackTrace(); } @@ -307,7 +307,7 @@ public class VirtualNetworkModel extends ModelObjectBase { s_logger.debug("could not find default-network-ipam"); return; } - ipam = (NetworkIpam) api.findById(NetworkIpam.class, ipam_id); + ipam = (NetworkIpam)api.findById(NetworkIpam.class, ipam_id); if (ipam == null) { s_logger.debug("could not find NetworkIpam with ipam_id: " + ipam_id); return; @@ -350,7 +350,7 @@ public class VirtualNetworkModel extends ModelObjectBase { VlanDao vlanDao = controller.getVlanDao(); try { - _vn = (VirtualNetwork) api.findById(VirtualNetwork.class, _uuid); + _vn = (VirtualNetwork)api.findById(VirtualNetwork.class, _uuid); } catch (IOException e) { e.printStackTrace(); } @@ -366,7 +366,7 @@ public class VirtualNetworkModel extends ModelObjectBase { List dbSubnets = new ArrayList(); if (_trafficType == TrafficType.Public) { List vlan_list = vlanDao.listVlansByNetworkId(_id); - for (VlanVO vlan:vlan_list) { + for (VlanVO vlan : vlan_list) { String cidr = NetUtils.ipAndNetMaskToCidr(vlan.getVlanGateway(), vlan.getVlanNetmask()); dbSubnets.add(vlan.getVlanGateway() + cidr); } @@ -382,14 +382,13 @@ public class VirtualNetworkModel extends ModelObjectBase { } if (ipamRefs != null) { - for (ObjectReference ref: ipamRefs) { + for (ObjectReference ref : ipamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); if (vnSubnetType != null) { List subnets = vnSubnetType.getIpamSubnets(); if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); - vncSubnets.add(ipamSubnet.getDefaultGateway() + - ipamSubnet.getSubnet().getIpPrefix() +"/" + ipamSubnet.getSubnet().getIpPrefixLen()); + vncSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + "/" + ipamSubnet.getSubnet().getIpPrefixLen()); } } } @@ -399,12 +398,11 @@ public class VirtualNetworkModel extends ModelObjectBase { diff.removeAll(vncSubnets); if (!diff.isEmpty()) { - s_logger.debug("Subnets changed, network: " + this._name + - "; db: " + dbSubnets + ", vnc: " + vncSubnets + ", diff: " + diff); + s_logger.debug("Subnets changed, network: " + this._name + "; db: " + dbSubnets + ", vnc: " + vncSubnets + ", diff: " + diff); return false; } - for (ModelObject successor: successors()) { + for (ModelObject successor : successors()) { if (!successor.verify(controller)) { return false; } @@ -420,7 +418,7 @@ public class VirtualNetworkModel extends ModelObjectBase { assert this._vn != null : "vnc virtual network current is not initialized"; try { - latest = (VirtualNetworkModel) o; + latest = (VirtualNetworkModel)o; } catch (ClassCastException ex) { s_logger.warn("Invalid model object is passed to cast to VirtualNetworkModel"); return false; @@ -439,9 +437,7 @@ public class VirtualNetworkModel extends ModelObjectBase { List currentSubnets = new ArrayList(); List newSubnets = new ArrayList(); - - if ((currentIpamRefs == null && newIpamRefs != null) || - (currentIpamRefs != null && newIpamRefs == null)) { //Check for existence only + if ((currentIpamRefs == null && newIpamRefs != null) || (currentIpamRefs != null && newIpamRefs == null)) { //Check for existence only s_logger.debug("ipams differ: current=" + currentIpamRefs + ", new=" + newIpamRefs); return false; } @@ -449,26 +445,24 @@ public class VirtualNetworkModel extends ModelObjectBase { return true; } - for (ObjectReference ref: currentIpamRefs) { + for (ObjectReference ref : currentIpamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); if (vnSubnetType != null) { List subnets = vnSubnetType.getIpamSubnets(); if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); - currentSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + - "/" + ipamSubnet.getSubnet().getIpPrefixLen()); + currentSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + "/" + ipamSubnet.getSubnet().getIpPrefixLen()); } } } - for (ObjectReference ref: newIpamRefs) { + for (ObjectReference ref : newIpamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); if (vnSubnetType != null) { List subnets = vnSubnetType.getIpamSubnets(); if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); - newSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + - "/" + ipamSubnet.getSubnet().getIpPrefixLen()); + newSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + "/" + ipamSubnet.getSubnet().getIpPrefixLen()); } } } @@ -477,8 +471,7 @@ public class VirtualNetworkModel extends ModelObjectBase { diff.removeAll(newSubnets); if (!diff.isEmpty()) { - s_logger.debug("Subnets differ, network: " + this._name + - "; db: " + currentSubnets + ", vnc: " + newSubnets + ", diff: " + diff); + s_logger.debug("Subnets differ, network: " + this._name + "; db: " + currentSubnets + ", vnc: " + newSubnets + ", diff: " + diff); return false; } @@ -488,6 +481,7 @@ public class VirtualNetworkModel extends ModelObjectBase { public FloatingIpPoolModel getFipPoolModel() { return _fipPoolModel; } + public void setFipPoolModel(FloatingIpPoolModel fipPoolModel) { _fipPoolModel = fipPoolModel; } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java index e70ac5eeca0..0c5df069557 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ApiConnectorMockito.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.network.contrail.management; +import static org.mockito.Mockito.spy; + import java.io.IOException; import java.util.List; import java.util.Map; @@ -29,17 +31,14 @@ import net.juniper.contrail.api.ObjectReference; import net.juniper.contrail.api.types.NetworkIpam; import org.apache.log4j.Logger; -import static org.mockito.Mockito.*; import com.google.common.collect.ImmutableMap; public class ApiConnectorMockito implements ApiConnector { - private static final Logger s_logger = - Logger.getLogger(ApiConnectorMockito.class); + private static final Logger s_logger = Logger.getLogger(ApiConnectorMockito.class); - static final Map object_map = new ImmutableMap.Builder(). - put("network-ipam:default-network-ipam", new NetworkIpam()). - build(); + static final Map object_map = new ImmutableMap.Builder().put("network-ipam:default-network-ipam", new NetworkIpam()) + .build(); private ApiConnectorMock _mock; private ApiConnector _spy; @@ -65,15 +64,13 @@ public class ApiConnectorMockito implements ApiConnector { } @Override - public void delete(Class arg0, String arg1) - throws IOException { + public void delete(Class arg0, String arg1) throws IOException { s_logger.debug("create " + arg0.getName() + " id: " + arg1); _spy.delete(arg0, arg1); } @Override - public ApiObjectBase find(Class arg0, - ApiObjectBase arg1, String arg2) throws IOException { + public ApiObjectBase find(Class arg0, ApiObjectBase arg1, String arg2) throws IOException { StringBuilder msg = new StringBuilder(); msg.append("find " + arg0.getName()); if (arg1 != null) { @@ -85,29 +82,25 @@ public class ApiConnectorMockito implements ApiConnector { } @Override - public ApiObjectBase findByFQN(Class arg0, - String arg1) throws IOException { + public ApiObjectBase findByFQN(Class arg0, String arg1) throws IOException { s_logger.debug("find " + arg0.getName() + " name: " + arg1); return _mock.findByFQN(arg0, arg1); } @Override - public ApiObjectBase findById(Class arg0, - String arg1) throws IOException { + public ApiObjectBase findById(Class arg0, String arg1) throws IOException { s_logger.debug("find " + arg0.getName() + " id: " + arg1); return _mock.findById(arg0, arg1); } @Override - public String findByName(Class arg0, - List arg1) throws IOException { + public String findByName(Class arg0, List arg1) throws IOException { s_logger.debug("find " + arg0.getName() + " name: " + arg1); return _mock.findByName(arg0, arg1); } @Override - public String findByName(Class arg0, - ApiObjectBase arg1, String arg2) throws IOException { + public String findByName(Class arg0, ApiObjectBase arg1, String arg2) throws IOException { StringBuilder msg = new StringBuilder(); msg.append("findByName " + arg0.getName()); if (arg1 != null) { @@ -119,17 +112,13 @@ public class ApiConnectorMockito implements ApiConnector { } @Override - public List getObjects( - Class arg0, List> arg1) - throws IOException { + public List getObjects(Class arg0, List> arg1) throws IOException { s_logger.debug("getObjects" + arg0.getName()); return _mock.getObjects(arg0, arg1); } @Override - public List list( - Class arg0, List arg1) - throws IOException { + public List list(Class arg0, List arg1) throws IOException { s_logger.debug("list" + arg0.getName()); return _mock.list(arg0, arg1); } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java index 83ef6f56d59..8b14a42219f 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java @@ -21,35 +21,7 @@ import java.io.IOException; import javax.inject.Inject; -import com.cloud.network.dao.IPAddressDao; -import com.cloud.network.IpAddress; - -import org.apache.cloudstack.acl.APIChecker; -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.affinity.AffinityGroupService; -import org.apache.cloudstack.affinity.AffinityGroupVO; -import org.apache.cloudstack.affinity.dao.AffinityGroupDao; -import org.apache.cloudstack.affinity.dao.AffinityGroupDaoImpl; -import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDaoImpl; -import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDaoImpl; -import org.apache.cloudstack.api.IdentityService; -import org.apache.cloudstack.engine.service.api.OrchestrationService; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; -import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDaoImpl; -import org.apache.cloudstack.query.QueryService; -import org.apache.cloudstack.region.PortableIpDaoImpl; -import org.apache.cloudstack.region.PortableIpRangeDaoImpl; -import org.apache.cloudstack.region.RegionManager; -import org.apache.cloudstack.region.dao.RegionDaoImpl; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; -import org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl; -import org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl; -import org.apache.cloudstack.usage.UsageService; +import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -62,6 +34,50 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.acl.APIChecker; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.affinity.AffinityGroupService; +import org.apache.cloudstack.affinity.AffinityGroupVO; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupDaoImpl; +import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDaoImpl; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDaoImpl; +import org.apache.cloudstack.api.IdentityService; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DcDetailsDaoImpl; +import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; +import org.apache.cloudstack.engine.service.api.OrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; +import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.framework.config.ConfigDepot; +import org.apache.cloudstack.framework.config.ConfigDepotAdmin; +import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; +import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher; +import org.apache.cloudstack.framework.jobs.dao.AsyncJobDaoImpl; +import org.apache.cloudstack.framework.jobs.dao.AsyncJobJoinMapDaoImpl; +import org.apache.cloudstack.framework.jobs.dao.AsyncJobJournalDaoImpl; +import org.apache.cloudstack.framework.jobs.dao.SyncQueueItemDaoImpl; +import org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl; +import org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor; +import org.apache.cloudstack.framework.jobs.impl.SyncQueueManager; +import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDaoImpl; +import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService; +import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager; +import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService; +import org.apache.cloudstack.query.QueryService; +import org.apache.cloudstack.region.PortableIpDaoImpl; +import org.apache.cloudstack.region.PortableIpRangeDaoImpl; +import org.apache.cloudstack.region.RegionManager; +import org.apache.cloudstack.region.dao.RegionDaoImpl; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl; +import org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl; +import org.apache.cloudstack.usage.UsageService; + import com.cloud.acl.DomainChecker; import com.cloud.agent.AgentManager; import com.cloud.agent.manager.allocator.HostAllocator; @@ -94,9 +110,6 @@ import com.cloud.cluster.ClusterManager; import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; import com.cloud.cluster.dao.ManagementServerHostDaoImpl; import com.cloud.configuration.ConfigurationManagerImpl; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; - import com.cloud.configuration.dao.ResourceCountDaoImpl; import com.cloud.configuration.dao.ResourceLimitDaoImpl; import com.cloud.consoleproxy.ConsoleProxyManager; @@ -105,11 +118,11 @@ import com.cloud.dc.ClusterDetailsDaoImpl; import com.cloud.dc.DataCenter; import com.cloud.dc.dao.AccountVlanMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DcDetailsDaoImpl; import com.cloud.dc.dao.DedicatedResourceDaoImpl; import com.cloud.dc.dao.HostPodDaoImpl; import com.cloud.dc.dao.PodVlanDaoImpl; @@ -129,6 +142,8 @@ import com.cloud.host.dao.HostTagsDaoImpl; import com.cloud.hypervisor.HypervisorGuruManagerImpl; import com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl; import com.cloud.network.ExternalDeviceUsageManager; +import com.cloud.network.IpAddress; +import com.cloud.network.IpAddressManagerImpl; import com.cloud.network.Ipv6AddressManagerImpl; import com.cloud.network.NetworkModelImpl; import com.cloud.network.NetworkServiceImpl; @@ -146,6 +161,7 @@ import com.cloud.network.as.dao.CounterDaoImpl; import com.cloud.network.dao.AccountGuestVlanMapDaoImpl; import com.cloud.network.dao.FirewallRulesCidrsDaoImpl; import com.cloud.network.dao.FirewallRulesDaoImpl; +import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.LBHealthCheckPolicyDaoImpl; import com.cloud.network.dao.LBStickinessPolicyDaoImpl; import com.cloud.network.dao.LoadBalancerDaoImpl; @@ -193,18 +209,15 @@ import com.cloud.network.vpc.dao.VpcOfferingServiceMapDaoImpl; import com.cloud.network.vpc.dao.VpcServiceMapDaoImpl; import com.cloud.network.vpn.RemoteAccessVpnService; import com.cloud.network.vpn.Site2SiteVpnManager; -import com.cloud.projects.dao.ProjectInvitationDaoImpl; -import com.cloud.dc.DataCenter; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.offerings.dao.NetworkOfferingDaoImpl; -import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offering.NetworkOffering; +import com.cloud.offerings.dao.NetworkOfferingDao; +import com.cloud.offerings.dao.NetworkOfferingDaoImpl; import com.cloud.offerings.dao.NetworkOfferingDetailsDaoImpl; import com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl; -import com.cloud.projects.ProjectManager; -import com.cloud.projects.dao.ProjectAccountDaoImpl; import com.cloud.projects.ProjectManagerImpl; +import com.cloud.projects.dao.ProjectAccountDaoImpl; import com.cloud.projects.dao.ProjectDaoImpl; +import com.cloud.projects.dao.ProjectInvitationDaoImpl; import com.cloud.region.ha.GlobalLoadBalancingRulesService; import com.cloud.resource.ResourceManager; import com.cloud.server.ConfigurationServerImpl; @@ -217,6 +230,7 @@ import com.cloud.service.dao.ServiceOfferingDaoImpl; import com.cloud.service.dao.ServiceOfferingDetailsDaoImpl; import com.cloud.storage.DataStoreProviderApiService; import com.cloud.storage.StorageManager; +import com.cloud.storage.VolumeApiService; import com.cloud.storage.dao.DiskOfferingDaoImpl; import com.cloud.storage.dao.GuestOSCategoryDaoImpl; import com.cloud.storage.dao.GuestOSDaoImpl; @@ -235,28 +249,26 @@ import com.cloud.storage.dao.VolumeHostDaoImpl; import com.cloud.storage.secondary.SecondaryStorageVmManager; import com.cloud.storage.snapshot.SnapshotApiService; import com.cloud.storage.snapshot.SnapshotManager; -import com.cloud.storage.VolumeApiService; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.tags.dao.ResourceTagsDaoImpl; import com.cloud.template.TemplateApiService; import com.cloud.template.TemplateManager; import com.cloud.user.Account; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.AccountManager; -import com.cloud.user.User; -import com.cloud.user.UserVO; -import com.cloud.user.dao.UserDao; import com.cloud.user.AccountDetailsDaoImpl; import com.cloud.user.AccountVO; import com.cloud.user.DomainManagerImpl; import com.cloud.user.ResourceLimitService; +import com.cloud.user.User; +import com.cloud.user.UserVO; +import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.AccountDaoImpl; import com.cloud.user.dao.SSHKeyPairDaoImpl; +import com.cloud.user.dao.UserDao; import com.cloud.user.dao.UserDaoImpl; import com.cloud.user.dao.UserStatisticsDaoImpl; import com.cloud.user.dao.UserStatsLogDaoImpl; import com.cloud.user.dao.VmDiskStatisticsDaoImpl; -import com.cloud.utils.db.DB; +import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; @@ -276,219 +288,42 @@ import com.cloud.vm.dao.VMInstanceDaoImpl; import com.cloud.vm.snapshot.VMSnapshotManager; import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl; -import org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl; -import org.apache.cloudstack.framework.jobs.dao.AsyncJobDaoImpl; -import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; - -import com.cloud.network.IpAddressManagerImpl; - -import org.apache.cloudstack.framework.config.ConfigDepot; -import org.apache.cloudstack.framework.jobs.dao.SyncQueueItemDaoImpl; -import org.apache.cloudstack.framework.jobs.impl.SyncQueueManager; -import org.apache.cloudstack.framework.jobs.dao.AsyncJobJournalDaoImpl; -import org.apache.cloudstack.framework.jobs.dao.AsyncJobJoinMapDaoImpl; -import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher; -import org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor; -import org.apache.cloudstack.framework.config.ConfigDepotAdmin; -import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager; -import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService; -import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService; - -import com.cloud.utils.db.EntityManager; - -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.network.contrail.management.ContrailElementImpl; -import org.apache.cloudstack.network.contrail.management.ContrailGuru; -import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl; -import org.apache.cloudstack.network.contrail.management.EventUtils; -import org.apache.cloudstack.network.contrail.management.ServerEventHandlerImpl; - - -@ComponentScan(basePackageClasses={ - AccountDaoImpl.class, - AccountDetailsDaoImpl.class, - AccountGuestVlanMapDaoImpl.class, - AccountJoinDaoImpl.class, - AccountVlanMapDaoImpl.class, - AffinityGroupDaoImpl.class, - AffinityGroupDomainMapDaoImpl.class, - AffinityGroupJoinDaoImpl.class, - AffinityGroupVMMapDaoImpl.class, - ApiDBUtils.class, - ApplicationLoadBalancerRuleDaoImpl.class, - AsyncJobDaoImpl.class, - AsyncJobJoinDaoImpl.class, - AsyncJobJoinMapDaoImpl.class, - AsyncJobJournalDaoImpl.class, - AsyncJobManagerImpl.class, - AutoScalePolicyConditionMapDaoImpl.class, - AutoScalePolicyDaoImpl.class, - AutoScaleVmGroupDaoImpl.class, - AutoScaleVmGroupPolicyMapDaoImpl.class, - AutoScaleVmProfileDaoImpl.class, - CapacityDaoImpl.class, - ClusterDaoImpl.class, - ClusterDetailsDaoImpl.class, - ConditionDaoImpl.class, - ConfigurationDaoImpl.class, - ConfigurationManagerImpl.class, - ConfigurationServerImpl.class, - ConsoleProxyDaoImpl.class, - ContrailElementImpl.class, - ContrailGuru.class, - ContrailManagerImpl.class, - CounterDaoImpl.class, - DataCenterDaoImpl.class, - DataCenterIpAddressDaoImpl.class, - DataCenterJoinDaoImpl.class, - DataCenterLinkLocalIpAddressDaoImpl.class, - DataCenterVnetDaoImpl.class, - DcDetailsDaoImpl.class, - DedicatedResourceDaoImpl.class, - DiskOfferingDaoImpl.class, - DiskOfferingJoinDaoImpl.class, - DomainDaoImpl.class, - DomainManagerImpl.class, - DomainRouterDaoImpl.class, - DomainRouterJoinDaoImpl.class, - EventDaoImpl.class, - EventJoinDaoImpl.class, - EventUtils.class, - EventUtils.class, - FirewallManagerImpl.class, - FirewallRulesCidrsDaoImpl.class, - FirewallRulesDaoImpl.class, - GuestOSCategoryDaoImpl.class, - GuestOSDaoImpl.class, - HostDaoImpl.class, - HostDetailsDaoImpl.class, - HostJoinDaoImpl.class, - HostPodDaoImpl.class, - HostTagsDaoImpl.class, - HostTransferMapDaoImpl.class, - HypervisorCapabilitiesDaoImpl.class, - HypervisorGuruManagerImpl.class, - IdentityDaoImpl.class, - ImageStoreDaoImpl.class, - ImageStoreJoinDaoImpl.class, - InstanceGroupDaoImpl.class, - InstanceGroupJoinDaoImpl.class, - InstanceGroupVMMapDaoImpl.class, - IpAddressManagerImpl.class, - Ipv6AddressManagerImpl.class, - ItWorkDaoImpl.class, - LBHealthCheckPolicyDaoImpl.class, - LBStickinessPolicyDaoImpl.class, - LaunchPermissionDao.class, - LoadBalancerDaoImpl.class, - LoadBalancerVMMapDaoImpl.class, - LoadBalancingRulesManagerImpl.class, - ManagementServerHostDaoImpl.class, - MockAccountManager.class, - NetworkACLDaoImpl.class, - NetworkACLItemDaoImpl.class, - NetworkACLManagerImpl.class, - NetworkAccountDaoImpl.class, - NetworkDaoImpl.class, - NetworkDomainDaoImpl.class, - NetworkModelImpl.class, - NetworkOfferingDaoImpl.class, - NetworkOfferingDetailsDaoImpl.class, - NetworkOfferingServiceMapDaoImpl.class, - NetworkOpDaoImpl.class, - NetworkRuleConfigDaoImpl.class, - NetworkServiceImpl.class, - NetworkServiceMapDaoImpl.class, - NicIpAliasDaoImpl.class, - NicSecondaryIpDaoImpl.class, - PhysicalNetworkDaoImpl.class, - PhysicalNetworkServiceProviderDaoImpl.class, - PhysicalNetworkTrafficTypeDaoImpl.class, - PlannerHostReservationDaoImpl.class, - PodVlanDaoImpl.class, - PodVlanMapDaoImpl.class, - PortForwardingRulesDaoImpl.class, - PortableIpDaoImpl.class, - PortableIpRangeDaoImpl.class, - PrimaryDataStoreDaoImpl.class, - PrivateIpDaoImpl.class, - ProjectAccountDaoImpl.class, - ProjectAccountJoinDaoImpl.class, - ProjectInvitationDaoImpl.class, - ProjectDaoImpl.class, - ProjectInvitationJoinDaoImpl.class, - ProjectJoinDaoImpl.class, - ProjectManagerImpl.class, - RegionDaoImpl.class, - RemoteAccessVpnDaoImpl.class, - ResourceCountDaoImpl.class, - ResourceLimitDaoImpl.class, - ResourceTagDao.class, - ResourceTagJoinDaoImpl.class, - ResourceTagsDaoImpl.class, - RouterNetworkDaoImpl.class, - RulesManagerImpl.class, - SSHKeyPairDaoImpl.class, - SecondaryStorageVmDaoImpl.class, - SecurityGroupDaoImpl.class, - SecurityGroupJoinDaoImpl.class, - SecurityGroupRuleDaoImpl.class, - SecurityGroupRulesDaoImpl.class, - SecurityGroupVMMapDaoImpl.class, - SecurityGroupWorkDaoImpl.class, - ServerEventHandlerImpl.class, - ServiceOfferingDaoImpl.class, - ServiceOfferingDetailsDaoImpl.class, - ServiceOfferingJoinDaoImpl.class, - Site2SiteCustomerGatewayDaoImpl.class, - Site2SiteVpnConnectionDaoImpl.class, - Site2SiteVpnGatewayDaoImpl.class, - SnapshotDaoImpl.class, - SnapshotPolicyDaoImpl.class, - StaticRouteDaoImpl.class, - StatsCollector.class, - StoragePoolDetailsDaoImpl.class, - StoragePoolHostDaoImpl.class, - StoragePoolJoinDaoImpl.class, - SyncQueueItemDaoImpl.class, - TemplateDataStoreDaoImpl.class, - TemplateJoinDaoImpl.class, - UploadDaoImpl.class, - UsageEventDaoImpl.class, - UserAccountJoinDaoImpl.class, - UserDaoImpl.class, - UserIpv6AddressDaoImpl.class, - UserStatisticsDaoImpl.class, - UserStatsLogDaoImpl.class, - UserVmCloneSettingDaoImpl.class, - UserVmDaoImpl.class, - UserVmDetailsDaoImpl.class, - UserVmJoinDaoImpl.class, - VMInstanceDaoImpl.class, - VMSnapshotDaoImpl.class, - VMTemplateDaoImpl.class, - VMTemplateDetailsDaoImpl.class, - VMTemplateHostDaoImpl.class, - VMTemplateZoneDaoImpl.class, - VirtualRouterProviderDaoImpl.class, - VlanDaoImpl.class, - VmDiskStatisticsDaoImpl.class, - VmRulesetLogDaoImpl.class, - VolumeDaoImpl.class, - VolumeHostDaoImpl.class, - VolumeJoinDaoImpl.class, - VpcDaoImpl.class, - VpcGatewayDaoImpl.class, - VpcManagerImpl.class, - VpcOfferingDaoImpl.class, - VpcOfferingServiceMapDaoImpl.class, - VpcServiceMapDaoImpl.class, - VpcVirtualNetworkApplianceManagerImpl.class, - VpnUserDaoImpl.class -}, -includeFilters={@Filter(value=IntegrationTestConfiguration.ComponentFilter.class, type=FilterType.CUSTOM)}, -useDefaultFilters=false) - +@ComponentScan(basePackageClasses = {AccountDaoImpl.class, AccountDetailsDaoImpl.class, AccountGuestVlanMapDaoImpl.class, AccountJoinDaoImpl.class, + AccountVlanMapDaoImpl.class, AffinityGroupDaoImpl.class, AffinityGroupDomainMapDaoImpl.class, AffinityGroupJoinDaoImpl.class, AffinityGroupVMMapDaoImpl.class, + ApiDBUtils.class, ApplicationLoadBalancerRuleDaoImpl.class, AsyncJobDaoImpl.class, AsyncJobJoinDaoImpl.class, AsyncJobJoinMapDaoImpl.class, + AsyncJobJournalDaoImpl.class, AsyncJobManagerImpl.class, AutoScalePolicyConditionMapDaoImpl.class, AutoScalePolicyDaoImpl.class, AutoScaleVmGroupDaoImpl.class, + AutoScaleVmGroupPolicyMapDaoImpl.class, AutoScaleVmProfileDaoImpl.class, CapacityDaoImpl.class, ClusterDaoImpl.class, ClusterDetailsDaoImpl.class, + ConditionDaoImpl.class, ConfigurationDaoImpl.class, ConfigurationManagerImpl.class, ConfigurationServerImpl.class, ConsoleProxyDaoImpl.class, + ContrailElementImpl.class, ContrailGuru.class, ContrailManagerImpl.class, CounterDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, + DataCenterJoinDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, DcDetailsDaoImpl.class, DedicatedResourceDaoImpl.class, + DiskOfferingDaoImpl.class, DiskOfferingJoinDaoImpl.class, DomainDaoImpl.class, DomainManagerImpl.class, DomainRouterDaoImpl.class, DomainRouterJoinDaoImpl.class, + EventDaoImpl.class, EventJoinDaoImpl.class, EventUtils.class, EventUtils.class, FirewallManagerImpl.class, FirewallRulesCidrsDaoImpl.class, + FirewallRulesDaoImpl.class, GuestOSCategoryDaoImpl.class, GuestOSDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostJoinDaoImpl.class, + HostPodDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, HypervisorCapabilitiesDaoImpl.class, HypervisorGuruManagerImpl.class, + IdentityDaoImpl.class, ImageStoreDaoImpl.class, ImageStoreJoinDaoImpl.class, InstanceGroupDaoImpl.class, InstanceGroupJoinDaoImpl.class, + InstanceGroupVMMapDaoImpl.class, IpAddressManagerImpl.class, Ipv6AddressManagerImpl.class, ItWorkDaoImpl.class, LBHealthCheckPolicyDaoImpl.class, + LBStickinessPolicyDaoImpl.class, LaunchPermissionDao.class, LoadBalancerDaoImpl.class, LoadBalancerVMMapDaoImpl.class, LoadBalancingRulesManagerImpl.class, + ManagementServerHostDaoImpl.class, MockAccountManager.class, NetworkACLDaoImpl.class, NetworkACLItemDaoImpl.class, NetworkACLManagerImpl.class, + NetworkAccountDaoImpl.class, NetworkDaoImpl.class, NetworkDomainDaoImpl.class, NetworkModelImpl.class, NetworkOfferingDaoImpl.class, + NetworkOfferingDetailsDaoImpl.class, NetworkOfferingServiceMapDaoImpl.class, NetworkOpDaoImpl.class, NetworkRuleConfigDaoImpl.class, NetworkServiceImpl.class, + NetworkServiceMapDaoImpl.class, NicIpAliasDaoImpl.class, NicSecondaryIpDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class, + PhysicalNetworkTrafficTypeDaoImpl.class, PlannerHostReservationDaoImpl.class, PodVlanDaoImpl.class, PodVlanMapDaoImpl.class, PortForwardingRulesDaoImpl.class, + PortableIpDaoImpl.class, PortableIpRangeDaoImpl.class, PrimaryDataStoreDaoImpl.class, PrivateIpDaoImpl.class, ProjectAccountDaoImpl.class, + ProjectAccountJoinDaoImpl.class, ProjectInvitationDaoImpl.class, ProjectDaoImpl.class, ProjectInvitationJoinDaoImpl.class, ProjectJoinDaoImpl.class, + ProjectManagerImpl.class, RegionDaoImpl.class, RemoteAccessVpnDaoImpl.class, ResourceCountDaoImpl.class, ResourceLimitDaoImpl.class, ResourceTagDao.class, + ResourceTagJoinDaoImpl.class, ResourceTagsDaoImpl.class, RouterNetworkDaoImpl.class, RulesManagerImpl.class, SSHKeyPairDaoImpl.class, + SecondaryStorageVmDaoImpl.class, SecurityGroupDaoImpl.class, SecurityGroupJoinDaoImpl.class, SecurityGroupRuleDaoImpl.class, SecurityGroupRulesDaoImpl.class, + SecurityGroupVMMapDaoImpl.class, SecurityGroupWorkDaoImpl.class, ServerEventHandlerImpl.class, ServiceOfferingDaoImpl.class, ServiceOfferingDetailsDaoImpl.class, + ServiceOfferingJoinDaoImpl.class, Site2SiteCustomerGatewayDaoImpl.class, Site2SiteVpnConnectionDaoImpl.class, Site2SiteVpnGatewayDaoImpl.class, + SnapshotDaoImpl.class, SnapshotPolicyDaoImpl.class, StaticRouteDaoImpl.class, StatsCollector.class, StoragePoolDetailsDaoImpl.class, StoragePoolHostDaoImpl.class, + StoragePoolJoinDaoImpl.class, SyncQueueItemDaoImpl.class, TemplateDataStoreDaoImpl.class, TemplateJoinDaoImpl.class, UploadDaoImpl.class, UsageEventDaoImpl.class, + UserAccountJoinDaoImpl.class, UserDaoImpl.class, UserIpv6AddressDaoImpl.class, UserStatisticsDaoImpl.class, UserStatsLogDaoImpl.class, + UserVmCloneSettingDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, UserVmJoinDaoImpl.class, VMInstanceDaoImpl.class, VMSnapshotDaoImpl.class, + VMTemplateDaoImpl.class, VMTemplateDetailsDaoImpl.class, VMTemplateHostDaoImpl.class, VMTemplateZoneDaoImpl.class, VirtualRouterProviderDaoImpl.class, + VlanDaoImpl.class, VmDiskStatisticsDaoImpl.class, VmRulesetLogDaoImpl.class, VolumeDaoImpl.class, VolumeHostDaoImpl.class, VolumeJoinDaoImpl.class, VpcDaoImpl.class, + VpcGatewayDaoImpl.class, VpcManagerImpl.class, VpcOfferingDaoImpl.class, VpcOfferingServiceMapDaoImpl.class, VpcServiceMapDaoImpl.class, + VpcVirtualNetworkApplianceManagerImpl.class, VpnUserDaoImpl.class}, includeFilters = {@Filter(value = IntegrationTestConfiguration.ComponentFilter.class, + type = FilterType.CUSTOM)}, useDefaultFilters = false) @Configuration public class IntegrationTestConfiguration { public static class ComponentFilter implements TypeFilter { @@ -519,25 +354,31 @@ public class IntegrationTestConfiguration { @Inject AffinityGroupDao _affinityGroupDao; - @Inject AccountDao _accountDao; - @Inject UserDao _userDao; - @Inject NetworkOfferingDao _networkOfferingDao; - @Inject DataCenterDao _zoneDao; - @Inject IPAddressDao _ipAddressDao; - + @Inject + AccountDao _accountDao; + @Inject + UserDao _userDao; + @Inject + NetworkOfferingDao _networkOfferingDao; + @Inject + DataCenterDao _zoneDao; + @Inject + IPAddressDao _ipAddressDao; @Bean public AffinityGroupService affinityGroupService() { AffinityGroupService mock = Mockito.mock(AffinityGroupService.class); try { - final AffinityGroupVO gmock = new AffinityGroupVO("grp1", "grp-type", "affinity group", 1, AccountVO.ACCOUNT_ID_SYSTEM, ControlledEntity.ACLType.Account); - Transaction.execute(new TransactionCallbackNoReturn() { - @Override - public void doInTransactionWithoutResult(TransactionStatus status) { - _affinityGroupDao.persist(gmock); - } - }); - Mockito.when(mock.createAffinityGroupInternal(Mockito.any(String.class), Mockito.any(Long.class), Mockito.any(String.class), Mockito.any(String.class), Mockito.any(String.class))).thenReturn(gmock); + final AffinityGroupVO gmock = new AffinityGroupVO("grp1", "grp-type", "affinity group", 1, Account.ACCOUNT_ID_SYSTEM, ControlledEntity.ACLType.Account); + Transaction.execute(new TransactionCallbackNoReturn() { + @Override + public void doInTransactionWithoutResult(TransactionStatus status) { + _affinityGroupDao.persist(gmock); + } + }); + Mockito.when( + mock.createAffinityGroupInternal(Matchers.any(String.class), Matchers.any(Long.class), Matchers.any(String.class), Matchers.any(String.class), + Matchers.any(String.class))).thenReturn(gmock); } catch (Exception e) { e.printStackTrace(); } @@ -563,6 +404,7 @@ public class IntegrationTestConfiguration { public AsyncJobDispatcher asyncJobDispatcher() { return Mockito.mock(AsyncJobDispatcher.class); } + @Bean public AsyncJobMonitor asyncJobMonitor() { return Mockito.mock(AsyncJobMonitor.class); @@ -572,261 +414,302 @@ public class IntegrationTestConfiguration { public AutoScaleService autoScaleService() { return Mockito.mock(AutoScaleService.class); } + @Bean public CapacityManager capacityManager() { return Mockito.mock(CapacityManager.class); } + @Bean public ClusterManager clusterManager() { return Mockito.mock(ClusterManager.class); } + @Bean public ConfigDepot configDepot() { return Mockito.mock(ConfigDepot.class); } + @Bean public ConfigDepotAdmin configDepotAdmin() { return Mockito.mock(ConfigDepotAdmin.class); } + @Bean public ConsoleProxyManager consoleProxyManager() { return Mockito.mock(ConsoleProxyManager.class); } + @Bean public ConsoleProxyService consoleProxyService() { return Mockito.mock(ConsoleProxyService.class); } + @Bean public DataStoreManager dataStoreManager() { return Mockito.mock(DataStoreManager.class); } + @Bean public DataStoreProviderApiService dataStoreProviderApiService() { return Mockito.mock(DataStoreProviderApiService.class); } + @Bean public DeploymentPlanner deploymentPlanner() { return Mockito.mock(DeploymentPlanner.class); } + @Bean public DeploymentPlanningManager deploymentPlanningManager() { return Mockito.mock(DeploymentPlanningManager.class); } + @Bean public DomainChecker domainChecker() { DomainChecker mock = Mockito.mock(DomainChecker.class); try { - Mockito.when(mock.checkAccess(Mockito.any(Account.class), Mockito.any(DataCenter.class))).thenReturn(true); + Mockito.when(mock.checkAccess(Matchers.any(Account.class), Matchers.any(DataCenter.class))).thenReturn(true); } catch (Exception e) { e.printStackTrace(); } return mock; } + @Bean public EndPointSelector endPointSelector() { return Mockito.mock(EndPointSelector.class); } + @Bean public EntityManager entityManager() { EntityManager mock = Mockito.mock(EntityManager.class); try { - Mockito.when(mock.findById(Mockito.same(Account.class), Mockito.anyLong())).thenReturn(_accountDao.findById(AccountVO.ACCOUNT_ID_SYSTEM)); - Mockito.when(mock.findById(Mockito.same(User.class), Mockito.anyLong())).thenReturn(_userDao.findById(UserVO.UID_SYSTEM)); - Mockito.when(mock.findById(Mockito.same(NetworkOffering.class), Mockito.any(Long.class))).thenAnswer( - new Answer() - { - @Override - public NetworkOffering answer(final InvocationOnMock invocation) throws Throwable - { - Long id = (Long) invocation.getArguments()[1]; - return _networkOfferingDao.findById(id); - } + Mockito.when(mock.findById(Matchers.same(Account.class), Matchers.anyLong())).thenReturn(_accountDao.findById(Account.ACCOUNT_ID_SYSTEM)); + Mockito.when(mock.findById(Matchers.same(User.class), Matchers.anyLong())).thenReturn(_userDao.findById(User.UID_SYSTEM)); + Mockito.when(mock.findById(Matchers.same(NetworkOffering.class), Matchers.any(Long.class))).thenAnswer(new Answer() { + @Override + public NetworkOffering answer(final InvocationOnMock invocation) throws Throwable { + Long id = (Long)invocation.getArguments()[1]; + return _networkOfferingDao.findById(id); } - ); - Mockito.when(mock.findById(Mockito.same(IpAddress.class), Mockito.any(Long.class))).thenAnswer( - new Answer() - { - @Override - public IpAddress answer(final InvocationOnMock invocation) throws Throwable - { - Long id = (Long) invocation.getArguments()[1]; - return _ipAddressDao.findById(id); - } + }); + Mockito.when(mock.findById(Matchers.same(IpAddress.class), Matchers.any(Long.class))).thenAnswer(new Answer() { + @Override + public IpAddress answer(final InvocationOnMock invocation) throws Throwable { + Long id = (Long)invocation.getArguments()[1]; + return _ipAddressDao.findById(id); } - ); - Mockito.when(mock.findById(Mockito.same(DataCenter.class), Mockito.any(Long.class))).thenAnswer( - new Answer() - { - @Override - public DataCenter answer(final InvocationOnMock invocation) throws Throwable - { - Long id = (Long) invocation.getArguments()[1]; - return _zoneDao.findById(id); - } + }); + Mockito.when(mock.findById(Matchers.same(DataCenter.class), Matchers.any(Long.class))).thenAnswer(new Answer() { + @Override + public DataCenter answer(final InvocationOnMock invocation) throws Throwable { + Long id = (Long)invocation.getArguments()[1]; + return _zoneDao.findById(id); } - ); + }); } catch (Exception e) { e.printStackTrace(); } CallContext.init(mock); return mock; } + @Bean public ExternalDeviceUsageManager externalDeviceUsageManager() { return Mockito.mock(ExternalDeviceUsageManager.class); } + @Bean public GlobalLoadBalancingRulesService globalLoadBalancingRulesService() { return Mockito.mock(GlobalLoadBalancingRulesService.class); } + @Bean - public HighAvailabilityManager highAvailabilityManager() { + public HighAvailabilityManager highAvailabilityManager() { return Mockito.mock(HighAvailabilityManager.class); } + @Bean public HostAllocator hostAllocator() { return Mockito.mock(HostAllocator.class); } + @Bean public IdentityService identityService() { return Mockito.mock(IdentityService.class); } + @Bean public InternalLoadBalancerVMManager internalLoadBalancerVMManager() { return Mockito.mock(InternalLoadBalancerVMManager.class); } + @Bean public InternalLoadBalancerVMService internalLoadBalancerVMService() { return Mockito.mock(InternalLoadBalancerVMService.class); } + @Bean public ApplicationLoadBalancerService applicationLoadBalancerService() { return Mockito.mock(ApplicationLoadBalancerService.class); } + @Bean public ManagementServer managementServer() { return Mockito.mock(ManagementServer.class); } + @Bean public NetworkACLService networkACLService() { return Mockito.mock(NetworkACLService.class); } + @Bean public NetworkUsageService networkUsageService() { return Mockito.mock(NetworkUsageService.class); } + @Bean public OrchestrationService orchSrvc() { return Mockito.mock(OrchestrationService.class); } + @Bean public PodAllocator podAllocator() { return Mockito.mock(PodAllocator.class); } + @Bean public QueryService queryService() { return Mockito.mock(QueryService.class); } + @Bean public RegionManager regionManager() { return Mockito.mock(RegionManager.class); } + @Bean public RemoteAccessVpnService remoteAccessVpnService() { return Mockito.mock(RemoteAccessVpnService.class); } + @Bean public ResourceLimitService resourceLimitService() { return Mockito.mock(ResourceLimitService.class); } + @Bean public ResourceManager resourceManager() { return Mockito.mock(ResourceManager.class); } + @Bean public ResourceMetaDataService resourceMetaDataService() { return Mockito.mock(ResourceMetaDataService.class); } + @Bean public SecondaryStorageVmManager secondaryStorageVmManager() { return Mockito.mock(SecondaryStorageVmManager.class); } + @Bean - public Site2SiteVpnManager site2SiteVpnManager() { + public Site2SiteVpnManager site2SiteVpnManager() { return Mockito.mock(Site2SiteVpnManager.class); } + @Bean public Site2SiteVpnServiceProvider site2SiteVpnServiceProvider() { return Mockito.mock(Site2SiteVpnServiceProvider.class); } + @Bean public SnapshotApiService snapshotApiService() { return Mockito.mock(SnapshotApiService.class); } + @Bean public SnapshotManager snapshotManager() { return Mockito.mock(SnapshotManager.class); } + @Bean public StorageManager storageManager() { return Mockito.mock(StorageManager.class); } + @Bean public StorageNetworkManager storageNetworkManager() { return Mockito.mock(StorageNetworkManager.class); } + @Bean public StorageNetworkService storageNetworkService() { return Mockito.mock(StorageNetworkService.class); } + @Bean public StoragePoolAllocator storagePoolAllocator() { return Mockito.mock(StoragePoolAllocator.class); } + @Bean public SyncQueueManager syncQueueManager() { return Mockito.mock(SyncQueueManager.class); } + @Bean public TaggedResourceService taggedResourceService() { return Mockito.mock(TaggedResourceService.class); } + @Bean public TemplateDataFactory templateDataFactory() { return Mockito.mock(TemplateDataFactory.class); } + @Bean public TemplateApiService templateApiService() { return Mockito.mock(TemplateApiService.class); } + @Bean public TemplateManager templateManager() { return Mockito.mock(TemplateManager.class); } + @Bean public TemplateService templateService() { return Mockito.mock(TemplateService.class); } + @Bean public UsageService usageService() { return Mockito.mock(UsageService.class); } + @Bean public UserAuthenticator userAuthenticator() { return Mockito.mock(UserAuthenticator.class); } + @Bean public VMSnapshotManager vMSnapshotManager() { return Mockito.mock(VMSnapshotManager.class); } + @Bean public VolumeApiService volumeApiService() { return Mockito.mock(VolumeApiService.class); } + @Bean public VolumeDataFactory volumeDataFactory() { return Mockito.mock(VolumeDataFactory.class); } + @Bean public VolumeOrchestrationService volumeOrchestrationService() { return Mockito.mock(VolumeOrchestrationService.class); diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java index 6991d2c4ae7..c449b8a6c0a 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java @@ -17,6 +17,8 @@ package org.apache.cloudstack.network.contrail.management; +import static org.junit.Assert.assertNotNull; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -24,15 +26,15 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; import org.apache.log4j.Logger; +import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import static org.junit.Assert.*; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; import com.cloud.agent.AgentManager; import com.cloud.agent.api.PlugNicAnswer; @@ -84,21 +86,32 @@ import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.UserVmDao; public class ManagementServerMock { - private static final Logger s_logger = - Logger.getLogger(ManagementServerMock.class); + private static final Logger s_logger = Logger.getLogger(ManagementServerMock.class); - @Inject private AccountManager _accountMgr; - @Inject private ConfigurationService _configService; - @Inject private DataCenterDao _zoneDao; - @Inject private NetworkService _networkService; - @Inject private NetworkDao _networksDao; - @Inject private PhysicalNetworkDao _physicalNetworkDao; - @Inject private UserVmDao _userVmDao; - @Inject private ServiceOfferingDao _serviceOfferingDao; - @Inject private VMTemplateDao _vmTemplateDao; - @Inject private HostDao _hostDao; - @Inject public AgentManager _agentMgr; - @Inject public VirtualMachineManager _vmMgr; + @Inject + private AccountManager _accountMgr; + @Inject + private ConfigurationService _configService; + @Inject + private DataCenterDao _zoneDao; + @Inject + private NetworkService _networkService; + @Inject + private NetworkDao _networksDao; + @Inject + private PhysicalNetworkDao _physicalNetworkDao; + @Inject + private UserVmDao _userVmDao; + @Inject + private ServiceOfferingDao _serviceOfferingDao; + @Inject + private VMTemplateDao _vmTemplateDao; + @Inject + private HostDao _hostDao; + @Inject + public AgentManager _agentMgr; + @Inject + public VirtualMachineManager _vmMgr; private DataCenterVO _zone; private PhysicalNetwork _znet; @@ -117,55 +130,52 @@ public class ManagementServerMock { } field.setAccessible(true); switch (field_type) { - case STRING: - try { - field.set(cmd, value); - } catch (Exception ex) { - s_logger.warn(ex); - return; - } - break; - case UUID: - if (value.equals("-1")) { + case STRING: try { - field.setLong(cmd, -1L); + field.set(cmd, value); } catch (Exception ex) { s_logger.warn(ex); return; } - } - break; - case LONG: - try { - field.set(cmd, value); - } catch (Exception ex) { - s_logger.warn(ex); - return; - } - break; - default: - try { - field.set(cmd, value); - } catch (Exception ex) { - s_logger.warn(ex); - return; - } - break; + break; + case UUID: + if (value.equals("-1")) { + try { + field.setLong(cmd, -1L); + } catch (Exception ex) { + s_logger.warn(ex); + return; + } + } + break; + case LONG: + try { + field.set(cmd, value); + } catch (Exception ex) { + s_logger.warn(ex); + return; + } + break; + default: + try { + field.set(cmd, value); + } catch (Exception ex) { + s_logger.warn(ex); + return; + } + break; } } private void createHost() { - HostVO host = new HostVO(_host_id, "aa01", Type.BaremetalDhcp, - "192.168.1.1", "255.255.255.0", null, - null, null, null, - null, null, null, - null, null, null, - UUID.randomUUID().toString(), Status.Up, "1.0", null, - null, _zone.getId(), null, 0, 0, "aa", 0, StoragePoolType.NetworkFilesystem); + HostVO host = + new HostVO(_host_id, "aa01", Type.BaremetalDhcp, "192.168.1.1", "255.255.255.0", null, null, null, null, null, null, null, null, null, null, + UUID.randomUUID().toString(), Status.Up, "1.0", null, null, _zone.getId(), null, 0, 0, "aa", 0, StoragePoolType.NetworkFilesystem); host.setResourceState(ResourceState.Enabled); _hostDao.persist(host); _host_id = host.getId(); } + private void createPublicVlanIpRange() { CreateVlanIpRangeCmd cmd = new CreateVlanIpRangeCmd(); BaseCmd proxy = ComponentContext.inject(cmd); @@ -191,13 +201,12 @@ public class ManagementServerMock { setParameter(cmd, "vlan", BaseCmd.CommandType.STRING, "untagged"); s_logger.debug("createPublicVlanIpRange execute : zone id: " + _zone.getId() + ", public net id: " + public_net_id); try { - _configService.createVlanAndPublicIpRange(cmd); + _configService.createVlanAndPublicIpRange(cmd); } catch (Exception e) { - s_logger.debug("createPublicVlanIpRange: " + e); + s_logger.debug("createPublicVlanIpRange: " + e); } } - public UserVm createVM(String name, Network network) { VMTemplateVO tmpl = getVMTemplate(); assertNotNull(tmpl); @@ -205,20 +214,21 @@ public class ManagementServerMock { assertNotNull(small); Answer callback = new Answer() { + @Override public Object answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); - Commands cmds = (Commands) args[1]; + Commands cmds = (Commands)args[1]; if (cmds == null) { return null; } PlugNicAnswer reply = new PlugNicAnswer(null, true, "PlugNic"); - com.cloud.agent.api.Answer[] answers = { reply }; + com.cloud.agent.api.Answer[] answers = {reply}; cmds.setAnswers(answers); return null; } }; try { - Mockito.when(_agentMgr.send(Mockito.anyLong(), Mockito.any(Commands.class))).thenAnswer(callback); + Mockito.when(_agentMgr.send(Matchers.anyLong(), Matchers.any(Commands.class))).thenAnswer(callback); } catch (AgentUnavailableException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -227,8 +237,9 @@ public class ManagementServerMock { e.printStackTrace(); } long id = _userVmDao.getNextInSequence(Long.class, "id"); - UserVmVO vm = new UserVmVO(id, name, name, tmpl.getId(), HypervisorType.XenServer, tmpl.getGuestOSId(), - false, false, _zone.getDomainId(), Account.ACCOUNT_ID_SYSTEM, small.getId(), null, name, null); + UserVmVO vm = + new UserVmVO(id, name, name, tmpl.getId(), HypervisorType.XenServer, tmpl.getGuestOSId(), false, false, _zone.getDomainId(), Account.ACCOUNT_ID_SYSTEM, + small.getId(), null, name, null); vm.setState(com.cloud.vm.VirtualMachine.State.Running); vm.setHostId(_host_id); vm.setDataCenterId(network.getDataCenterId()); @@ -251,21 +262,22 @@ public class ManagementServerMock { public void deleteVM(UserVm vm, Network network) { Answer callback = new Answer() { + @Override public Object answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); - Commands cmds = (Commands) args[1]; + Commands cmds = (Commands)args[1]; if (cmds == null) { return null; } UnPlugNicAnswer reply = new UnPlugNicAnswer(null, true, "PlugNic"); - com.cloud.agent.api.Answer[] answers = { reply }; + com.cloud.agent.api.Answer[] answers = {reply}; cmds.setAnswers(answers); return null; } }; try { - Mockito.when(_agentMgr.send(Mockito.anyLong(), Mockito.any(Commands.class))).thenAnswer(callback); + Mockito.when(_agentMgr.send(Matchers.anyLong(), Matchers.any(Commands.class))).thenAnswer(callback); } catch (AgentUnavailableException e) { e.printStackTrace(); } catch (OperationTimedoutException e) { @@ -286,7 +298,7 @@ public class ManagementServerMock { private VMTemplateVO getVMTemplate() { List tmpl_list = _vmTemplateDao.listDefaultBuiltinTemplates(); - for (VMTemplateVO tmpl: tmpl_list) { + for (VMTemplateVO tmpl : tmpl_list) { if (tmpl.getHypervisorType() == HypervisorType.XenServer) { return tmpl; } @@ -296,7 +308,7 @@ public class ManagementServerMock { private ServiceOffering getServiceByName(String name) { List service_list = _serviceOfferingDao.findPublicServiceOfferings(); - for (ServiceOfferingVO service: service_list) { + for (ServiceOfferingVO service : service_list) { if (service.getName().equals(name)) { return service; } @@ -320,73 +332,64 @@ public class ManagementServerMock { } catch (InvalidParameterValueException e) { List isolationMethods = new ArrayList(); isolationMethods.add("GRE"); - _znet = _networkService.createPhysicalNetwork(_zone.getId(), null, null, isolationMethods, - BroadcastDomainRange.ZONE.toString(), _zone.getDomainId(), - null, "znet"); + _znet = + _networkService.createPhysicalNetwork(_zone.getId(), null, null, isolationMethods, BroadcastDomainRange.ZONE.toString(), _zone.getDomainId(), null, + "znet"); List nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public); if (nets == null || nets.isEmpty()) { _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), null, null, null, null, null, null); } } if (_znet.getState() != PhysicalNetwork.State.Enabled) { - _znet = _networkService.updatePhysicalNetwork(_znet.getId(), null, null, null, - PhysicalNetwork.State.Enabled.toString()); + _znet = _networkService.updatePhysicalNetwork(_znet.getId(), null, null, null, PhysicalNetwork.State.Enabled.toString()); } // Ensure that the physical network supports Guest traffic. - Pair, Integer> trafficTypes = - _networkService.listTrafficTypes(_znet.getId()); + Pair, Integer> trafficTypes = _networkService.listTrafficTypes(_znet.getId()); boolean found = false; - for (PhysicalNetworkTrafficType ttype: trafficTypes.first()) { + for (PhysicalNetworkTrafficType ttype : trafficTypes.first()) { if (ttype.getTrafficType() == TrafficType.Guest) { found = true; } } if (!found) { - _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), - null, null, null, null, null, null); + _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), null, null, null, null, null, null); } Pair, Integer> providers = - _networkService.listNetworkServiceProviders(_znet.getId(), Provider.JuniperContrail.getName(), - null, null, null); + _networkService.listNetworkServiceProviders(_znet.getId(), Provider.JuniperContrail.getName(), null, null, null); if (providers.second() == 0) { s_logger.debug("Add " + Provider.JuniperContrail.getName() + " to network " + _znet.getName()); - PhysicalNetworkServiceProvider provider = - _networkService.addProviderToPhysicalNetwork(_znet.getId(), Provider.JuniperContrail.getName(), - null, null); - _networkService.updateNetworkServiceProvider(provider.getId(), - PhysicalNetworkServiceProvider.State.Enabled.toString(), null); + PhysicalNetworkServiceProvider provider = _networkService.addProviderToPhysicalNetwork(_znet.getId(), Provider.JuniperContrail.getName(), null, null); + _networkService.updateNetworkServiceProvider(provider.getId(), PhysicalNetworkServiceProvider.State.Enabled.toString(), null); } else { PhysicalNetworkServiceProvider provider = providers.first().get(0); if (provider.getState() != PhysicalNetworkServiceProvider.State.Enabled) { - _networkService.updateNetworkServiceProvider(provider.getId(), - PhysicalNetworkServiceProvider.State.Enabled.toString(), null); + _networkService.updateNetworkServiceProvider(provider.getId(), PhysicalNetworkServiceProvider.State.Enabled.toString(), null); } } - providers = _networkService.listNetworkServiceProviders(_znet.getId(), null, - PhysicalNetworkServiceProvider.State.Enabled.toString(), null, null); + providers = _networkService.listNetworkServiceProviders(_znet.getId(), null, PhysicalNetworkServiceProvider.State.Enabled.toString(), null, null); s_logger.debug(_znet.getName() + " has " + providers.second().toString() + " Enabled providers"); - for (PhysicalNetworkServiceProvider provider: providers.first()) { + for (PhysicalNetworkServiceProvider provider : providers.first()) { if (provider.getProviderName().equals(Provider.JuniperContrail.getName())) { continue; } s_logger.debug("Disabling " + provider.getProviderName()); - _networkService.updateNetworkServiceProvider(provider.getId(), - PhysicalNetworkServiceProvider.State.Disabled.toString(), null); + _networkService.updateNetworkServiceProvider(provider.getId(), PhysicalNetworkServiceProvider.State.Disabled.toString(), null); } } private void locateZone() { _zone = _zoneDao.findByName("default"); if (_zone == null) { - ConfigurationManager mgr = (ConfigurationManager) _configService; - _zone = mgr.createZone(User.UID_SYSTEM, "default", "8.8.8.8", null, "8.8.4.4", null, - null /* cidr */, "ROOT", Domain.ROOT_DOMAIN, - NetworkType.Advanced, null, null /* networkDomain */, false, false, null, null); + ConfigurationManager mgr = (ConfigurationManager)_configService; + _zone = + mgr.createZone(User.UID_SYSTEM, "default", "8.8.8.8", null, "8.8.4.4", null, null /* cidr */, "ROOT", Domain.ROOT_DOMAIN, NetworkType.Advanced, null, + null /* networkDomain */, false, false, null, null); } } + public void shutdown() { deleteHost(); } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java index c2b06ea454f..2f81688c0f8 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java @@ -23,6 +23,8 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; @@ -30,13 +32,12 @@ import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; import org.apache.cloudstack.api.command.admin.user.RegisterCmd; import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; -import org.apache.log4j.Logger; - -import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionStatus; +import org.apache.cloudstack.context.CallContext; +import com.cloud.api.query.dao.AccountJoinDao; import com.cloud.api.query.vo.ControlledViewEntity; +import com.cloud.configuration.ResourceLimit; +import com.cloud.configuration.dao.ResourceCountDao; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException; @@ -47,43 +48,42 @@ import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.User; import com.cloud.user.UserAccount; -import org.apache.cloudstack.context.CallContext; import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; -import com.cloud.api.query.dao.AccountJoinDao; -import com.cloud.configuration.dao.ResourceCountDao; -import com.cloud.configuration.ResourceLimit; -import com.cloud.api.query.vo.AccountJoinVO; import com.cloud.user.dao.UserDao; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; - -import org.mockito.Mockito; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionStatus; public class MockAccountManager extends ManagerBase implements AccountManager { - private static final Logger s_logger = - Logger.getLogger(MockAccountManager.class); + private static final Logger s_logger = Logger.getLogger(MockAccountManager.class); - @Inject AccountDao _accountDao; - @Inject ResourceCountDao _resourceCountDao; + @Inject + AccountDao _accountDao; + @Inject + ResourceCountDao _resourceCountDao; - @Inject AccountJoinDao _accountJoinDao; - @Inject UserDao _userDao; + @Inject + AccountJoinDao _accountJoinDao; + @Inject + UserDao _userDao; UserVO _systemUser; AccountVO _systemAccount; @Override public boolean configure(final String name, final Map params) throws ConfigurationException { - _systemAccount = _accountDao.findById(AccountVO.ACCOUNT_ID_SYSTEM); + _systemAccount = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM); if (_systemAccount == null) { throw new ConfigurationException("Unable to find the system account using " + Account.ACCOUNT_ID_SYSTEM); } - _systemUser = _userDao.findById(UserVO.UID_SYSTEM); + _systemUser = _userDao.findById(User.UID_SYSTEM); if (_systemUser == null) { throw new ConfigurationException("Unable to find the system user using " + User.UID_SYSTEM); } @@ -93,15 +93,13 @@ public class MockAccountManager extends ManagerBase implements AccountManager { } @Override - public void checkAccess(Account arg0, Domain arg1) - throws PermissionDeniedException { + public void checkAccess(Account arg0, Domain arg1) throws PermissionDeniedException { // TODO Auto-generated method stub } @Override - public void checkAccess(Account arg0, AccessType arg1, boolean arg2, - ControlledEntity... arg3) throws PermissionDeniedException { + public void checkAccess(Account arg0, AccessType arg1, boolean arg2, ControlledEntity... arg3) throws PermissionDeniedException { // TODO Auto-generated method stub } @@ -113,17 +111,14 @@ public class MockAccountManager extends ManagerBase implements AccountManager { } @Override - public User createUser(String arg0, String arg1, String arg2, String arg3, - String arg4, String arg5, String arg6, Long arg7, String arg8) { + public User createUser(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5, String arg6, Long arg7, String arg8) { // TODO Auto-generated method stub return null; } @Override - public UserAccount createUserAccount(String arg0, String arg1, String arg2, - String arg3, String arg4, String arg5, String arg6, short arg7, - Long arg8, String arg9, Map arg10, String arg11, - String arg12) { + public UserAccount createUserAccount(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5, String arg6, short arg7, Long arg8, String arg9, + Map arg10, String arg11, String arg12) { // TODO Auto-generated method stub return null; } @@ -203,49 +198,40 @@ public class MockAccountManager extends ManagerBase implements AccountManager { } @Override - public UserAccount authenticateUser(String arg0, String arg1, Long arg2, - String arg3, Map arg4) { + public UserAccount authenticateUser(String arg0, String arg1, Long arg2, String arg3, Map arg4) { // TODO Auto-generated method stub return null; } @Override - public void buildACLSearchBuilder( - SearchBuilder arg0, Long arg1, - boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { + public void buildACLSearchBuilder(SearchBuilder arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub } @Override - public void buildACLSearchCriteria( - SearchCriteria arg0, Long arg1, - boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { + public void buildACLSearchCriteria(SearchCriteria arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub } @Override - public void buildACLSearchParameters(Account arg0, Long arg1, String arg2, - Long arg3, List arg4, - Ternary arg5, - boolean arg6, boolean arg7) { + public void buildACLSearchParameters(Account arg0, Long arg1, String arg2, Long arg3, List arg4, Ternary arg5, + boolean arg6, boolean arg7) { // TODO Auto-generated method stub } @Override - public void buildACLViewSearchBuilder( - SearchBuilder arg0, Long arg1, - boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { + public void + buildACLViewSearchBuilder(SearchBuilder arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub } @Override - public void buildACLViewSearchCriteria( - SearchCriteria arg0, Long arg1, - boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { + public void buildACLViewSearchCriteria(SearchCriteria arg0, Long arg1, boolean arg2, List arg3, + ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub } @@ -274,15 +260,13 @@ public class MockAccountManager extends ManagerBase implements AccountManager { } @Override - public boolean disableAccount(long arg0) - throws ConcurrentOperationException, ResourceUnavailableException { + public boolean disableAccount(long arg0) throws ConcurrentOperationException, ResourceUnavailableException { // TODO Auto-generated method stub return false; } @Override - public Account disableAccount(String arg0, Long arg1, Long arg2) - throws ConcurrentOperationException, ResourceUnavailableException { + public Account disableAccount(String arg0, Long arg1, Long arg2) throws ConcurrentOperationException, ResourceUnavailableException { // TODO Auto-generated method stub return null; } @@ -343,23 +327,21 @@ public class MockAccountManager extends ManagerBase implements AccountManager { @Override public Account getAccount(long accountId) { - return _systemAccount; + return _systemAccount; } @Override - public Account createAccount(String accountName, short accountType, - Long domainId, String networkDomain, Map details, - String uuid) { + public Account createAccount(String accountName, short accountType, Long domainId, String networkDomain, Map details, String uuid) { final AccountVO account = new AccountVO(accountName, domainId, networkDomain, accountType, uuid); Transaction.execute(new TransactionCallbackNoReturn() { @Override - public void doInTransactionWithoutResult(TransactionStatus status) { + public void doInTransactionWithoutResult(TransactionStatus status) { - _accountDao.persist(account); - _resourceCountDao.createResourceCounts(account.getId(), ResourceLimit.ResourceOwnerType.Account); - } + _accountDao.persist(account); + _resourceCountDao.createResourceCounts(account.getId(), ResourceLimit.ResourceOwnerType.Account); + } }); - return account; + return account; } @Override @@ -368,5 +350,4 @@ public class MockAccountManager extends ManagerBase implements AccountManager { } - } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java index 67d39216edd..7c5e3c0aec7 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java @@ -25,51 +25,50 @@ import java.util.UUID; import javax.inject.Inject; import junit.framework.TestCase; - -import org.apache.cloudstack.network.contrail.management.ContrailManager; -import org.apache.cloudstack.network.contrail.management.ServerDBSync; - import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.ApiConnectorFactory; import net.juniper.contrail.api.ApiConnectorMock; import net.juniper.contrail.api.types.InstanceIp; import net.juniper.contrail.api.types.NetworkIpam; +import net.juniper.contrail.api.types.Project; import net.juniper.contrail.api.types.SubnetType; import net.juniper.contrail.api.types.VirtualMachine; import net.juniper.contrail.api.types.VirtualMachineInterface; import net.juniper.contrail.api.types.VirtualNetwork; import net.juniper.contrail.api.types.VnSubnetsType; -import net.juniper.contrail.api.types.Project; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.command.user.project.CreateProjectCmd; -import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd; -import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd; -import org.apache.cloudstack.api.command.user.nat.EnableStaticNatCmd; -import org.apache.cloudstack.api.command.user.nat.DisableStaticNatCmd; -import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; -import org.junit.runner.RunWith; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.cloud.utils.db.Merovingian2; -import com.cloud.utils.mgmt.JmxUtil; - +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd; +import org.apache.cloudstack.api.command.user.nat.DisableStaticNatCmd; +import org.apache.cloudstack.api.command.user.nat.EnableStaticNatCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.project.CreateProjectCmd; +import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd; +import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.utils.identity.ManagementServerNode; import com.cloud.agent.AgentManager; import com.cloud.dc.DataCenter; import com.cloud.domain.Domain; +import com.cloud.domain.DomainVO; +import com.cloud.domain.dao.DomainDao; import com.cloud.exception.CloudException; import com.cloud.network.Network; import com.cloud.network.NetworkService; -import com.cloud.domain.DomainVO; -import com.cloud.domain.dao.DomainDao; +import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; import com.cloud.projects.ProjectVO; import com.cloud.projects.dao.ProjectDao; import com.cloud.user.Account; @@ -78,39 +77,41 @@ import com.cloud.user.User; import com.cloud.uservm.UserVm; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ComponentLifecycle; +import com.cloud.utils.db.Merovingian2; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.mgmt.JmxUtil; import com.cloud.vm.VirtualMachineManager; -import com.cloud.network.dao.IPAddressDao; -import com.cloud.network.dao.IPAddressVO; - -import org.apache.cloudstack.context.CallContext; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:/providerContext.xml") +@ContextConfiguration(locations = "classpath:/providerContext.xml") /** * Exercise the public API. */ public class NetworkProviderTest extends TestCase { - private static final Logger s_logger = - Logger.getLogger(NetworkProviderTest.class); + private static final Logger s_logger = Logger.getLogger(NetworkProviderTest.class); - @Inject public ContrailManager _contrailMgr; - @Inject public ServerDBSync _dbSync; - @Inject public AccountManager _accountMgr; - @Inject IPAddressDao _ipAddressDao; - @Inject private NetworkService _networkService; + @Inject + public ContrailManager _contrailMgr; + @Inject + public ServerDBSync _dbSync; + @Inject + public AccountManager _accountMgr; + @Inject + IPAddressDao _ipAddressDao; + @Inject + private NetworkService _networkService; - @Inject public VirtualMachineManager _vmMgr; + @Inject + public VirtualMachineManager _vmMgr; - @Inject public DomainDao _domainDao; - @Inject public ProjectDao _projectDao; - @Inject public AgentManager _agentMgr; + @Inject + public DomainDao _domainDao; + @Inject + public ProjectDao _projectDao; + @Inject + public AgentManager _agentMgr; private ManagementServerMock _server; private ApiConnector _api; @@ -136,9 +137,9 @@ public class NetworkProviderTest extends TestCase { JmxUtil.unregisterMBean("Locks", "Locks"); _lockMaster = null; - AbstractApplicationContext ctx = (AbstractApplicationContext) ComponentContext.getApplicationContext(); + AbstractApplicationContext ctx = (AbstractApplicationContext)ComponentContext.getApplicationContext(); Map lifecycleComponents = ctx.getBeansOfType(ComponentLifecycle.class); - for (ComponentLifecycle bean: lifecycleComponents.values()) { + for (ComponentLifecycle bean : lifecycleComponents.values()) { bean.stop(); } ctx.close(); @@ -147,6 +148,7 @@ public class NetworkProviderTest extends TestCase { TestDbSetup.destroy(_mysql_server_port, null); } + @Override @Before public void setUp() throws Exception { try { @@ -165,6 +167,7 @@ public class NetworkProviderTest extends TestCase { _api = _contrailMgr.getApiConnector(); } + @Override @After public void tearDown() throws Exception { _server.shutdown(); @@ -173,8 +176,7 @@ public class NetworkProviderTest extends TestCase { private void purgeTestNetwork() { Account system = _accountMgr.getSystemAccount(); DataCenter zone = _server.getZone(); - List list = - _networkService.getIsolatedNetworksOwnedByAccountInZone(zone.getId(), system); + List list = _networkService.getIsolatedNetworksOwnedByAccountInZone(zone.getId(), system); for (Network net : list) { s_logger.debug("Delete network " + net.getName()); _networkService.deleteNetwork(net.getId()); @@ -184,8 +186,7 @@ public class NetworkProviderTest extends TestCase { private Network lookupTestNetwork(String name) { Account system = _accountMgr.getSystemAccount(); DataCenter zone = _server.getZone(); - List list = - _networkService.getIsolatedNetworksOwnedByAccountInZone(zone.getId(), system); + List list = _networkService.getIsolatedNetworksOwnedByAccountInZone(zone.getId(), system); for (Network net : list) { if (net.getName().equals(name)) { return net; @@ -220,10 +221,10 @@ public class NetworkProviderTest extends TestCase { return result; } - @Test //@Ignore - public void testCreateNetwork() { + public + void testCreateNetwork() { purgeTestNetwork(); createTestNetwork("test"); } @@ -257,7 +258,7 @@ public class NetworkProviderTest extends TestCase { _server.deleteVM(vm, network); } - public void deleteFloatingIp(IPAddressVO ip) throws Exception{ + public void deleteFloatingIp(IPAddressVO ip) throws Exception { BaseCmd cmd = new DisableStaticNatCmd(); BaseCmd proxy = ComponentContext.inject(cmd); ManagementServerMock.setParameter(proxy, "ipAddressId", BaseCmd.CommandType.LONG, ip.getId()); @@ -336,10 +337,10 @@ public class NetworkProviderTest extends TestCase { } DomainVO domain = _domainDao.findById(Domain.ROOT_DOMAIN); try { - net.juniper.contrail.api.types.Domain vncDomain = (net.juniper.contrail.api.types.Domain) - _api.findById(net.juniper.contrail.api.types.Domain.class, domain.getUuid()); + net.juniper.contrail.api.types.Domain vncDomain = + (net.juniper.contrail.api.types.Domain)_api.findById(net.juniper.contrail.api.types.Domain.class, domain.getUuid()); if (_api.findByName(net.juniper.contrail.api.types.Project.class, vncDomain, name) == null) { - fail("create project failed in vnc"); + fail("create project failed in vnc"); } } catch (Exception e) { e.printStackTrace(); @@ -356,7 +357,7 @@ public class NetworkProviderTest extends TestCase { ManagementServerMock.setParameter(proxy, "id", BaseCmd.CommandType.LONG, project.getId()); ((DeleteProjectCmd)proxy).execute(); if (_api.findById(net.juniper.contrail.api.types.Project.class, project.getUuid()) != null) { - fail("unable to delete project in vnc"); + fail("unable to delete project in vnc"); } } catch (Exception e) { e.printStackTrace(); @@ -420,7 +421,7 @@ public class NetworkProviderTest extends TestCase { // Find default-network-ipam String ipam_id = _api.findByName(NetworkIpam.class, null, "default-network-ipam"); assertNotNull(ipam_id); - ipam = (NetworkIpam) _api.findById(NetworkIpam.class, ipam_id); + ipam = (NetworkIpam)_api.findById(NetworkIpam.class, ipam_id); assertNotNull(ipam); } catch (IOException ex) { fail(ex.getMessage()); diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java index a3ec279ed28..9901241c6f5 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java @@ -17,19 +17,22 @@ package org.apache.cloudstack.network.contrail.management; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.io.IOException; import java.util.List; import java.util.Map; import javax.inject.Inject; +import junit.framework.TestCase; import net.juniper.contrail.api.ApiConnector; import net.juniper.contrail.api.ApiConnectorFactory; import net.juniper.contrail.api.ApiObjectBase; import net.juniper.contrail.api.types.VirtualMachineInterface; import net.juniper.contrail.api.types.VirtualNetwork; -import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; @@ -42,6 +45,8 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.utils.identity.ManagementServerNode; + import com.cloud.dc.DataCenter; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; @@ -52,18 +57,15 @@ import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.db.Merovingian2; import com.cloud.utils.mgmt.JmxUtil; -import junit.framework.TestCase; -import static org.mockito.Mockito.*; - @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:/publicNetworkContext.xml") - +@ContextConfiguration(locations = "classpath:/publicNetworkContext.xml") public class PublicNetworkTest extends TestCase { - private static final Logger s_logger = - Logger.getLogger(PublicNetworkTest.class); + private static final Logger s_logger = Logger.getLogger(PublicNetworkTest.class); - @Inject public ContrailManager _contrailMgr; - @Inject public NetworkDao _networksDao; + @Inject + public ContrailManager _contrailMgr; + @Inject + public NetworkDao _networksDao; private static boolean _initDone = false; private static int _mysql_server_port; @@ -72,7 +74,6 @@ public class PublicNetworkTest extends TestCase { private ManagementServerMock _server; private ApiConnector _spy; - @BeforeClass public static void globalSetUp() throws Exception { ApiConnectorFactory.setImplementation(ApiConnectorMockito.class); @@ -89,9 +90,9 @@ public class PublicNetworkTest extends TestCase { JmxUtil.unregisterMBean("Locks", "Locks"); _lockMaster = null; - AbstractApplicationContext ctx = (AbstractApplicationContext) ComponentContext.getApplicationContext(); + AbstractApplicationContext ctx = (AbstractApplicationContext)ComponentContext.getApplicationContext(); Map lifecycleComponents = ctx.getBeansOfType(ComponentLifecycle.class); - for (ComponentLifecycle bean: lifecycleComponents.values()) { + for (ComponentLifecycle bean : lifecycleComponents.values()) { bean.stop(); } ctx.close(); @@ -100,6 +101,7 @@ public class PublicNetworkTest extends TestCase { TestDbSetup.destroy(_mysql_server_port, null); } + @Override @Before public void setUp() throws Exception { try { @@ -115,6 +117,7 @@ public class PublicNetworkTest extends TestCase { _spy = ((ApiConnectorMockito)_contrailMgr.getApiConnector()).getSpy(); } + @Override @After public void tearDown() throws Exception { _server.shutdown(); @@ -137,7 +140,7 @@ public class PublicNetworkTest extends TestCase { assertEquals("__default_Public__", vmObj.getName()); String vmiName = null; - for (ApiObjectBase obj: argumentList) { + for (ApiObjectBase obj : argumentList) { if (obj.getClass() == VirtualMachineInterface.class) { vmiName = obj.getName(); } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java index 22b114ba3d4..3e2104f4d95 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java @@ -17,95 +17,92 @@ package org.apache.cloudstack.network.contrail.management; -import java.net.ServerSocket; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; -import java.util.Properties; -import org.apache.commons.configuration.PropertiesConfiguration; +import java.io.InputStreamReader; +import java.net.ServerSocket; -import org.apache.log4j.Logger; +import org.apache.commons.configuration.PropertiesConfiguration; public class TestDbSetup { public static int findFreePort() throws Exception { - int port; - ServerSocket socket= new ServerSocket(0); - port = socket.getLocalPort(); - socket.close(); + int port; + ServerSocket socket = new ServerSocket(0); + port = socket.getLocalPort(); + socket.close(); - return port; + return port; } public static void startMysqlServer(int port, String startMysqlScript) throws Exception { - try { - String cwd = new java.io.File(".").getCanonicalPath(); + try { + String cwd = new java.io.File(".").getCanonicalPath(); Runtime r = Runtime.getRuntime(); String script = startMysqlScript; if (script == null) { - script = "test/resources/mysql_db_start.sh " + port; + script = "test/resources/mysql_db_start.sh " + port; } Process process = r.exec("sh " + cwd + "/" + script); process.waitFor(); System.out.println("new sql server instance launched on port: " + port); - } catch (Exception e) { + } catch (Exception e) { String cause = e.getMessage(); if (cause.equals("sh: not found")) System.out.println("No sh interpreter found."); throw e; - } + } } public static void stopMysqlServer(int port, String stopMysqlScript) throws Exception { - try { + try { Runtime r = Runtime.getRuntime(); String script = stopMysqlScript; if (script == null) { - script = "test/resources/mysql_db_stop.sh " + port; + script = "test/resources/mysql_db_stop.sh " + port; } Process process = r.exec("sh " + script); process.waitFor(); System.out.println("sql server instance running at port " + port + " stopped"); - } catch (Exception e) { + } catch (Exception e) { String cause = e.getMessage(); if (cause.equals("sh: not found")) System.out.println("No sh interpreter found."); throw e; - } + } } /* this is required for deploying db with new set of sql server parameters */ public static void copyDbPropertiesFile() throws Exception { - Runtime.getRuntime().exec("cp ../../../utils/conf/db.properties ../../../utils/conf/db.properties.override"); + Runtime.getRuntime().exec("cp ../../../utils/conf/db.properties ../../../utils/conf/db.properties.override"); } public static void updateSqlPort(int port, String propertyFileOverride) throws Exception { - PropertiesConfiguration config = new PropertiesConfiguration(propertyFileOverride); - System.out.println("File: " + propertyFileOverride + "; old: db.properties port: " + - config.getProperty("db.cloud.port") + ", new port: " + port); - config.setProperty("db.cloud.port", "" + port); - config.setProperty("db.cloud.username", System.getProperty("user.name")); - config.setProperty("db.cloud.password", ""); + PropertiesConfiguration config = new PropertiesConfiguration(propertyFileOverride); + System.out.println("File: " + propertyFileOverride + "; old: db.properties port: " + config.getProperty("db.cloud.port") + ", new port: " + port); + config.setProperty("db.cloud.port", "" + port); + config.setProperty("db.cloud.username", System.getProperty("user.name")); + config.setProperty("db.cloud.password", ""); - config.setProperty("db.usage.port", "" + port); - config.setProperty("db.usage.username", System.getProperty("user.name")); - config.setProperty("db.usage.password", ""); + config.setProperty("db.usage.port", "" + port); + config.setProperty("db.usage.username", System.getProperty("user.name")); + config.setProperty("db.usage.password", ""); - config.setProperty("db.awsapi.port", "" + port); - config.setProperty("db.awsapi.username", System.getProperty("user.name")); - config.setProperty("db.awsapi.password", ""); + config.setProperty("db.awsapi.port", "" + port); + config.setProperty("db.awsapi.username", System.getProperty("user.name")); + config.setProperty("db.awsapi.password", ""); - config.setProperty("db.simulator.port", "" + port); - config.setProperty("db.simulator.username", System.getProperty("user.name")); - config.setProperty("db.simulator.password", ""); + config.setProperty("db.simulator.port", "" + port); + config.setProperty("db.simulator.username", System.getProperty("user.name")); + config.setProperty("db.simulator.password", ""); - config.save(); + config.save(); } public static void initCloudstackDb() throws Exception { @@ -122,15 +119,14 @@ public class TestDbSetup { } } - public static void dumpProcessOutput(Process p) throws Exception { - BufferedReader istream = null; - istream = new BufferedReader(new InputStreamReader(p.getInputStream())); - String line = null; - while ((line = istream.readLine()) != null) { + BufferedReader istream = null; + istream = new BufferedReader(new InputStreamReader(p.getInputStream())); + String line = null; + while ((line = istream.readLine()) != null) { System.out.println(line); - } + } } public static int init(String startScript) throws Exception { @@ -138,7 +134,7 @@ public class TestDbSetup { TestDbSetup.startMysqlServer(port, startScript); copyDbPropertiesFile(); /* both of these files needs to have mysql port, username password details */ - TestDbSetup.updateSqlPort(port, "db.properties"); /* for cloudstack runtime */ + TestDbSetup.updateSqlPort(port, "db.properties"); /* for cloudstack runtime */ TestDbSetup.updateSqlPort(port, "../../../utils/conf/db.properties.override"); /* for deploying db */ TestDbSetup.initCloudstackDb(); return port; @@ -148,4 +144,3 @@ public class TestDbSetup { TestDbSetup.stopMysqlServer(port, stopScript); } } - diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java index 02835e57a45..09385417440 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/VirtualNetworkModelTest.java @@ -19,37 +19,31 @@ package org.apache.cloudstack.network.contrail.management; import java.util.UUID; -import org.apache.cloudstack.network.contrail.management.ContrailManager; -import org.apache.cloudstack.network.contrail.management.ModelDatabase; -import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; +import junit.framework.TestCase; + import org.apache.log4j.Logger; import org.junit.Test; import org.mockito.Mockito; +import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; + import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkVO; -import junit.framework.TestCase; - public class VirtualNetworkModelTest extends TestCase { - private static final Logger s_logger = - Logger.getLogger(VirtualNetworkModelTest.class); + private static final Logger s_logger = Logger.getLogger(VirtualNetworkModelTest.class); @Test public void testDBLookup() { ModelDatabase db = new ModelDatabase(); NetworkVO network = Mockito.mock(NetworkVO.class); - VirtualNetworkModel storageModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, - TrafficType.Storage); + VirtualNetworkModel storageModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, TrafficType.Storage); db.getVirtualNetworks().add(storageModel); - VirtualNetworkModel mgmtModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, - TrafficType.Management); + VirtualNetworkModel mgmtModel = new VirtualNetworkModel(network, null, ContrailManager.managementNetworkName, TrafficType.Management); db.getVirtualNetworks().add(mgmtModel); - VirtualNetworkModel guestModel1 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", - TrafficType.Guest); + VirtualNetworkModel guestModel1 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", TrafficType.Guest); db.getVirtualNetworks().add(guestModel1); - VirtualNetworkModel guestModel2 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", - TrafficType.Guest); + VirtualNetworkModel guestModel2 = new VirtualNetworkModel(network, UUID.randomUUID().toString(), "test", TrafficType.Guest); db.getVirtualNetworks().add(guestModel2); s_logger.debug("networks: " + db.getVirtualNetworks().size()); assertEquals(4, db.getVirtualNetworks().size()); diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java index 0b58c2e4a25..96e9bc00d7b 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java @@ -18,19 +18,20 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.element.JuniperSRXFirewallElementService; -import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java index d78cc67437c..53e7bfc037f 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java @@ -18,17 +18,15 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; - import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.api.response.SrxFirewallResponse; @@ -101,7 +99,8 @@ public class AddSrxFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalFirewallDeviceVO fwDeviceVO = _srxFwService.addSrxFirewall(this); if (fwDeviceVO != null) { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java index 1cf24b9461b..303e98785af 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java @@ -20,11 +20,10 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.context.CallContext; @@ -52,7 +51,11 @@ public class ConfigureSrxFirewallCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, type = CommandType.UUID, entityType = SrxFirewallResponse.class, required = true, description = "SRX firewall device ID") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, + type = CommandType.UUID, + entityType = SrxFirewallResponse.class, + required = true, + description = "SRX firewall device ID") private Long fwDeviceId; @Parameter(name = ApiConstants.FIREWALL_DEVICE_CAPACITY, @@ -78,7 +81,8 @@ public class ConfigureSrxFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalFirewallDeviceVO fwDeviceVO = _srxFwService.configureSrxFirewall(this); if (fwDeviceVO != null) { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java index 8c278fb9a72..b24aa05dfa1 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java @@ -18,16 +18,17 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.HostResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.user.Account; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java index b7e7887858a..75aadc24955 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java @@ -20,11 +20,10 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -51,7 +50,11 @@ public class DeleteSrxFirewallCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, type = CommandType.UUID, entityType = SrxFirewallResponse.class, required = true, description = "srx firewall device ID") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, + type = CommandType.UUID, + entityType = SrxFirewallResponse.class, + required = true, + description = "srx firewall device ID") private Long fwDeviceId; ///////////////////////////////////////////////////// @@ -67,7 +70,8 @@ public class DeleteSrxFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _srxElementService.deleteSrxFirewall(this); if (result) { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index e67d72142dc..f87574e47a8 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -21,18 +21,19 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; -import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.host.Host; import com.cloud.network.element.JuniperSRXFirewallElementService; -import org.apache.cloudstack.api.response.ExternalFirewallResponse; @APICommand(name = "listExternalFirewalls", description = "List external firewall appliances.", responseObject = ExternalFirewallResponse.class) public class ListExternalFirewallsCmd extends BaseListCmd { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java index d07e7a59a82..a2d99a54cb7 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java @@ -21,12 +21,17 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + import com.cloud.api.response.SrxFirewallResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -69,7 +74,8 @@ public class ListSrxFirewallNetworksCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List networks = _srxFwService.listNetworks(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java index 1f9f3866352..e8cdcd5f2ca 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java @@ -21,12 +21,17 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + import com.cloud.api.response.SrxFirewallResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -72,7 +77,8 @@ public class ListSrxFirewallsCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List fwDevices = _srxFwService.listSrxFirewalls(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java index 90a31fe545a..21c5721811d 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java @@ -16,13 +16,14 @@ // under the License. package com.cloud.api.response; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.EntityReference; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.network.dao.ExternalFirewallDeviceVO; +import com.cloud.serializer.Param; @EntityReference(value = ExternalFirewallDeviceVO.class) @SuppressWarnings("unused") diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index f377ea50c45..2ff90fb6d7b 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java @@ -66,8 +66,6 @@ import com.cloud.network.NetworkModel; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PublicIpAddress; -import com.cloud.network.RemoteAccessVpn; -import com.cloud.network.VpnUser; import com.cloud.network.dao.ExternalFirewallDeviceDao; import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; @@ -92,7 +90,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; @Local(value = {NetworkElement.class, FirewallServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class, - RemoteAccessVPNServiceProvider.class}) + RemoteAccessVPNServiceProvider.class}) public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider { @@ -178,8 +176,8 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan } @Override - public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientNetworkCapacityException, ResourceUnavailableException { + public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { return true; } @@ -293,7 +291,8 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return true; } @@ -320,12 +319,14 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { - throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + " to add this device."); + throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + + " to add this device."); } pNetwork = physicalNetworks.get(0); String deviceType = NetworkDevice.JuniperSRXFirewall.getName(); - ExternalFirewallDeviceVO fwDeviceVO = addExternalFirewall(pNetwork.getId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceType, new JuniperSrxResource()); + ExternalFirewallDeviceVO fwDeviceVO = + addExternalFirewall(pNetwork.getId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceType, new JuniperSrxResource()); if (fwDeviceVO != null) { fwHost = _hostDao.findById(fwDeviceVO.getHostId()); } @@ -357,7 +358,7 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + - " to add this device."); + " to add this device."); } pNetwork = physicalNetworks.get(0); } diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java index 34a333c4207..8ee756acc0c 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java @@ -18,6 +18,8 @@ package com.cloud.network.element; import java.util.List; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; + import com.cloud.api.commands.AddExternalFirewallCmd; import com.cloud.api.commands.AddSrxFirewallCmd; import com.cloud.api.commands.ConfigureSrxFirewallCmd; @@ -30,8 +32,6 @@ import com.cloud.api.response.SrxFirewallResponse; import com.cloud.host.Host; import com.cloud.network.Network; import com.cloud.network.dao.ExternalFirewallDeviceVO; - -import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.utils.component.PluggableService; public interface JuniperSRXFirewallElementService extends PluggableService { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index 259abad3bfd..ac3e9ab05be 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -68,7 +68,6 @@ import com.cloud.host.Host; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.resource.ServerResource; import com.cloud.utils.NumbersUtil; import com.cloud.utils.exception.ExecutionException; @@ -248,8 +247,8 @@ public class JuniperSrxResource implements ServerResource { private String icmpCode; private final String countName; - private FirewallFilterTerm(String name, List sourceCidrs, String destIp, String protocol, Integer startPort, Integer endPort, Integer icmpType, Integer icmpCode, - String countName) { + private FirewallFilterTerm(String name, List sourceCidrs, String destIp, String protocol, Integer startPort, Integer endPort, Integer icmpType, + Integer icmpCode, String countName) { this.name = name; this.sourceCidrs = sourceCidrs; this.destIp = destIp; @@ -840,7 +839,8 @@ public class JuniperSrxResource implements ServerResource { for (String guestVlan : guestVlans) { List activeRulesForGuestNw = activeRules.get(guestVlan); - removeEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractCidrs(activeRulesForGuestNw), defaultEgressPolicy); + removeEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractCidrs(activeRulesForGuestNw), + defaultEgressPolicy); if (activeRulesForGuestNw.size() > 0 && type == FirewallRule.FirewallRuleType.User) { addEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractApplications(activeRulesForGuestNw), extractCidrs(activeRulesForGuestNw), defaultEgressPolicy); @@ -873,9 +873,10 @@ public class JuniperSrxResource implements ServerResource { endPort = rule.getSrcPortRange()[1]; } - FirewallFilterTerm term = new FirewallFilterTerm(genIpIdentifier(rule.getSrcIp()) + "-" + String.valueOf(rule.getId()), rule.getSourceCidrList(), - rule.getSrcIp(), rule.getProtocol(), startPort, endPort, rule.getIcmpType(), rule.getIcmpCode(), genIpIdentifier(rule.getSrcIp()) + - _usageFilterIPInput.getCounterIdentifier()); + FirewallFilterTerm term = + new FirewallFilterTerm(genIpIdentifier(rule.getSrcIp()) + "-" + String.valueOf(rule.getId()), rule.getSourceCidrList(), rule.getSrcIp(), + rule.getProtocol(), startPort, endPort, rule.getIcmpType(), rule.getIcmpCode(), genIpIdentifier(rule.getSrcIp()) + + _usageFilterIPInput.getCounterIdentifier()); if (!rule.revoked()) { manageProxyArp(SrxCommand.ADD, getVlanTag(rule.getSrcVlanTag()), rule.getSrcIp()); manageFirewallFilter(SrxCommand.ADD, term, _publicZoneInputFilterName); @@ -986,7 +987,7 @@ public class JuniperSrxResource implements ServerResource { if (privateVlanTag != null) { s_logger.warn("Found a static NAT rule (" + staticNatRulePublicIp + " <-> " + staticNatRulePrivateIp + ") for guest VLAN with tag " + privateVlanTag + - " that is active when the guest network is being removed. Removing rule..."); + " that is active when the guest network is being removed. Removing rule..."); } removeStaticNatRule(publicVlanTag, staticNatRulePublicIp, staticNatRulePrivateIp); @@ -1242,8 +1243,8 @@ public class JuniperSrxResource implements ServerResource { String srcPortRange = srcPortStart + "-" + srcPortEnd; String destPortRange = destPortStart + "-" + destPortEnd; - s_logger.debug("Added destination NAT rule for protocol " + protocol + ", public IP " + publicIp + ", private IP " + privateIp + ", source port range " + srcPortRange + - ", and dest port range " + destPortRange); + s_logger.debug("Added destination NAT rule for protocol " + protocol + ", public IP " + publicIp + ", private IP " + privateIp + ", source port range " + + srcPortRange + ", and dest port range " + destPortRange); } private void removeDestinationNatRule(Long publicVlanTag, String publicIp, String privateIp, int srcPort, int destPort) throws ExecutionException { @@ -1254,7 +1255,8 @@ public class JuniperSrxResource implements ServerResource { manageAddressBookEntry(SrxCommand.DELETE, _privateZone, privateIp, null); - s_logger.debug("Removed destination NAT rule for public IP " + publicIp + ", private IP " + privateIp + ", source port " + srcPort + ", and dest port " + destPort); + s_logger.debug("Removed destination NAT rule for public IP " + publicIp + ", private IP " + privateIp + ", source port " + srcPort + ", and dest port " + + destPort); } private void removeDestinationNatRules(Long privateVlanTag, Map publicVlanTags, List destNatRules) throws ExecutionException { @@ -1270,8 +1272,8 @@ public class JuniperSrxResource implements ServerResource { } if (privateVlanTag != null) { - s_logger.warn("Found a destination NAT rule (public IP: " + publicIp + ", private IP: " + privateIp + ", public port: " + srcPort + ", private port: " + destPort + - ") for guest VLAN with tag " + privateVlanTag + " that is active when the guest network is being removed. Removing rule..."); + s_logger.warn("Found a destination NAT rule (public IP: " + publicIp + ", private IP: " + privateIp + ", public port: " + srcPort + ", private port: " + + destPort + ") for guest VLAN with tag " + privateVlanTag + " that is active when the guest network is being removed. Removing rule..."); } removeDestinationNatRule(publicVlanTag, publicIp, privateIp, srcPort, destPort); @@ -2161,7 +2163,8 @@ public class JuniperSrxResource implements ServerResource { */ private String genDestinationNatRuleName(String publicIp, String privateIp, long srcPort, long destPort) { - return "destnatrule-" + String.valueOf(genObjectName(publicIp, privateIp, String.valueOf(srcPort), String.valueOf(destPort)).hashCode()).replaceAll("[^a-zA-Z0-9]", ""); + return "destnatrule-" + + String.valueOf(genObjectName(publicIp, privateIp, String.valueOf(srcPort), String.valueOf(destPort)).hashCode()).replaceAll("[^a-zA-Z0-9]", ""); } private boolean manageDestinationNatRule(SrxCommand command, String publicIp, String privateIp, long srcPort, long destPort) throws ExecutionException { @@ -2185,7 +2188,8 @@ public class JuniperSrxResource implements ServerResource { } if (!manageDestinationNatPool(SrxCommand.CHECK_IF_EXISTS, privateIp, destPort)) { - throw new ExecutionException("The destination NAT pool corresponding to private IP: " + privateIp + " and destination port: " + destPort + " does not exist."); + throw new ExecutionException("The destination NAT pool corresponding to private IP: " + privateIp + " and destination port: " + destPort + + " does not exist."); } xml = SrxXml.DEST_NAT_RULE_ADD.getXml(); @@ -2197,8 +2201,8 @@ public class JuniperSrxResource implements ServerResource { xml = replaceXmlValue(xml, "pool-name", poolName); if (!sendRequestAndCheckResponse(command, xml)) { - throw new ExecutionException("Failed to add destination NAT rule from public IP " + publicIp + ", public port " + srcPort + ", private IP " + privateIp + - ", and private port " + destPort); + throw new ExecutionException("Failed to add destination NAT rule from public IP " + publicIp + ", public port " + srcPort + ", private IP " + + privateIp + ", and private port " + destPort); } else { return true; } @@ -2215,8 +2219,8 @@ public class JuniperSrxResource implements ServerResource { xml = replaceXmlValue(xml, "rule-name", ruleName); if (!sendRequestAndCheckResponse(command, xml)) { - throw new ExecutionException("Failed to delete destination NAT rule from public IP " + publicIp + ", public port " + srcPort + ", private IP " + privateIp + - ", and private port " + destPort); + throw new ExecutionException("Failed to delete destination NAT rule from public IP " + publicIp + ", public port " + srcPort + ", private IP " + + privateIp + ", and private port " + destPort); } else { return true; } @@ -2228,7 +2232,8 @@ public class JuniperSrxResource implements ServerResource { } - private List getDestNatRules(RuleMatchCondition condition, String publicIp, String privateIp, String privateGateway, Long privateCidrSize) throws ExecutionException { + private List getDestNatRules(RuleMatchCondition condition, String publicIp, String privateIp, String privateGateway, Long privateCidrSize) + throws ExecutionException { List destNatRules = new ArrayList(); String xmlRequest = SrxXml.DEST_NAT_RULE_GETALL.getXml(); @@ -2961,7 +2966,8 @@ public class JuniperSrxResource implements ServerResource { return true; } - private boolean removeEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List cidrs, boolean defaultEgressAction) throws ExecutionException { + private boolean removeEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List cidrs, boolean defaultEgressAction) + throws ExecutionException { if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, guestVlan, null, cidrs, null, defaultEgressAction)) { return true; } @@ -2998,8 +3004,8 @@ public class JuniperSrxResource implements ServerResource { return true; } - private boolean addEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List applications, List cidrs, boolean defaultEgressAction) - throws ExecutionException { + private boolean addEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List applications, List cidrs, + boolean defaultEgressAction) throws ExecutionException { // Add all necessary applications List applicationNames = new ArrayList(); for (Object[] application : applications) { diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java index c51b47376a9..ccd2fb695f6 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java @@ -19,6 +19,40 @@ package com.cloud.network.element; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import javax.ws.rs.core.MultivaluedMap; + +import org.apache.log4j.Logger; +import org.midonet.client.MidonetApi; +import org.midonet.client.dto.DtoRule; +import org.midonet.client.dto.DtoRule.DtoRange; +import org.midonet.client.exception.HttpInternalServerError; +import org.midonet.client.resource.Bridge; +import org.midonet.client.resource.BridgePort; +import org.midonet.client.resource.DhcpHost; +import org.midonet.client.resource.DhcpSubnet; +import org.midonet.client.resource.Port; +import org.midonet.client.resource.ResourceCollection; +import org.midonet.client.resource.Route; +import org.midonet.client.resource.Router; +import org.midonet.client.resource.RouterPort; +import org.midonet.client.resource.Rule; +import org.midonet.client.resource.RuleChain; +import org.springframework.stereotype.Component; + +import com.sun.jersey.core.util.MultivaluedMapImpl; + +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.agent.api.to.FirewallRuleTO; import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.configuration.Config; @@ -41,55 +75,22 @@ import com.cloud.network.rules.StaticNat; import com.cloud.network.vpc.VpcManager; import com.cloud.offering.NetworkOffering; import com.cloud.user.AccountManager; +import com.cloud.user.AccountVO; +import com.cloud.user.dao.AccountDao; import com.cloud.utils.Pair; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.PluggableService; import com.cloud.utils.net.NetUtils; -import com.cloud.user.AccountVO; -import com.cloud.user.dao.AccountDao; import com.cloud.vm.NicProfile; import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -import org.midonet.client.MidonetApi; -import org.midonet.client.exception.HttpInternalServerError; -import org.midonet.client.dto.DtoRule; -import org.midonet.client.dto.DtoRule.DtoRange; -import org.midonet.client.resource.Bridge; -import org.midonet.client.resource.BridgePort; -import org.midonet.client.resource.DhcpHost; -import org.midonet.client.resource.DhcpSubnet; -import org.midonet.client.resource.Port; -import org.midonet.client.resource.ResourceCollection; -import org.midonet.client.resource.Route; -import org.midonet.client.resource.Router; -import org.midonet.client.resource.RouterPort; -import org.midonet.client.resource.Rule; -import org.midonet.client.resource.RuleChain; -import com.sun.jersey.core.util.MultivaluedMapImpl; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import javax.ws.rs.core.MultivaluedMap; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; @Component @Local(value = {NetworkElement.class, ConnectivityProvider.class, FirewallServiceProvider.class, SourceNatServiceProvider.class, DhcpServiceProvider.class, - StaticNatServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class}) + StaticNatServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class}) public class MidoNetElement extends AdapterBase implements ConnectivityProvider, DhcpServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, IpDeployer, PortForwardingServiceProvider, FirewallServiceProvider, PluggableService { @@ -137,11 +138,11 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, public boolean configure(String name, Map params) throws ConfigurationException { super.configure(name, params); - String routerIdValue = (String)_configDao.getValue(Config.MidoNetProviderRouterId.key()); + String routerIdValue = _configDao.getValue(Config.MidoNetProviderRouterId.key()); if (routerIdValue != null) _providerRouterId = UUID.fromString(routerIdValue); - String value = (String)_configDao.getValue(Config.MidoNetAPIServerAddress.key()); + String value = _configDao.getValue(Config.MidoNetAPIServerAddress.key()); if (value == null) { throw new ConfigurationException("Could not find midonet API location in config"); @@ -191,8 +192,8 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, return true; } - public void - applySourceNat(Router tenantRouter, Router providerRouter, RouterPort tenantUplink, RouterPort providerDownlink, RuleChain pre, RuleChain post, PublicIpAddress addr) { + public void applySourceNat(Router tenantRouter, Router providerRouter, RouterPort tenantUplink, RouterPort providerDownlink, RuleChain pre, RuleChain post, + PublicIpAddress addr) { boolean needAdd = true; String SNtag = "/SourceNat"; @@ -246,7 +247,14 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, .create(); // Set outbound (SNAT) rule - post.addRule().type(DtoRule.SNAT).flowAction(DtoRule.Accept).outPorts(new UUID[] {tenantUplink.getId()}).natTargets(targets).position(1).properties(ruleProps).create(); + post.addRule() + .type(DtoRule.SNAT) + .flowAction(DtoRule.Accept) + .outPorts(new UUID[] {tenantUplink.getId()}) + .natTargets(targets) + .position(1) + .properties(ruleProps) + .create(); // Set up default route from tenant router to provider router tenantRouter.addRoute() @@ -378,8 +386,8 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, * From interface DHCPServiceProvider */ @Override - public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { s_logger.debug("addDhcpEntry called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString()); if (!this.midoInNetwork(network)) { @@ -681,15 +689,16 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, Pair cidrParts = NetUtils.getCidr(relatedCidr); // Create rule with correct proto, cidr, ACCEPT, dst IP - Rule toApply = preFilter.addRule() - .type(DtoRule.Jump) - .jumpChainId(preNat.getId()) - .position(1) - .nwSrcAddress(cidrParts.first()) - .nwSrcLength(cidrParts.second()) - .nwDstAddress(ruleTO.getSrcIp()) - .nwDstLength(32) - .nwProto(SimpleFirewallRule.stringToProtocolNumber(rule.getProtocol())); + Rule toApply = + preFilter.addRule() + .type(DtoRule.Jump) + .jumpChainId(preNat.getId()) + .position(1) + .nwSrcAddress(cidrParts.first()) + .nwSrcLength(cidrParts.second()) + .nwDstAddress(ruleTO.getSrcIp()) + .nwDstLength(32) + .nwProto(SimpleFirewallRule.stringToProtocolNumber(rule.getProtocol())); if (rule.getProtocol().equals("icmp")) { // ICMP rules - reuse port fields @@ -739,8 +748,8 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { s_logger.debug("prepare called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString()); if (!midoInNetwork(network)) { return false; @@ -799,7 +808,8 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { s_logger.debug("release called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString()); if (!midoInNetwork(network)) { return false; @@ -878,7 +888,8 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // Nothing to do here because the cleanup of the networks themselves clean up the resources. return true; } @@ -1007,15 +1018,16 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, DtoRule.DtoNatTarget[] preTargets = new DtoRule.DtoNatTarget[] {new DtoRule.DtoNatTarget(vmIp, vmIp, privPortStart, privPortEnd)}; - Rule preNatRule = preNat.addRule() - .type(DtoRule.DNAT) - .flowAction(DtoRule.Accept) - .nwDstAddress(publicIp) - .nwDstLength(32) - .tpDst(new DtoRange(pubPortStart, pubPortEnd)) - .natTargets(preTargets) - .nwProto(SimpleFirewallRule.stringToProtocolNumber(rule.getProtocol())) - .position(1); + Rule preNatRule = + preNat.addRule() + .type(DtoRule.DNAT) + .flowAction(DtoRule.Accept) + .nwDstAddress(publicIp) + .nwDstLength(32) + .tpDst(new DtoRange(pubPortStart, pubPortEnd)) + .natTargets(preTargets) + .nwProto(SimpleFirewallRule.stringToProtocolNumber(rule.getProtocol())) + .position(1); Integer cnt = ipRuleCounts.get(publicIp); if (cnt != null) { @@ -1028,14 +1040,15 @@ public class MidoNetElement extends AdapterBase implements ConnectivityProvider, preNatRule.create(); if (routes.get(publicIp) == null) { - Route route = providerRouter.addRoute() - .type("Normal") - .weight(100) - .srcNetworkAddr("0.0.0.0") - .srcNetworkLength(0) - .dstNetworkAddr(publicIp) - .dstNetworkLength(32) - .nextHopPort(providerDownlink.getId()); + Route route = + providerRouter.addRoute() + .type("Normal") + .weight(100) + .srcNetworkAddr("0.0.0.0") + .srcNetworkLength(0) + .dstNetworkAddr(publicIp) + .dstNetworkLength(32) + .nextHopPort(providerDownlink.getId()); route.create(); routes.put(publicIp, route); } diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java index 33fdf600709..664132f54ed 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java @@ -18,16 +18,20 @@ */ package com.cloud.network.element; +import java.util.ArrayList; +import java.util.List; +// Used for translation between MidoNet firewall rules and +// CloudStack firewall rules + +import org.midonet.client.dto.DtoRule; +import org.midonet.client.resource.Rule; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; + import com.cloud.agent.api.to.FirewallRuleTO; import com.cloud.agent.api.to.NetworkACLTO; import com.cloud.agent.api.to.PortForwardingRuleTO; -import org.midonet.client.dto.DtoRule; -import org.midonet.client.resource.*; -import com.google.common.collect.*; - -import java.util.*; -// Used for translation between MidoNet firewall rules and -// CloudStack firewall rules public class SimpleFirewallRule { diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java index c88e49ff015..51dac3b3468 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java @@ -19,25 +19,30 @@ package com.cloud.network.guru; +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.dc.DataCenter.NetworkType; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.network.*; +import com.cloud.network.Network; +import com.cloud.network.NetworkProfile; +import com.cloud.network.Networks; import com.cloud.network.PhysicalNetwork; +import com.cloud.network.dao.NetworkVO; +import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.AccountVO; import com.cloud.user.dao.AccountDao; -import com.cloud.vm.*; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import com.cloud.network.dao.NetworkVO; -import com.cloud.network.dao.PhysicalNetworkVO; - -import javax.ejb.Local; -import javax.inject.Inject; +import com.cloud.vm.NicProfile; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.VirtualMachineProfile; @Component @Local(value = NetworkGuru.class) @@ -60,7 +65,7 @@ public class MidoNetGuestNetworkGuru extends GuestNetworkGuru { return true; } else { s_logger.trace("We only take care of Guest networks of type " + Network.GuestType.Isolated + " in zone of type " + NetworkType.Advanced + - " using isolation method MIDO."); + " using isolation method MIDO."); return false; } } @@ -87,7 +92,8 @@ public class MidoNetGuestNetworkGuru extends GuestNetworkGuru { } @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (network.getState() == Network.State.Implementing) : "Why are we implementing " + network; s_logger.debug("implement called network: " + network.toString()); @@ -96,8 +102,9 @@ public class MidoNetGuestNetworkGuru extends GuestNetworkGuru { //get physical network id long physicalNetworkId = _networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), - Network.State.Allocated, network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), Network.State.Allocated, + network.getDataCenterId(), physicalNetworkId); if (network.getGateway() != null) { implemented.setGateway(network.getGateway()); diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java index db1cd36b0d4..d81dc9dd14d 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java @@ -78,8 +78,9 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru { } if (offering.getTrafficType() == Networks.TrafficType.Public) { - NetworkVO ntwk = new NetworkVO(offering.getTrafficType(), Networks.Mode.Static, Networks.BroadcastDomainType.Mido, offering.getId(), Network.State.Allocated, - plan.getDataCenterId(), plan.getPhysicalNetworkId()); + NetworkVO ntwk = + new NetworkVO(offering.getTrafficType(), Networks.Mode.Static, Networks.BroadcastDomainType.Mido, offering.getId(), Network.State.Allocated, + plan.getDataCenterId(), plan.getPhysicalNetworkId()); return ntwk; } else { return null; @@ -130,8 +131,8 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru { } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, - ConcurrentOperationException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException { s_logger.debug("allocate called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString()); DataCenter dc = _dcDao.findById(network.getDataCenterId()); @@ -183,8 +184,9 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru { //get physical network id long physicalNetworkId = _networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), - Network.State.Allocated, network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), Network.State.Allocated, + network.getDataCenterId(), physicalNetworkId); if (network.getGateway() != null) { implemented.setGateway(network.getGateway()); diff --git a/plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java b/plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java index 2fbf05cfa0c..fd2b5ed3fec 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java @@ -19,25 +19,29 @@ package com.cloud.network.resource; -import com.cloud.hypervisor.kvm.resource.*; +import java.util.Map; +import java.util.UUID; + +import javax.naming.ConfigurationException; +import javax.ws.rs.core.MultivaluedMap; + +import org.apache.log4j.Logger; +import org.libvirt.LibvirtException; +import org.midonet.client.MidonetApi; +import org.midonet.client.resource.Bridge; +import org.midonet.client.resource.BridgePort; +import org.midonet.client.resource.Host; + +import com.sun.jersey.core.util.MultivaluedMapImpl; + import com.cloud.agent.api.to.NicTO; import com.cloud.exception.InternalErrorException; +import com.cloud.hypervisor.kvm.resource.LibvirtVMDef; +import com.cloud.hypervisor.kvm.resource.VifDriverBase; import com.cloud.network.Networks; import com.cloud.utils.NumbersUtil; import com.cloud.utils.script.OutputInterpreter; import com.cloud.utils.script.Script; -import org.apache.log4j.Logger; -import org.libvirt.LibvirtException; -import com.sun.jersey.core.util.MultivaluedMapImpl; -import javax.ws.rs.core.MultivaluedMap; -import javax.naming.ConfigurationException; -import java.util.Map; -import java.util.UUID; - -import org.midonet.client.resource.Bridge; -import org.midonet.client.resource.BridgePort; -import org.midonet.client.resource.Host; -import org.midonet.client.MidonetApi; public class MidoNetVifDriver extends VifDriverBase { diff --git a/plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java b/plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java index 475a9ad6c65..8434831e3aa 100644 --- a/plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java +++ b/plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java @@ -19,24 +19,39 @@ package com.cloud.network.element; -import com.cloud.user.AccountVO; -import com.cloud.user.dao.AccountDao; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.UUID; + import junit.framework.TestCase; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.*; + import org.midonet.client.MidonetApi; -import org.midonet.client.resource.*; -import com.sun.jersey.core.util.MultivaluedMapImpl; -import com.cloud.network.*; -import com.cloud.vm.*; -import com.cloud.network.rules.StaticNat; -import com.cloud.network.element.MidoNetElement; +import org.midonet.client.resource.Bridge; +import org.midonet.client.resource.BridgePort; +import org.midonet.client.resource.DhcpHost; +import org.midonet.client.resource.DhcpSubnet; +import org.midonet.client.resource.Port; +import org.midonet.client.resource.ResourceCollection; +import org.midonet.client.resource.Router; +import org.midonet.client.resource.RouterPort; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; -import sun.security.util.Resources_es; - -import java.util.*; +import com.cloud.network.Network; +import com.cloud.network.Networks; +import com.cloud.user.AccountVO; +import com.cloud.user.dao.AccountDao; +import com.cloud.vm.NicProfile; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; public class MidoNetElementTest extends TestCase { @@ -95,7 +110,7 @@ public class MidoNetElementTest extends TestCase { //mockVm @SuppressWarnings("unchecked") - VirtualMachineProfile mockVm = (VirtualMachineProfile)mock(VirtualMachineProfile.class); + VirtualMachineProfile mockVm = mock(VirtualMachineProfile.class); when(mockVm.getType()).thenReturn(VirtualMachine.Type.User); MidoNetElement elem = new MidoNetElement(); diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java index e9a231955b4..9188f3abd90 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java @@ -15,20 +15,29 @@ package com.cloud.api.commands; -import com.cloud.api.response.NetscalerLoadBalancerResponse; -import com.cloud.event.EventTypes; -import com.cloud.exception.*; -import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; -import com.cloud.network.element.NetscalerLoadBalancerElementService; -import com.cloud.utils.exception.CloudRuntimeException; - -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.cloudstack.context.CallContext; +import javax.inject.Inject; import org.apache.log4j.Logger; -import javax.inject.Inject; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.context.CallContext; + +import com.cloud.api.response.NetscalerLoadBalancerResponse; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; +import com.cloud.network.element.NetscalerLoadBalancerElementService; +import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "addNetscalerLoadBalancer", responseObject = NetscalerLoadBalancerResponse.class, description = "Adds a netscaler load balancer device") public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd { @@ -64,7 +73,10 @@ public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd { description = "Netscaler device type supports NetscalerMPXLoadBalancer, NetscalerVPXLoadBalancer, NetscalerSDXLoadBalancer") private String deviceType; - @Parameter(name = ApiConstants.GSLB_PROVIDER, type = CommandType.BOOLEAN, required = false, description = "true if NetScaler device being added is for providing GSLB service") + @Parameter(name = ApiConstants.GSLB_PROVIDER, + type = CommandType.BOOLEAN, + required = false, + description = "true if NetScaler device being added is for providing GSLB service") private boolean isGslbProvider; @Parameter(name = ApiConstants.GSLB_PROVIDER_PUBLIC_IP, type = CommandType.STRING, required = false, description = "public IP of the site") @@ -114,7 +126,8 @@ public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalLoadBalancerDeviceVO lbDeviceVO = _netsclarLbService.addNetscalerLoadBalancer(this); if (lbDeviceVO != null) { diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java index ec5f3b0a41f..f8bfd744f4e 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java @@ -18,12 +18,15 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PodResponse; - import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.api.response.NetscalerLoadBalancerResponse; @@ -80,8 +83,8 @@ public class ConfigureNetscalerLoadBalancerCmd extends BaseAsyncCmd { entityType = PodResponse.class, required = false, description = "Used when NetScaler device is provider of EIP service." - + " This parameter represents the list of pod's, for which there exists a policy based route on datacenter L3 router to " - + "route pod's subnet IP to a NetScaler device.") + + " This parameter represents the list of pod's, for which there exists a policy based route on datacenter L3 router to " + + "route pod's subnet IP to a NetScaler device.") private List podIds; ///////////////////////////////////////////////////// @@ -113,7 +116,8 @@ public class ConfigureNetscalerLoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalLoadBalancerDeviceVO lbDeviceVO = _netsclarLbService.configureNetscalerLoadBalancer(this); if (lbDeviceVO != null) { diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java index 40e11acedd6..f0f6747c4ac 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java @@ -19,11 +19,10 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -71,7 +70,8 @@ public class DeleteNetscalerLoadBalancerCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _netsclarLbService.deleteNetscalerLoadBalancer(this); if (result) { diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java index 50f276e5eeb..25d1487f4ed 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java @@ -21,15 +21,15 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + import com.cloud.api.response.NetscalerLoadBalancerResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -40,7 +40,9 @@ import com.cloud.network.Network; import com.cloud.network.element.NetscalerLoadBalancerElementService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "listNetscalerLoadBalancerNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a netscaler load balancer device") +@APICommand(name = "listNetscalerLoadBalancerNetworks", + responseObject = NetworkResponse.class, + description = "lists network that are using a netscaler load balancer device") public class ListNetscalerLoadBalancerNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNetscalerLoadBalancerNetworksCmd.class.getName()); @@ -72,7 +74,8 @@ public class ListNetscalerLoadBalancerNetworksCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List networks = _netsclarLbService.listNetworks(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java index d640901b31b..75d03d7e9e0 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java @@ -19,17 +19,17 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + import com.cloud.api.response.NetscalerLoadBalancerResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -78,7 +78,8 @@ public class ListNetscalerLoadBalancersCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List lbDevices = _netsclarLbService.listNetscalerLoadBalancers(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java index a393f369a7b..63de361cfc5 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java @@ -18,13 +18,14 @@ package com.cloud.api.response; import java.util.List; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.EntityReference; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.network.dao.ExternalLoadBalancerDeviceVO; +import com.cloud.serializer.Param; @EntityReference(value = ExternalLoadBalancerDeviceVO.class) @SuppressWarnings("unused") @@ -84,8 +85,8 @@ public class NetscalerLoadBalancerResponse extends BaseResponse { @SerializedName(ApiConstants.POD_IDS) @Param(description = "Used when NetScaler device is provider of EIP service." - + " This parameter represents the list of pod's, for which there exists a policy based route on datacenter L3 router to " - + "route pod's subnet IP to a NetScaler device.") + + " This parameter represents the list of pod's, for which there exists a policy based route on datacenter L3 router to " + + "route pod's subnet IP to a NetScaler device.") private List podIds; public void setId(String lbDeviceId) { diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java index 8cc45fc8daf..9ad5278f2eb 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java @@ -16,15 +16,13 @@ // under the License. package com.cloud.network; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + /** * NetScalerPodVO contains information about a EIP deployment where on datacenter L3 router a PBR (policy * based routing) is setup between a POD's subnet IP range to a NetScaler device. This VO object @@ -54,6 +52,7 @@ public class NetScalerPodVO implements InternalIdentity { this.podId = podId; } + @Override public long getId() { return id; } diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 6e2cc7318e6..7e68f4e941c 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -27,11 +27,14 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + +import com.google.gson.Gson; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.cloudstack.region.gslb.GslbServiceProvider; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -102,9 +105,6 @@ import com.cloud.network.rules.LbStickinessMethod; import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType; import com.cloud.network.rules.LoadBalancerContainer; import com.cloud.network.rules.StaticNat; -import com.cloud.network.vpc.PrivateGateway; -import com.cloud.network.vpc.StaticRouteProfile; -import com.cloud.network.vpc.Vpc; import com.cloud.offering.NetworkOffering; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.DB; @@ -115,9 +115,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.UrlUtil; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -import com.google.gson.Gson; @Local(value = {NetworkElement.class, StaticNatServiceProvider.class, LoadBalancingServiceProvider.class, GslbServiceProvider.class}) public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, @@ -162,13 +160,14 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl private boolean canHandle(Network config, Service service) { DataCenter zone = _dcDao.findById(config.getDataCenterId()); - boolean handleInAdvanceZone = (zone.getNetworkType() == NetworkType.Advanced && - (config.getGuestType() == Network.GuestType.Isolated || config.getGuestType() == Network.GuestType.Shared) && config.getTrafficType() == TrafficType.Guest); - boolean handleInBasicZone = (zone.getNetworkType() == NetworkType.Basic && config.getGuestType() == Network.GuestType.Shared && config.getTrafficType() == TrafficType.Guest); + boolean handleInAdvanceZone = + (zone.getNetworkType() == NetworkType.Advanced && (config.getGuestType() == Network.GuestType.Isolated || config.getGuestType() == Network.GuestType.Shared) && config.getTrafficType() == TrafficType.Guest); + boolean handleInBasicZone = + (zone.getNetworkType() == NetworkType.Basic && config.getGuestType() == Network.GuestType.Shared && config.getTrafficType() == TrafficType.Guest); if (!(handleInAdvanceZone || handleInBasicZone)) { s_logger.trace("Not handling network with Type " + config.getGuestType() + " and traffic type " + config.getTrafficType() + " in zone of type " + - zone.getNetworkType()); + zone.getNetworkType()); return false; } @@ -191,7 +190,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl if (_ntwkSrvcDao.canProviderSupportServiceInNetwork(guestConfig.getId(), Service.StaticNat, Network.Provider.Netscaler) && !isBasicZoneNetwok(guestConfig)) { s_logger.error("NetScaler provider can not be Static Nat service provider for the network " + guestConfig.getGuestType() + " and traffic type " + - guestConfig.getTrafficType()); + guestConfig.getTrafficType()); return false; } @@ -204,8 +203,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } @Override - public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientNetworkCapacityException, ResourceUnavailableException { + public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { return true; } @@ -352,7 +351,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } Map configParams = new HashMap(); UrlUtil.parseQueryParameters(uri.getQuery(), false, configParams); - boolean dedicatedUse = (configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED)) + boolean dedicatedUse = + (configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED)) : false; if (dedicatedUse && !deviceName.equals(NetworkDevice.NetscalerVPXLoadBalancer.getName())) { @@ -381,8 +381,9 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } - ExternalLoadBalancerDeviceVO lbDeviceVO = addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, - new NetscalerResource(), cmd.isGslbProvider(), cmd.getSitePublicIp(), cmd.getSitePrivateIp()); + ExternalLoadBalancerDeviceVO lbDeviceVO = + addExternalLoadBalancer(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, new NetscalerResource(), + cmd.isGslbProvider(), cmd.getSitePublicIp(), cmd.getSitePrivateIp()); return lbDeviceVO; } @@ -454,7 +455,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl String deviceName = lbDeviceVo.getDeviceName(); if (dedicatedUse != null || capacity != null) { - if (NetworkDevice.NetscalerSDXLoadBalancer.getName().equalsIgnoreCase(deviceName) || NetworkDevice.NetscalerMPXLoadBalancer.getName().equalsIgnoreCase(deviceName)) { + if (NetworkDevice.NetscalerSDXLoadBalancer.getName().equalsIgnoreCase(deviceName) || + NetworkDevice.NetscalerMPXLoadBalancer.getName().equalsIgnoreCase(deviceName)) { if (dedicatedUse != null && dedicatedUse == true) { throw new InvalidParameterValueException("Netscaler MPX and SDX device should be shared and can not be dedicated to a single account."); } @@ -639,7 +641,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO reset the configuration on all of the netscaler devices in this physical network return true; } @@ -651,7 +654,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl private boolean isNetscalerDevice(String deviceName) { if ((deviceName == null) || - ((!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerMPXLoadBalancer.getName())) && (!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerSDXLoadBalancer.getName())) && (!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerVPXLoadBalancer.getName())))) { + ((!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerMPXLoadBalancer.getName())) && + (!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerSDXLoadBalancer.getName())) && (!deviceName.equalsIgnoreCase(NetworkDevice.NetscalerVPXLoadBalancer.getName())))) { return false; } else { return true; @@ -731,8 +735,9 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl List destinations = rule.getDestinations(); if ((destinations != null && !destinations.isEmpty()) || rule.isAutoScaleConfig()) { - LoadBalancerTO loadBalancer = new LoadBalancerTO(lbUuid, srcIp, srcPort, protocol, algorithm, revoked, false, false, destinations, rule.getStickinessPolicies(), - rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); + LoadBalancerTO loadBalancer = + new LoadBalancerTO(lbUuid, srcIp, srcPort, protocol, algorithm, revoked, false, false, destinations, rule.getStickinessPolicies(), + rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); if (rule.isAutoScaleConfig()) { loadBalancer.setAutoScaleVmGroup(rule.getAutoScaleVmGroup()); } @@ -749,8 +754,9 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl Answer answer = _agentMgr.easySend(externalLoadBalancer.getId(), cmd); if (answer == null || !answer.getResult()) { String details = (answer != null) ? answer.getDetails() : "details unavailable"; - String msg = "Unable to apply elastic load balancer rules to the external load balancer appliance in zone " + network.getDataCenterId() + " due to: " + details + - "."; + String msg = + "Unable to apply elastic load balancer rules to the external load balancer appliance in zone " + network.getDataCenterId() + " due to: " + details + + "."; s_logger.error(msg); throw new ResourceUnavailableException(msg, DataCenter.class, network.getDataCenterId()); } @@ -793,8 +799,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl rulesTO = new ArrayList(); for (StaticNat rule : rules) { IpAddress sourceIp = _networkMgr.getIp(rule.getSourceIpAddressId()); - StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), - false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); } } @@ -819,8 +825,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl List rulesTO = new ArrayList(); IpAddress sourceIp = _networkMgr.getIp(rule.getSourceIpAddressId()); - StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), - false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, null); @@ -895,8 +901,9 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl List destinations = rule.getDestinations(); if ((destinations != null && !destinations.isEmpty()) || rule.isAutoScaleConfig()) { - LoadBalancerTO loadBalancer = new LoadBalancerTO(lbUuid, srcIp, srcPort, protocol, algorithm, revoked, false, false, destinations, null, - rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); + LoadBalancerTO loadBalancer = + new LoadBalancerTO(lbUuid, srcIp, srcPort, protocol, algorithm, revoked, false, false, destinations, null, rule.getHealthCheckPolicies(), + rule.getLbSslCert(), rule.getLbProtocol()); loadBalancersToApply.add(loadBalancer); } } @@ -912,6 +919,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl return null; } + @Override public List updateHealthChecks(Network network, List lbrules) { if (canHandle(network, Service.Lb) && canHandleLbRules(lbrules)) { @@ -931,6 +939,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl return null; } + @Override public List getLBHealthChecks(Network network, List rules) throws ResourceUnavailableException { return super.getLBHealthChecks(network, rules); } @@ -971,7 +980,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl for (PhysicalNetwork physicalNetwork : pNtwks) { if (physicalNetwork.getId() == physicalNetworkId) { PhysicalNetworkVO physNetwork = pNtwks.get(0); - ExternalLoadBalancerDeviceVO nsGslbProvider = _externalLoadBalancerDeviceDao.findGslbServiceProvider(physNetwork.getId(), Provider.Netscaler.getName()); + ExternalLoadBalancerDeviceVO nsGslbProvider = + _externalLoadBalancerDeviceDao.findGslbServiceProvider(physNetwork.getId(), Provider.Netscaler.getName()); return nsGslbProvider; } } diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java index 378671d22b0..ea4ab931fb6 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java @@ -17,6 +17,7 @@ package com.cloud.network.element; import java.util.List; + import com.cloud.api.commands.AddNetscalerLoadBalancerCmd; import com.cloud.api.commands.ConfigureNetscalerLoadBalancerCmd; import com.cloud.api.commands.DeleteNetscalerLoadBalancerCmd; diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java index 276fc97d6ee..7dac9a008aa 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java @@ -25,14 +25,11 @@ import java.util.Map; import javax.naming.ConfigurationException; -import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey; -import com.citrix.netscaler.nitro.resource.config.ssl.sslvserver_sslcertkey_binding; -import com.cloud.network.lb.LoadBalancingRule.LbSslCert; -import com.cloud.utils.ssh.SshHelper; import org.apache.log4j.Logger; import com.citrix.netscaler.nitro.exception.nitro_exception; import com.citrix.netscaler.nitro.resource.base.base_response; +import com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction; import com.citrix.netscaler.nitro.resource.config.autoscale.autoscalepolicy; import com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleprofile; import com.citrix.netscaler.nitro.resource.config.basic.server_service_binding; @@ -64,6 +61,8 @@ import com.citrix.netscaler.nitro.resource.config.ns.nshardware; import com.citrix.netscaler.nitro.resource.config.ns.nsip; import com.citrix.netscaler.nitro.resource.config.ns.nstimer; import com.citrix.netscaler.nitro.resource.config.ns.nstimer_autoscalepolicy_binding; +import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey; +import com.citrix.netscaler.nitro.resource.config.ssl.sslvserver_sslcertkey_binding; import com.citrix.netscaler.nitro.resource.stat.lb.lbvserver_stats; import com.citrix.netscaler.nitro.service.nitro_service; import com.citrix.netscaler.nitro.util.filtervalue; @@ -112,6 +111,7 @@ import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO; import com.cloud.agent.api.to.StaticNatRuleTO; import com.cloud.host.Host; import com.cloud.host.Host.Type; +import com.cloud.network.lb.LoadBalancingRule.LbSslCert; import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType; import com.cloud.resource.ServerResource; import com.cloud.serializer.GsonHelper; @@ -119,6 +119,7 @@ import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.exception.ExecutionException; import com.cloud.utils.net.NetUtils; +import com.cloud.utils.ssh.SshHelper; class NitroError { static final int NS_RESOURCE_EXISTS = 273; @@ -289,7 +290,7 @@ public class NetscalerResource implements ServerResource { apiCallResult = _netscalerService.login(); if (apiCallResult.errorcode != 0) { throw new ExecutionException("Failed to log in to Netscaler device at " + _ip + " due to error " + apiCallResult.errorcode + " and message " + - apiCallResult.message); + apiCallResult.message); } } else { _netscalerSdxService = new com.citrix.sdx.nitro.service.nitro_service(_ip, "https"); @@ -297,7 +298,7 @@ public class NetscalerResource implements ServerResource { com.citrix.sdx.nitro.resource.base.login login = _netscalerSdxService.login(); if (login == null) { throw new ExecutionException("Failed to log in to Netscaler SDX device at " + _ip + " due to error " + apiCallResult.errorcode + " and message " + - apiCallResult.message); + apiCallResult.message); } } } catch (nitro_exception e) { @@ -500,8 +501,8 @@ public class NetscalerResource implements ServerResource { if ((healthCheckPolicies != null) && (healthCheckPolicies.length > 0) && (healthCheckPolicies[0] != null)) { String nsVirtualServerName = generateNSVirtualServerName(loadBalancer.getSrcIp(), loadBalancer.getSrcPort()); - com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get( - _netscalerService, nsVirtualServerName); + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName); if (serviceBindings != null) { for (DestinationTO destination : loadBalancer.getDestinations()) { @@ -625,20 +626,22 @@ public class NetscalerResource implements ServerResource { apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.service.add(_netscalerService, newService); if (apiCallResult.errorcode != 0) { - throw new ExecutionException("Failed to create service " + nsServiceName + " using server " + nsServerName + " due to" + apiCallResult.message); + throw new ExecutionException("Failed to create service " + nsServiceName + " using server " + nsServerName + " due to" + + apiCallResult.message); } } //bind service to load balancing virtual server if (!nsServiceBindingExists(nsVirtualServerName, nsServiceName)) { - com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding svcBinding = new com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding(); + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding svcBinding = + new com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding(); svcBinding.set_name(nsVirtualServerName); svcBinding.set_servicename(nsServiceName); apiCallResult = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.add(_netscalerService, svcBinding); if (apiCallResult.errorcode != 0) { throw new ExecutionException("Failed to bind service: " + nsServiceName + " to the lb virtual server: " + nsVirtualServerName + - " on Netscaler device"); + " on Netscaler device"); } } @@ -685,22 +688,22 @@ public class NetscalerResource implements ServerResource { } if (s_logger.isDebugEnabled()) { - s_logger.debug("Successfully added LB destination: " + destination.getDestIp() + ":" + destination.getDestPort() + " to load balancer " + srcIp + - ":" + srcPort); + s_logger.debug("Successfully added LB destination: " + destination.getDestIp() + ":" + destination.getDestPort() + " to load balancer " + + srcIp + ":" + srcPort); } } else { // remove a destination from the deployed load balancing rule - com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get( - _netscalerService, nsVirtualServerName); + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName); if (serviceBindings != null) { for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) { if (nsServiceName.equalsIgnoreCase(binding.get_servicename())) { // delete the binding apiCallResult = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.delete(_netscalerService, binding); if (apiCallResult.errorcode != 0) { - throw new ExecutionException("Failed to delete the binding between the virtual server: " + nsVirtualServerName + " and service:" + - nsServiceName + " due to" + apiCallResult.message); + throw new ExecutionException("Failed to delete the binding between the virtual server: " + nsVirtualServerName + + " and service:" + nsServiceName + " due to" + apiCallResult.message); } // check if service is bound to any other virtual server @@ -730,19 +733,20 @@ public class NetscalerResource implements ServerResource { lbvserver lbserver = getVirtualServerIfExisits(nsVirtualServerName); if (lbserver != null) { //unbind the all services associated with this virtual server - com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get( - _netscalerService, nsVirtualServerName); + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName); if (serviceBindings != null) { for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) { String serviceName = binding.get_servicename(); apiCallResult = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.delete(_netscalerService, binding); if (apiCallResult.errorcode != 0) { - throw new ExecutionException("Failed to unbind service from the lb virtual server: " + nsVirtualServerName + " due to " + apiCallResult.message); + throw new ExecutionException("Failed to unbind service from the lb virtual server: " + nsVirtualServerName + " due to " + + apiCallResult.message); } - com.citrix.netscaler.nitro.resource.config.basic.service svc = com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService, - serviceName); + com.citrix.netscaler.nitro.resource.config.basic.service svc = + com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService, serviceName); String nsServerName = svc.get_servername(); // check if service is bound to any other virtual server @@ -843,7 +847,7 @@ public class NetscalerResource implements ServerResource { device_profile[] profiles = device_profile.get(_netscalerSdxService); if (!(profiles != null && profiles.length >= 1)) { new Answer(cmd, new ExecutionException("Failed to create VPX instance on the netscaler SDX device " + _ip + - " as there are no admin profile to use for creating VPX.")); + " as there are no admin profile to use for creating VPX.")); } String profileName = profiles[0].get_name(); ns_obj.set_nsroot_profile(profileName); @@ -853,7 +857,7 @@ public class NetscalerResource implements ServerResource { xen_vpx_image[] vpxImages = xen_vpx_image.get(_netscalerSdxService); if (!(vpxImages != null && vpxImages.length >= 1)) { new Answer(cmd, new ExecutionException("Failed to create VPX instance on the netscaler SDX device " + _ip + - " as there are no VPX images on SDX to use for creating VPX.")); + " as there are no VPX images on SDX to use for creating VPX.")); } String imageName = vpxImages[0].get_file_name(); ns_obj.set_image_name(imageName); @@ -954,13 +958,14 @@ public class NetscalerResource implements ServerResource { privateIf = "1/1"; } - return new CreateLoadBalancerApplianceAnswer(cmd, true, "provisioned VPX instance", "NetscalerVPXLoadBalancer", "Netscaler", new NetscalerResource(), publicIf, - privateIf, _username, _password); + return new CreateLoadBalancerApplianceAnswer(cmd, true, "provisioned VPX instance", "NetscalerVPXLoadBalancer", "Netscaler", new NetscalerResource(), + publicIf, privateIf, _username, _password); } catch (Exception e) { if (shouldRetry(numRetries)) { return retry(cmd, numRetries); } - return new CreateLoadBalancerApplianceAnswer(cmd, false, "failed to provisioned VPX instance due to " + e.getMessage(), null, null, null, null, null, null, null); + return new CreateLoadBalancerApplianceAnswer(cmd, false, "failed to provisioned VPX instance due to " + e.getMessage(), null, null, null, null, null, null, + null); } } @@ -1205,8 +1210,9 @@ public class NetscalerResource implements ServerResource { } // create a 'gslbvserver' object representing a globally load balanced service - private static void createVirtualServer(nitro_service client, String vserverName, String lbMethod, String persistenceType, long persistenceId, String serviceType) - throws ExecutionException { + private static void + createVirtualServer(nitro_service client, String vserverName, String lbMethod, String persistenceType, long persistenceId, String serviceType) + throws ExecutionException { try { gslbvserver vserver; vserver = getVserverObject(client, vserverName); @@ -1314,7 +1320,8 @@ public class NetscalerResource implements ServerResource { } // update 'gslbvserver' object representing a globally load balanced service - private static void updateVirtualServer(nitro_service client, String vserverName, String lbMethod, String persistenceType, String serviceType) throws ExecutionException { + private static void updateVirtualServer(nitro_service client, String vserverName, String lbMethod, String persistenceType, String serviceType) + throws ExecutionException { try { gslbvserver vServer = getVserverObject(client, vserverName); if (vServer != null) { @@ -1604,7 +1611,7 @@ public class NetscalerResource implements ServerResource { } } catch (Exception e) { s_logger.debug("Failed to delete GSLB monitor " + monitorName + " and GSLB service " + serviceName + " binding due to " + e.getMessage() + - " but moving on ..., will be cleaned up as part of GSLB " + " service delete any way.."); + " but moving on ..., will be cleaned up as part of GSLB " + " service delete any way.."); } } @@ -2196,7 +2203,8 @@ public class NetscalerResource implements ServerResource { } catch (nitro_exception e) { // if Vlan to interface binding does not exist then ignore the exception and proceed if (!(e.getErrorCode() == NitroError.NS_RESOURCE_NOT_EXISTS)) { - throw new ExecutionException("Failed to unbind vlan from the interface while shutdown of guest network on the Netscaler device due to " + e.getMessage()); + throw new ExecutionException("Failed to unbind vlan from the interface while shutdown of guest network on the Netscaler device due to " + + e.getMessage()); } } @@ -2423,8 +2431,8 @@ public class NetscalerResource implements ServerResource { private boolean nsServiceBindingExists(String lbVirtualServer, String serviceName) throws ExecutionException { try { - com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get( - _netscalerService, lbVirtualServer); + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings = + com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, lbVirtualServer); if (serviceBindings != null) { for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) { if (serviceName.equalsIgnoreCase(binding.get_servicename())) { @@ -2445,12 +2453,14 @@ public class NetscalerResource implements ServerResource { lbvserver_servicegroup_binding vserver_servicegroup_binding = new lbvserver_servicegroup_binding(); try { - lbvserver_servicegroup_binding[] result = vserver_servicegroup_binding.get_filtered(_netscalerService, nsVirtualServerName, "servicegroupname:" + serviceGroupName); + lbvserver_servicegroup_binding[] result = + lbvserver_servicegroup_binding.get_filtered(_netscalerService, nsVirtualServerName, "servicegroupname:" + serviceGroupName); if (result != null && result.length > 0) { return true; } } catch (Exception e) { - throw new ExecutionException("Failed to verify lb vserver " + nsVirtualServerName + "and servicegrop " + serviceGroupName + " binding exists due to " + e.getMessage()); + throw new ExecutionException("Failed to verify lb vserver " + nsVirtualServerName + "and servicegrop " + serviceGroupName + " binding exists due to " + + e.getMessage()); } return false; @@ -2483,7 +2493,8 @@ public class NetscalerResource implements ServerResource { // check if server belong to same subnet as one associated with vlan if (NetUtils.sameSubnet(vlanSelfIp, server.get_ipaddress(), vlanNetmask)) { // first remove services associated with this server - com.citrix.netscaler.nitro.resource.config.basic.service serveicesList[] = com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService); + com.citrix.netscaler.nitro.resource.config.basic.service serveicesList[] = + com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService); if (serveicesList != null) { for (com.citrix.netscaler.nitro.resource.config.basic.service svc : serveicesList) { if (svc.get_servername().equals(server.get_ipaddress())) { @@ -2560,7 +2571,7 @@ public class NetscalerResource implements ServerResource { if (vserver != null) { if (!vserver.get_servicetype().equalsIgnoreCase(protocol)) { throw new ExecutionException("Can not update virtual server:" + virtualServerName + " as current protocol:" + vserver.get_servicetype() + - " of virtual server is different from the " + " intended protocol:" + protocol); + " of virtual server is different from the " + " intended protocol:" + protocol); } vserverExisis = true; } @@ -2662,7 +2673,7 @@ public class NetscalerResource implements ServerResource { if (csMonitor != null) { if (!csMonitor.get_type().equalsIgnoreCase(lbProtocol)) { throw new ExecutionException("Can not update monitor :" + nsMonitorName + " as current protocol:" + csMonitor.get_type() + - " of monitor is different from the " + " intended protocol:" + lbProtocol); + " of monitor is different from the " + " intended protocol:" + lbProtocol); } csMonitorExisis = true; } @@ -2683,7 +2694,7 @@ public class NetscalerResource implements ServerResource { csMon.set_failureretries(hcp.getUnhealthThresshold()); csMon.set_successretries(hcp.getHealthcheckThresshold()); s_logger.debug("Monitor properites going to get created :interval :: " + csMon.get_interval() + "respTimeOUt:: " + csMon.get_resptimeout() + - "failure retires(unhealththresshold) :: " + csMon.get_failureretries() + "successtries(healththresshold) ::" + csMon.get_successretries()); + "failure retires(unhealththresshold) :: " + csMon.get_failureretries() + "successtries(healththresshold) ::" + csMon.get_successretries()); lbmonitor.add(_netscalerService, csMon); } else { s_logger.debug("Monitor :" + nsMonitorName + " is already existing. Skipping to delete and create it"); @@ -2701,7 +2712,8 @@ public class NetscalerResource implements ServerResource { com.citrix.netscaler.nitro.resource.config.basic.service serviceObject = new com.citrix.netscaler.nitro.resource.config.basic.service(); serviceObject = com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService, nsServiceName); if (serviceObject != null) { - com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding serviceMonitor = new com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding(); + com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding serviceMonitor = + new com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding(); serviceMonitor.set_monitor_name(nsMonitorName); serviceMonitor.set_name(nsServiceName); serviceMonitor.set_monstate("ENABLED"); @@ -2723,7 +2735,8 @@ public class NetscalerResource implements ServerResource { serviceObject = com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService, nsServiceName); if (serviceObject != null) { - com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding serviceMonitor = new com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding(); + com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding serviceMonitor = + new com.citrix.netscaler.nitro.resource.config.basic.service_lbmonitor_binding(); serviceMonitor.set_monitor_name(nsMonitorName); serviceMonitor.set_name(nsServiceName); s_logger.debug("Trying to unbind the monitor :" + nsMonitorName + " from the service :" + nsServiceName); @@ -2807,7 +2820,7 @@ public class NetscalerResource implements ServerResource { serviceGroup.set_servicetype(lbProtocol); serviceGroup.set_autoscale("POLICY"); serviceGroup.set_memberport(memberPort); - serviceGroup.add(_netscalerService, serviceGroup); + servicegroup.add(_netscalerService, serviceGroup); } catch (Exception e) { throw e; } @@ -2821,7 +2834,7 @@ public class NetscalerResource implements ServerResource { try { vserver_servicegroup_binding.set_name(nsVirtualServerName); vserver_servicegroup_binding.set_servicegroupname(serviceGroupName); - vserver_servicegroup_binding.add(_netscalerService, vserver_servicegroup_binding); + lbvserver_servicegroup_binding.add(_netscalerService, vserver_servicegroup_binding); } catch (Exception e) { throw e; } @@ -2858,7 +2871,7 @@ public class NetscalerResource implements ServerResource { try { vserver_servicegroup_binding.set_name(nsVirtualServerName); vserver_servicegroup_binding.set_servicegroupname(serviceGroupName); - vserver_servicegroup_binding.delete(_netscalerService, vserver_servicegroup_binding); + lbvserver_servicegroup_binding.delete(_netscalerService, vserver_servicegroup_binding); } catch (Exception e) { throw e; } @@ -2869,7 +2882,7 @@ public class NetscalerResource implements ServerResource { com.citrix.netscaler.nitro.resource.config.basic.servicegroup serviceGroup = new com.citrix.netscaler.nitro.resource.config.basic.servicegroup(); try { serviceGroup.set_servicegroupname(serviceGroupName); - serviceGroup.delete(_netscalerService, serviceGroup); + servicegroup.delete(_netscalerService, serviceGroup); } catch (Exception e) { throw e; } @@ -2923,7 +2936,7 @@ public class NetscalerResource implements ServerResource { vserver.set_name(nsVirtualServerName); vserver.set_minautoscalemembers(minAutoScaleMembers); vserver.set_maxautoscalemembers(maxAutoScaleMembers); - vserver.update(_netscalerService, vserver); + lbvserver.update(_netscalerService, vserver); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -2945,7 +2958,7 @@ public class NetscalerResource implements ServerResource { autoscaleProfile.set_apikey(apiKey); autoscaleProfile.set_sharedsecret(secretKey); autoscaleProfile.set_url(url); - autoscaleProfile.add(_netscalerService, autoscaleProfile); + autoscaleprofile.add(_netscalerService, autoscaleProfile); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -2957,7 +2970,7 @@ public class NetscalerResource implements ServerResource { try { timer.set_name(timerName); timer.set_interval(interval); - timer.add(_netscalerService, timer); + nstimer.add(_netscalerService, timer); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -2989,7 +3002,8 @@ public class NetscalerResource implements ServerResource { // Add AutoScale ScaleUp action // add autoscale action lb_scaleUpAction provision -vserver lb -profilename lb_asprofile -params // -lbruleid=1234&command=deployvm&zoneid=10&templateid=5&serviceofferingid=3- -quiettime 300 - com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleUpAction = new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); + com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleUpAction = + new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); try { scaleUpAction.set_name(scaleUpActionName); scaleUpAction.set_type("SCALE_UP"); // TODO: will this be called provision? @@ -2997,20 +3011,21 @@ public class NetscalerResource implements ServerResource { // now both are same. Not exposed in API. scaleUpAction.set_profilename(profileName); scaleUpAction.set_quiettime(scaleUpQuietTime); - String scaleUpParameters = "command=deployVirtualMachine" + "&" + ApiConstants.ZONE_ID + "=" + profileTO.getZoneId() + "&" + ApiConstants.SERVICE_OFFERING_ID + - "=" + profileTO.getServiceOfferingId() + "&" + ApiConstants.TEMPLATE_ID + "=" + profileTO.getTemplateId() + "&" + - ApiConstants.DISPLAY_NAME + "=" + profileTO.getVmName() + "&" + - ((profileTO.getNetworkId() == null) ? "" : (ApiConstants.NETWORK_IDS + "=" + profileTO.getNetworkId() + "&")) + - ((profileTO.getOtherDeployParams() == null) ? "" : (profileTO.getOtherDeployParams() + "&")) + "lbruleid=" + loadBalancerTO.getUuid(); + String scaleUpParameters = + "command=deployVirtualMachine" + "&" + ApiConstants.ZONE_ID + "=" + profileTO.getZoneId() + "&" + ApiConstants.SERVICE_OFFERING_ID + "=" + + profileTO.getServiceOfferingId() + "&" + ApiConstants.TEMPLATE_ID + "=" + profileTO.getTemplateId() + "&" + ApiConstants.DISPLAY_NAME + "=" + + profileTO.getVmName() + "&" + ((profileTO.getNetworkId() == null) ? "" : (ApiConstants.NETWORK_IDS + "=" + profileTO.getNetworkId() + "&")) + + ((profileTO.getOtherDeployParams() == null) ? "" : (profileTO.getOtherDeployParams() + "&")) + "lbruleid=" + loadBalancerTO.getUuid(); scaleUpAction.set_parameters(scaleUpParameters); - scaleUpAction.add(_netscalerService, scaleUpAction); + autoscaleaction.add(_netscalerService, scaleUpAction); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) throw e; } - com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleDownAction = new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); + com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleDownAction = + new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); Integer destroyVmGracePeriod = profileTO.getDestroyVmGraceperiod(); try { scaleDownAction.set_name(scaleDownActionName); @@ -3022,7 +3037,7 @@ public class NetscalerResource implements ServerResource { String scaleDownParameters = "command=destroyVirtualMachine" + "&" + "lbruleid=" + loadBalancerTO.getUuid(); scaleDownAction.set_parameters(scaleDownParameters); scaleDownAction.set_vmdestroygraceperiod(destroyVmGracePeriod); - scaleDownAction.add(_netscalerService, scaleDownAction); + autoscaleaction.add(_netscalerService, scaleDownAction); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3031,12 +3046,14 @@ public class NetscalerResource implements ServerResource { /* Create min member policy */ String minMemberPolicyName = generateAutoScaleMinPolicyName(vmGroupIdentifier); - String minMemberPolicyExp = "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.LT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MINAUTOSCALEMEMBERS)"; + String minMemberPolicyExp = + "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.LT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MINAUTOSCALEMEMBERS)"; addAutoScalePolicy(timerName, minMemberPolicyName, cur_prirotiy++, minMemberPolicyExp, scaleUpActionName, interval, interval, isCleanUp); /* Create max member policy */ String maxMemberPolicyName = generateAutoScaleMaxPolicyName(vmGroupIdentifier); - String maxMemberPolicyExp = "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.GT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MAXAUTOSCALEMEMBERS)"; + String maxMemberPolicyExp = + "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.GT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MAXAUTOSCALEMEMBERS)"; addAutoScalePolicy(timerName, maxMemberPolicyName, cur_prirotiy++, maxMemberPolicyExp, scaleDownActionName, interval, interval, isCleanUp); /* Create Counters */ @@ -3062,7 +3079,7 @@ public class NetscalerResource implements ServerResource { lbmetrictable metricTable = new lbmetrictable(); try { metricTable.set_metrictable(mtName); - metricTable.add(_netscalerService, metricTable); + lbmetrictable.add(_netscalerService, metricTable); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3080,7 +3097,7 @@ public class NetscalerResource implements ServerResource { monitor.set_snmpcommunity(snmpCommunity); monitor.set_metrictable(mtName); monitor.set_interval((int)(interval * 0.8)); - monitor.add(_netscalerService, monitor); + lbmonitor.add(_netscalerService, monitor); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3119,7 +3136,7 @@ public class NetscalerResource implements ServerResource { metrictable_metric_binding.set_metrictable(mtName); metrictable_metric_binding.set_metric(counterName); metrictable_metric_binding.set_Snmpoid(counterOid); - metrictable_metric_binding.add(_netscalerService, metrictable_metric_binding); + lbmetrictable_metric_binding.add(_netscalerService, metrictable_metric_binding); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3138,7 +3155,7 @@ public class NetscalerResource implements ServerResource { * so traffic will continue to flow. */ monitor_metric_binding.set_metricthreshold(Integer.MAX_VALUE); - monitor_metric_binding.add(_netscalerService, monitor_metric_binding); + lbmonitor_metric_binding.add(_netscalerService, monitor_metric_binding); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3165,11 +3182,13 @@ public class NetscalerResource implements ServerResource { String action = null; if (isScaleUpPolicy(autoScalePolicyTO)) { action = scaleUpActionName; - String scaleUpCondition = "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.LT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MAXAUTOSCALEMEMBERS)"; + String scaleUpCondition = + "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.LT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MAXAUTOSCALEMEMBERS)"; policyExpression = scaleUpCondition + " && " + policyExpression; } else { action = scaleDownActionName; - String scaleDownCondition = "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.GT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MINAUTOSCALEMEMBERS)"; + String scaleDownCondition = + "SYS.VSERVER(\"" + nsVirtualServerName + "\").ACTIVESERVICES.GT(SYS.VSERVER(\"" + nsVirtualServerName + "\").MINAUTOSCALEMEMBERS)"; policyExpression = scaleDownCondition + " && " + policyExpression; } @@ -3236,10 +3255,11 @@ public class NetscalerResource implements ServerResource { /* Delete AutoScale Config */ // Delete AutoScale ScaleDown action - com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleDownAction = new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); + com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleDownAction = + new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); try { scaleDownAction.set_name(scaleDownActionName); - scaleDownAction.delete(_netscalerService, scaleDownAction); + autoscaleaction.delete(_netscalerService, scaleDownAction); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3247,10 +3267,11 @@ public class NetscalerResource implements ServerResource { } // Delete AutoScale ScaleUp action - com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleUpAction = new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); + com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction scaleUpAction = + new com.citrix.netscaler.nitro.resource.config.autoscale.autoscaleaction(); try { scaleUpAction.set_name(scaleUpActionName); - scaleUpAction.delete(_netscalerService, scaleUpAction); + autoscaleaction.delete(_netscalerService, scaleUpAction); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3261,7 +3282,7 @@ public class NetscalerResource implements ServerResource { nstimer timer = new nstimer(); try { timer.set_name(timerName); - timer.delete(_netscalerService, timer); + nstimer.delete(_netscalerService, timer); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3272,7 +3293,7 @@ public class NetscalerResource implements ServerResource { autoscaleprofile autoscaleProfile = new autoscaleprofile(); try { autoscaleProfile.set_name(profileName); - autoscaleProfile.delete(_netscalerService, autoscaleProfile); + autoscaleprofile.delete(_netscalerService, autoscaleProfile); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3297,7 +3318,7 @@ public class NetscalerResource implements ServerResource { try { monitor.set_monitorname(monitorName); monitor.set_type("LOAD"); - monitor.delete(_netscalerService, monitor); + lbmonitor.delete(_netscalerService, monitor); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3308,7 +3329,7 @@ public class NetscalerResource implements ServerResource { com.citrix.netscaler.nitro.resource.config.lb.lbmetrictable metricTable = new com.citrix.netscaler.nitro.resource.config.lb.lbmetrictable(); try { metricTable.set_metrictable(mtName); - metricTable.delete(_netscalerService, metricTable); + lbmetrictable.delete(_netscalerService, metricTable); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3339,7 +3360,7 @@ public class NetscalerResource implements ServerResource { timerPolicy.set_name(policyName); timerPolicy.set_action(action); timerPolicy.set_rule(policyExpression); - timerPolicy.add(_netscalerService, timerPolicy); + autoscalepolicy.add(_netscalerService, timerPolicy); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3361,7 +3382,7 @@ public class NetscalerResource implements ServerResource { timer_policy_binding.set_threshold(sampleSize); // We are not exposing this parameter as of now. // i.e. n(m) is not exposed to CS user. So thresholdSize == sampleSize timer_policy_binding.set_priority(priority); - timer_policy_binding.add(_netscalerService, timer_policy_binding); + nstimer_autoscalepolicy_binding.add(_netscalerService, timer_policy_binding); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3376,7 +3397,7 @@ public class NetscalerResource implements ServerResource { try { timer_policy_binding.set_name(timerName); timer_policy_binding.set_policyname(policyName); - timer_policy_binding.delete(_netscalerService, timer_policy_binding); + nstimer_autoscalepolicy_binding.delete(_netscalerService, timer_policy_binding); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3388,7 +3409,7 @@ public class NetscalerResource implements ServerResource { autoscalepolicy timerPolicy = new autoscalepolicy(); try { timerPolicy.set_name(policyName); - timerPolicy.delete(_netscalerService, timerPolicy); + autoscalepolicy.delete(_netscalerService, timerPolicy); } catch (Exception e) { // Ignore Exception on cleanup if (!isCleanUp) @@ -3400,7 +3421,7 @@ public class NetscalerResource implements ServerResource { private boolean isAutoScaleSupportedInNetScaler() throws ExecutionException { autoscaleprofile autoscaleProfile = new autoscaleprofile(); try { - autoscaleProfile.get(_netscalerService); + autoscaleprofile.get(_netscalerService); } catch (Exception ex) { // Looks like autoscale is not supported in this netscaler. // TODO: Config team has introduce a new command to check diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java index 69820244e57..7842d37c71e 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java @@ -109,7 +109,8 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { NiciraNvpDeviceVO niciraNvpDeviceVO = niciraNvpElementService.addNiciraNvpDevice(this); if (niciraNvpDeviceVO != null) { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java index 125555a174a..374b0fe8311 100755 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java @@ -18,17 +18,16 @@ package com.cloud.api.commands; import javax.inject.Inject; -import com.cloud.api.response.NiciraNvpDeviceResponse; - +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; +import com.cloud.api.response.NiciraNvpDeviceResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -48,7 +47,11 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, type = CommandType.UUID, entityType = NiciraNvpDeviceResponse.class, required = true, description = "Nicira device ID") + @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, + type = CommandType.UUID, + entityType = NiciraNvpDeviceResponse.class, + required = true, + description = "Nicira device ID") private Long niciraNvpDeviceId; ///////////////////////////////////////////////////// @@ -64,7 +67,8 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = niciraNvpElementService.deleteNiciraNvpDevice(this); if (result) { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java index 6f5df1dd765..6d2dc057a96 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java @@ -21,17 +21,18 @@ import java.util.List; import javax.inject.Inject; -import com.cloud.api.response.NiciraNvpDeviceResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + +import com.cloud.api.response.NiciraNvpDeviceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -53,7 +54,11 @@ public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, type = CommandType.UUID, entityType = NiciraNvpDeviceResponse.class, required = true, description = "nicira nvp device ID") + @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, + type = CommandType.UUID, + entityType = NiciraNvpDeviceResponse.class, + required = true, + description = "nicira nvp device ID") private Long niciraNvpDeviceId; ///////////////////////////////////////////////////// @@ -69,7 +74,8 @@ public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List networks = niciraNvpElementService.listNiciraNvpDeviceNetworks(this); ListResponse response = new ListResponse(); diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java index 668c42b4f57..78b2ad8f229 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java @@ -21,15 +21,15 @@ import java.util.List; import javax.inject.Inject; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.response.ListResponse; import com.cloud.api.response.NiciraNvpDeviceResponse; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java index 024c50a31eb..686c1f21e8f 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java @@ -16,13 +16,15 @@ // under the License. package com.cloud.api.response; -import com.cloud.network.NiciraNvpDeviceVO; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; +import com.cloud.network.NiciraNvpDeviceVO; +import com.cloud.serializer.Param; + @EntityReference(value = NiciraNvpDeviceVO.class) public class NiciraNvpDeviceResponse extends BaseResponse { @SerializedName(ApiConstants.NICIRA_NVP_DEVICE_ID) diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java index a661b1b0168..96712906047 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java @@ -126,7 +126,7 @@ import com.cloud.vm.dao.NicDao; @Component @Local(value = {NetworkElement.class, ConnectivityProvider.class, SourceNatServiceProvider.class, StaticNatServiceProvider.class, PortForwardingServiceProvider.class, - IpDeployer.class}) + IpDeployer.class}) public class NiciraNvpElement extends AdapterBase implements ConnectivityProvider, SourceNatServiceProvider, PortForwardingServiceProvider, StaticNatServiceProvider, NiciraNvpElementService, ResourceStateAdapter, IpDeployer { @@ -247,9 +247,10 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide String internalCidr = network.getGateway() + "/" + network.getCidr().split("/")[1]; long vlanid = (Vlan.UNTAGGED.equals(sourceNatIp.getVlanTag())) ? 0 : Long.parseLong(sourceNatIp.getVlanTag()); - CreateLogicalRouterCommand cmd = new CreateLogicalRouterCommand(niciraNvpHost.getDetail("l3gatewayserviceuuid"), vlanid, - BroadcastDomainType.getValue(network.getBroadcastUri()), "router-" + network.getDisplayText(), publicCidr, sourceNatIp.getGateway(), internalCidr, - context.getDomain().getName() + "-" + context.getAccount().getAccountName()); + CreateLogicalRouterCommand cmd = + new CreateLogicalRouterCommand(niciraNvpHost.getDetail("l3gatewayserviceuuid"), vlanid, BroadcastDomainType.getValue(network.getBroadcastUri()), + "router-" + network.getDisplayText(), publicCidr, sourceNatIp.getGateway(), internalCidr, context.getDomain().getName() + "-" + + context.getAccount().getAccountName()); CreateLogicalRouterAnswer answer = (CreateLogicalRouterAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd); if (answer.getResult() == false) { s_logger.error("Failed to create Logical Router for network " + network.getDisplayText()); @@ -265,8 +266,8 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (!canHandle(network, Service.Connectivity)) { return false; @@ -294,9 +295,9 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide if (answer.getResult()) { s_logger.warn("Existing Logical Switchport found for nic " + nic.getName() + " with uuid " + existingNicMap.getLogicalSwitchPortUuid()); - UpdateLogicalSwitchPortCommand cmd = new UpdateLogicalSwitchPortCommand(existingNicMap.getLogicalSwitchPortUuid(), - BroadcastDomainType.getValue(network.getBroadcastUri()), nicVO.getUuid(), context.getDomain().getName() + "-" + context.getAccount().getAccountName(), - nic.getName()); + UpdateLogicalSwitchPortCommand cmd = + new UpdateLogicalSwitchPortCommand(existingNicMap.getLogicalSwitchPortUuid(), BroadcastDomainType.getValue(network.getBroadcastUri()), + nicVO.getUuid(), context.getDomain().getName() + "-" + context.getAccount().getAccountName(), nic.getName()); agentMgr.easySend(niciraNvpHost.getId(), cmd); return true; } else { @@ -305,8 +306,9 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide } } - CreateLogicalSwitchPortCommand cmd = new CreateLogicalSwitchPortCommand(BroadcastDomainType.getValue(network.getBroadcastUri()), nicVO.getUuid(), context.getDomain() - .getName() + "-" + context.getAccount().getAccountName(), nic.getName()); + CreateLogicalSwitchPortCommand cmd = + new CreateLogicalSwitchPortCommand(BroadcastDomainType.getValue(network.getBroadcastUri()), nicVO.getUuid(), context.getDomain().getName() + "-" + + context.getAccount().getAccountName(), nic.getName()); CreateLogicalSwitchPortAnswer answer = (CreateLogicalSwitchPortAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd); if (answer == null || !answer.getResult()) { @@ -314,15 +316,16 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide return false; } - NiciraNvpNicMappingVO nicMap = new NiciraNvpNicMappingVO(BroadcastDomainType.getValue(network.getBroadcastUri()), answer.getLogicalSwitchPortUuid(), nicVO.getUuid()); + NiciraNvpNicMappingVO nicMap = + new NiciraNvpNicMappingVO(BroadcastDomainType.getValue(network.getBroadcastUri()), answer.getLogicalSwitchPortUuid(), nicVO.getUuid()); niciraNvpNicMappingDao.persist(nicMap); return true; } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { if (!canHandle(network, Service.Connectivity)) { return false; @@ -416,8 +419,8 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // Nothing to do here. return true; } @@ -489,14 +492,14 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide } long zoneId = physicalNetwork.getDataCenterId(); - final PhysicalNetworkServiceProviderVO ntwkSvcProvider = physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), - networkDevice.getNetworkServiceProvder()); + final PhysicalNetworkServiceProviderVO ntwkSvcProvider = + physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), networkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { throw new CloudRuntimeException("Network Service Provider: " + networkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } if (niciraNvpDao.listByPhysicalNetwork(physicalNetworkId).size() != 0) { @@ -729,8 +732,8 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide } cidrs.add(ip.getAddress().addr() + "/" + NetUtils.getCidrSize(ip.getNetmask())); } - ConfigurePublicIpsOnLogicalRouterCommand cmd = new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(), - niciraNvpHost.getDetail("l3gatewayserviceuuid"), cidrs); + ConfigurePublicIpsOnLogicalRouterCommand cmd = + new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(), niciraNvpHost.getDetail("l3gatewayserviceuuid"), cidrs); ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd); //FIXME answer can be null if the host is down return answer.getResult(); @@ -770,8 +773,8 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide // Force the nat rule into the StaticNatRuleTO, no use making a new TO object // we only need the source and destination ip. Unfortunately no mention if a rule // is new. - StaticNatRuleTO ruleTO = new StaticNatRuleTO(1, sourceIp.getAddress().addr(), MIN_PORT, MAX_PORT, rule.getDestIpAddress(), MIN_PORT, MAX_PORT, "any", - rule.isForRevoke(), false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(1, sourceIp.getAddress().addr(), MIN_PORT, MAX_PORT, rule.getDestIpAddress(), MIN_PORT, MAX_PORT, "any", rule.isForRevoke(), false); staticNatRules.add(ruleTO); } @@ -812,7 +815,8 @@ public class NiciraNvpElement extends AdapterBase implements ConnectivityProvide portForwardingRules.add(ruleTO); } - ConfigurePortForwardingRulesOnLogicalRouterCommand cmd = new ConfigurePortForwardingRulesOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(), portForwardingRules); + ConfigurePortForwardingRulesOnLogicalRouterCommand cmd = + new ConfigurePortForwardingRulesOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(), portForwardingRules); ConfigurePortForwardingRulesOnLogicalRouterAnswer answer = (ConfigurePortForwardingRulesOnLogicalRouterAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd); return answer.getResult(); diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java index a583086098c..211bd6c7aac 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java @@ -153,8 +153,9 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru { physicalNetworkId = networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); } - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, - network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, + network.getDataCenterId(), physicalNetworkId); if (network.getGateway() != null) { implemented.setGateway(network.getGateway()); @@ -184,8 +185,8 @@ public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru { String transportzoneuuid = niciraNvpHost.getDetail("transportzoneuuid"); String transportzoneisotype = niciraNvpHost.getDetail("transportzoneisotype"); - CreateLogicalSwitchCommand cmd = new CreateLogicalSwitchCommand(transportzoneuuid, transportzoneisotype, name, context.getDomain().getName() + "-" + - context.getAccount().getAccountName()); + CreateLogicalSwitchCommand cmd = + new CreateLogicalSwitchCommand(transportzoneuuid, transportzoneisotype, name, context.getDomain().getName() + "-" + context.getAccount().getAccountName()); CreateLogicalSwitchAnswer answer = (CreateLogicalSwitchAnswer)agentMgr.easySend(niciraNvpHost.getId(), cmd); if (answer == null || !answer.getResult()) { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/NiciraNvpApi.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/NiciraNvpApi.java index 2d8f53825c0..6f695ade9bd 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/NiciraNvpApi.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/NiciraNvpApi.java @@ -300,7 +300,8 @@ public class NiciraNvpApi { executeUpdateObject(logicalRouterPort, uri, Collections. emptyMap()); } - public void modifyLogicalRouterPortAttachment(final String logicalRouterUuid, final String logicalRouterPortUuid, final Attachment attachment) throws NiciraNvpApiException { + public void modifyLogicalRouterPortAttachment(final String logicalRouterUuid, final String logicalRouterPortUuid, final Attachment attachment) + throws NiciraNvpApiException { String uri = ROUTER_URI_PREFIX + logicalRouterUuid + "/lport/" + logicalRouterPortUuid + "/attachment"; executeUpdateObject(attachment, uri, Collections. emptyMap()); } @@ -324,8 +325,8 @@ public class NiciraNvpApi { executeDeleteObject(uri); } - public NiciraNvpList findLogicalRouterPortByGatewayServiceAndVlanId(final String logicalRouterUuid, final String gatewayServiceUuid, final long vlanId) - throws NiciraNvpApiException { + public NiciraNvpList findLogicalRouterPortByGatewayServiceAndVlanId(final String logicalRouterUuid, final String gatewayServiceUuid, + final long vlanId) throws NiciraNvpApiException { String uri = ROUTER_URI_PREFIX + logicalRouterUuid + "/lport"; Map params = new HashMap(); params.put("attachment_gwsvc_uuid", gatewayServiceUuid); @@ -393,7 +394,8 @@ public class NiciraNvpApi { pm.releaseConnection(); } - protected T executeCreateObject(final T newObject, final Type returnObjectType, final String uri, final Map parameters) throws NiciraNvpApiException { + protected T executeCreateObject(final T newObject, final Type returnObjectType, final String uri, final Map parameters) + throws NiciraNvpApiException { if (host == null || host.isEmpty() || adminuser == null || adminuser.isEmpty() || adminpass == null || adminpass.isEmpty()) { throw new NiciraNvpApiException("Hostname/credentials are null or empty"); } @@ -576,8 +578,8 @@ public class NiciraNvpApi { } @Override - public Socket createSocket(final String host, final int port, final InetAddress localAddress, final int localPort, final HttpConnectionParams params) throws IOException, - UnknownHostException, ConnectTimeoutException { + public Socket createSocket(final String host, final int port, final InetAddress localAddress, final int localPort, final HttpConnectionParams params) + throws IOException, UnknownHostException, ConnectTimeoutException { int timeout = params.getConnectionTimeout(); if (timeout == 0) { return createSocket(host, port, localAddress, localPort); diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java index 4e4adb7efad..8c99a819a4f 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java @@ -376,7 +376,7 @@ public class NiciraNvpResource implements ServerResource { String internalNetworkAddress = cmd.getInternalIpCidr(); s_logger.debug("Creating a logical router with external ip " + publicNetworkIpAddress + " and internal ip " + internalNetworkAddress + "on gateway service " + - gatewayServiceUuid); + gatewayServiceUuid); try { // Create the Router @@ -484,7 +484,7 @@ public class NiciraNvpResource implements ServerResource { niciraNvpApi.modifyLogicalRouterPort(cmd.getLogicalRouterUuid(), lrp); return new ConfigurePublicIpsOnLogicalRouterAnswer(cmd, true, "Configured " + cmd.getPublicCidrs().size() + " ip addresses on logical router uuid " + - cmd.getLogicalRouterUuid()); + cmd.getLogicalRouterUuid()); } catch (NiciraNvpApiException e) { if (numRetries > 0) { return retry(cmd, --numRetries); @@ -724,7 +724,8 @@ public class NiciraNvpResource implements ServerResource { } - protected NatRule[] generatePortForwardingRulePair(final String insideIp, final int[] insidePorts, final String outsideIp, final int[] outsidePorts, final String protocol) { + protected NatRule[] generatePortForwardingRulePair(final String insideIp, final int[] insidePorts, final String outsideIp, final int[] outsidePorts, + final String protocol) { // Start with a basic static nat rule, then add port and protocol details NatRule[] rulepair = generateStaticNatRulePair(insideIp, outsideIp); diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NatRuleTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NatRuleTest.java index 24bf0a42567..1a635278d37 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NatRuleTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NatRuleTest.java @@ -28,9 +28,10 @@ public class NatRuleTest { @Test public void testNatRuleEncoding() { - Gson gson = new GsonBuilder().registerTypeAdapter(NatRule.class, new com.cloud.network.nicira.NiciraNvpApi.NatRuleAdapter()) - .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) - .create(); + Gson gson = + new GsonBuilder().registerTypeAdapter(NatRule.class, new com.cloud.network.nicira.NiciraNvpApi.NatRuleAdapter()) + .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) + .create(); DestinationNatRule rn1 = new DestinationNatRule(); rn1.setToDestinationIpAddress("10.10.10.10"); diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraTagTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraTagTest.java index 5c237ced472..751280356d9 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraTagTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraTagTest.java @@ -16,9 +16,10 @@ // under the License. package com.cloud.network.nicira; -import org.junit.Test; import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class NiciraTagTest { @Test public void testCreateTag() { diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/resource/NiciraNvpResourceTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/resource/NiciraNvpResourceTest.java index 3d181aa1cd8..ad01218909e 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/resource/NiciraNvpResourceTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/resource/NiciraNvpResourceTest.java @@ -292,7 +292,7 @@ public class NiciraNvpResourceTest { doThrow(new NiciraNvpApiException()).when(nvpApi).modifyLogicalSwitchPortAttachment((String)any(), (String)any(), (Attachment)any()); UpdateLogicalSwitchPortAnswer dlspa = - (UpdateLogicalSwitchPortAnswer)resource.executeRequest(new UpdateLogicalSwitchPortCommand("aaaa", "bbbb", "cccc", "owner", "nicname")); + (UpdateLogicalSwitchPortAnswer)resource.executeRequest(new UpdateLogicalSwitchPortCommand("aaaa", "bbbb", "cccc", "owner", "nicname")); assertFalse(dlspa.getResult()); } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java index 356f9b41c67..18b7a90829f 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java @@ -37,7 +37,6 @@ import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = {NetworkElement.class}) @@ -68,8 +67,8 @@ public class OvsElement extends AdapterBase implements NetworkElement { } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { if (nic.getBroadcastType() != Networks.BroadcastDomainType.Vswitch) { return true; } @@ -85,7 +84,8 @@ public class OvsElement extends AdapterBase implements NetworkElement { } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { if (nic.getBroadcastType() != Networks.BroadcastDomainType.Vswitch) { return true; } @@ -109,7 +109,8 @@ public class OvsElement extends AdapterBase implements NetworkElement { } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java index 404279013de..06909777807 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java @@ -86,22 +86,24 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru { } @Override - protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) throws InsufficientVirtualNetworkCapcityException { + protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) + throws InsufficientVirtualNetworkCapcityException { if (network.getBroadcastUri() == null) { String vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId())); if (vnet == null) { throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a part of network " + network + " implement ", DataCenter.class, dcId); } implemented.setBroadcastUri(BroadcastDomainType.Vswitch.toUri(vnet)); - ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_ASSIGN, - "Assigned Zone Vlan: " + vnet + " Network Id: " + network.getId(), 0); + ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, + EventTypes.EVENT_ZONE_VLAN_ASSIGN, "Assigned Zone Vlan: " + vnet + " Network Id: " + network.getId(), 0); } else { implemented.setBroadcastUri(network.getBroadcastUri()); } } @Override - public Network implement(Network config, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network config, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (config.getState() == State.Implementing) : "Why are we implementing " + config; if (!_ovsTunnelMgr.isOvsTunnelEnabled()) { return null; diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java index b9b07aea6ed..10815a40c22 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java @@ -159,8 +159,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage private void handleCreateTunnelAnswer(Answer[] answers) { OvsCreateTunnelAnswer r = (OvsCreateTunnelAnswer)answers[0]; - String s = String.format("(hostIP:%1$s, remoteIP:%2$s, bridge:%3$s," + "greKey:%4$s, portName:%5$s)", r.getFromIp(), r.getToIp(), r.getBridge(), r.getKey(), - r.getInPortName()); + String s = + String.format("(hostIP:%1$s, remoteIP:%2$s, bridge:%3$s," + "greKey:%4$s, portName:%5$s)", r.getFromIp(), r.getToIp(), r.getBridge(), r.getKey(), + r.getInPortName()); Long from = r.getFrom(); Long to = r.getTo(); long networkId = r.getNetworkId(); @@ -345,7 +346,8 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage if (ans.getResult()) { OvsTunnelNetworkVO lock = _tunnelNetworkDao.acquireInLockTable(Long.valueOf(1)); if (lock == null) { - s_logger.warn(String.format("failed to lock" + "ovs_tunnel_account, remove record of " + "tunnel(from=%1$s, to=%2$s account=%3$s) failed", from, to, network_id)); + s_logger.warn(String.format("failed to lock" + "ovs_tunnel_account, remove record of " + "tunnel(from=%1$s, to=%2$s account=%3$s) failed", from, to, + network_id)); return; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java index 09be9e17f12..ff40efac8f6 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java @@ -17,8 +17,6 @@ package com.cloud.network.ovs.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -26,6 +24,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("ovs_tunnel_interface")) public class OvsTunnelInterfaceVO implements InternalIdentity { @@ -61,6 +61,7 @@ public class OvsTunnelInterfaceVO implements InternalIdentity { this.label = label; } + @Override public long getId() { return id; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java index 6e87a6c70e7..2826912d229 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java @@ -17,8 +17,6 @@ package com.cloud.network.ovs.dao; -import org.apache.cloudstack.api.InternalIdentity; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -26,6 +24,8 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import org.apache.cloudstack.api.InternalIdentity; + @Entity @Table(name = ("ovs_tunnel_network")) public class OvsTunnelNetworkVO implements InternalIdentity { @@ -81,6 +81,7 @@ public class OvsTunnelNetworkVO implements InternalIdentity { return key; } + @Override public long getId() { return id; } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddExternalFirewallCmd.java index 84ee869866a..2e4d6717181 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddExternalFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddExternalFirewallCmd.java @@ -18,23 +18,24 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.element.PaloAltoFirewallElementService; -import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "addExternalFirewall", description="Adds an external firewall appliance", responseObject = ExternalFirewallResponse.class) +@APICommand(name = "addExternalFirewall", description = "Adds an external firewall appliance", responseObject = ExternalFirewallResponse.class) public class AddExternalFirewallCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddExternalFirewallCmd.class.getName()); private static final String s_name = "addexternalfirewallresponse"; @@ -43,17 +44,20 @@ public class AddExternalFirewallCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class, - required = true, description="Zone in which to add the external firewall appliance.") + @Parameter(name = ApiConstants.ZONE_ID, + type = CommandType.UUID, + entityType = ZoneResponse.class, + required = true, + description = "Zone in which to add the external firewall appliance.") private Long zoneId; - @Parameter(name=ApiConstants.URL, type=CommandType.STRING, required = true, description="URL of the external firewall appliance.") + @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "URL of the external firewall appliance.") private String url; - @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required = true, description="Username of the external firewall appliance.") + @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Username of the external firewall appliance.") private String username; - @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required = true, description="Password of the external firewall appliance.") + @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, required = true, description = "Password of the external firewall appliance.") private String password; /////////////////////////////////////////////////// @@ -76,12 +80,12 @@ public class AddExternalFirewallCmd extends BaseCmd { return password; } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Inject PaloAltoFirewallElementService _paElementService; + @Inject + PaloAltoFirewallElementService _paElementService; @Override public String getCommandName() { @@ -95,7 +99,7 @@ public class AddExternalFirewallCmd extends BaseCmd { @SuppressWarnings("deprecation") @Override - public void execute(){ + public void execute() { try { Host externalFirewall = _paElementService.addExternalFirewall(this); ExternalFirewallResponse response = _paElementService.createExternalFirewallResponse(externalFirewall); @@ -109,4 +113,3 @@ public class AddExternalFirewallCmd extends BaseCmd { } } } - diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java index faf28e2cf26..7aba9c2a9d2 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java @@ -18,16 +18,17 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.context.CallContext; + import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -37,30 +38,33 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.PaloAltoFirewallElementService; -import org.apache.cloudstack.context.CallContext; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "addPaloAltoFirewall", responseObject=PaloAltoFirewallResponse.class, description="Adds a Palo Alto firewall device") +@APICommand(name = "addPaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Adds a Palo Alto firewall device") public class AddPaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddPaloAltoFirewallCmd.class.getName()); private static final String s_name = "addpaloaltofirewallresponse"; - @Inject PaloAltoFirewallElementService _paFwService; + @Inject + PaloAltoFirewallElementService _paFwService; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, - required=true, description="the Physical Network ID") + @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, + type = CommandType.UUID, + entityType = PhysicalNetworkResponse.class, + required = true, + description = "the Physical Network ID") private Long physicalNetworkId; - @Parameter(name=ApiConstants.URL, type=CommandType.STRING, required = true, description="URL of the Palo Alto appliance.") + @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "URL of the Palo Alto appliance.") private String url; - @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required = true, description="Credentials to reach Palo Alto firewall device") + @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Credentials to reach Palo Alto firewall device") private String username; - @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required = true, description="Credentials to reach Palo Alto firewall device") + @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, required = true, description = "Credentials to reach Palo Alto firewall device") private String password; @Parameter(name = ApiConstants.NETWORK_DEVICE_TYPE, type = CommandType.STRING, required = true, description = "supports only PaloAltoFirewall") @@ -95,7 +99,8 @@ public class AddPaloAltoFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalFirewallDeviceVO fwDeviceVO = _paFwService.addPaloAltoFirewall(this); if (fwDeviceVO != null) { @@ -106,7 +111,7 @@ public class AddPaloAltoFirewallCmd extends BaseAsyncCmd { } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Palo Alto firewall due to internal error."); } - } catch (InvalidParameterValueException invalidParamExcp) { + } catch (InvalidParameterValueException invalidParamExcp) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); } catch (CloudRuntimeException runtimeExcp) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java index 199bb832d7d..80f02ad07d9 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java @@ -20,13 +20,14 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.context.CallContext; + import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -36,25 +37,31 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.PaloAltoFirewallElementService; -import org.apache.cloudstack.context.CallContext; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "configurePaloAltoFirewall", responseObject=PaloAltoFirewallResponse.class, description="Configures a Palo Alto firewall device") +@APICommand(name = "configurePaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Configures a Palo Alto firewall device") public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigurePaloAltoFirewallCmd.class.getName()); private static final String s_name = "configurepaloaltofirewallresponse"; - @Inject PaloAltoFirewallElementService _paFwService; + @Inject + PaloAltoFirewallElementService _paFwService; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.FIREWALL_DEVICE_ID, type=CommandType.UUID, entityType = PaloAltoFirewallResponse.class, - required=true, description="Palo Alto firewall device ID") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, + type = CommandType.UUID, + entityType = PaloAltoFirewallResponse.class, + required = true, + description = "Palo Alto firewall device ID") private Long fwDeviceId; - @Parameter(name=ApiConstants.FIREWALL_DEVICE_CAPACITY, type=CommandType.LONG, required=false, description="capacity of the firewall device, Capacity will be interpreted as number of networks device can handle") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_CAPACITY, + type = CommandType.LONG, + required = false, + description = "capacity of the firewall device, Capacity will be interpreted as number of networks device can handle") private Long capacity; ///////////////////////////////////////////////////// @@ -74,7 +81,8 @@ public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { ExternalFirewallDeviceVO fwDeviceVO = _paFwService.configurePaloAltoFirewall(this); if (fwDeviceVO != null) { @@ -85,7 +93,7 @@ public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd { } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to configure Palo Alto firewall device due to internal error."); } - } catch (InvalidParameterValueException invalidParamExcp) { + } catch (InvalidParameterValueException invalidParamExcp) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); } catch (CloudRuntimeException runtimeExcp) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java index 93f752ac47c..7a3cec8824b 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java @@ -18,21 +18,22 @@ package com.cloud.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.HostResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; + import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.element.PaloAltoFirewallElementService; import com.cloud.user.Account; -@APICommand(name = "deleteExternalFirewall", description="Deletes an external firewall appliance.", responseObject = SuccessResponse.class) +@APICommand(name = "deleteExternalFirewall", description = "Deletes an external firewall appliance.", responseObject = SuccessResponse.class) public class DeleteExternalFirewallCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteExternalFirewallCmd.class.getName()); private static final String s_name = "deleteexternalfirewallresponse"; @@ -41,8 +42,7 @@ public class DeleteExternalFirewallCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = HostResponse.class, - required = true, description="Id of the external firewall appliance.") + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = HostResponse.class, required = true, description = "Id of the external firewall appliance.") private Long id; /////////////////////////////////////////////////// @@ -57,7 +57,8 @@ public class DeleteExternalFirewallCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Inject PaloAltoFirewallElementService _paElementService; + @Inject + PaloAltoFirewallElementService _paElementService; @Override public String getCommandName() { @@ -71,13 +72,13 @@ public class DeleteExternalFirewallCmd extends BaseCmd { @SuppressWarnings("deprecation") @Override - public void execute(){ + public void execute() { try { boolean result = _paElementService.deleteExternalFirewall(this); if (result) { - SuccessResponse response = new SuccessResponse(getCommandName()); - response.setResponseName(getCommandName()); - this.setResponseObject(response); + SuccessResponse response = new SuccessResponse(getCommandName()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete external firewall."); } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java index 86149816af5..4f147eb6fd1 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java @@ -20,14 +20,15 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; + import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -36,21 +37,24 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.element.PaloAltoFirewallElementService; -import org.apache.cloudstack.context.CallContext; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "deletePaloAltoFirewall", responseObject=SuccessResponse.class, description=" delete a Palo Alto firewall device") +@APICommand(name = "deletePaloAltoFirewall", responseObject = SuccessResponse.class, description = " delete a Palo Alto firewall device") public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePaloAltoFirewallCmd.class.getName()); private static final String s_name = "deletepaloaltofirewallresponse"; - @Inject PaloAltoFirewallElementService _paElementService; + @Inject + PaloAltoFirewallElementService _paElementService; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.FIREWALL_DEVICE_ID, type=CommandType.UUID, entityType = PaloAltoFirewallResponse.class, - required=true, description="Palo Alto firewall device ID") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, + type = CommandType.UUID, + entityType = PaloAltoFirewallResponse.class, + required = true, + description = "Palo Alto firewall device ID") private Long fwDeviceId; ///////////////////////////////////////////////////// @@ -66,7 +70,8 @@ public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { boolean result = _paElementService.deletePaloAltoFirewall(this); if (result) { @@ -76,7 +81,7 @@ public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd { } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Palo Alto firewall device"); } - } catch (InvalidParameterValueException invalidParamExcp) { + } catch (InvalidParameterValueException invalidParamExcp) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); } catch (CloudRuntimeException runtimeExcp) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index e2784437db5..6c661def803 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -21,20 +21,21 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; -import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ZoneResponse; + import com.cloud.host.Host; import com.cloud.network.element.PaloAltoFirewallElementService; -import org.apache.cloudstack.api.response.ExternalFirewallResponse; -@APICommand(name = "listExternalFirewalls", description="List external firewall appliances.", responseObject = ExternalFirewallResponse.class) +@APICommand(name = "listExternalFirewalls", description = "List external firewall appliances.", responseObject = ExternalFirewallResponse.class) public class ListExternalFirewallsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName()); private static final String s_name = "listexternalfirewallsresponse"; @@ -43,8 +44,7 @@ public class ListExternalFirewallsCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class, - required = true, description="zone Id") + @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "zone Id") private long zoneId; ///////////////////////////////////////////////////// @@ -59,7 +59,8 @@ public class ListExternalFirewallsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Inject PaloAltoFirewallElementService _paElementService; + @Inject + PaloAltoFirewallElementService _paElementService; @Override public String getCommandName() { @@ -68,7 +69,7 @@ public class ListExternalFirewallsCmd extends BaseListCmd { @SuppressWarnings("deprecation") @Override - public void execute(){ + public void execute() { List externalFirewalls = _paElementService.listExternalFirewalls(this); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java index 15c5bfcdbed..d1b74254b90 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java @@ -21,12 +21,17 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.NetworkResponse; + import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -37,19 +42,23 @@ import com.cloud.network.Network; import com.cloud.network.element.PaloAltoFirewallElementService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "listPaloAltoFirewallNetworks", responseObject=NetworkResponse.class, description="lists network that are using Palo Alto firewall device") +@APICommand(name = "listPaloAltoFirewallNetworks", responseObject = NetworkResponse.class, description = "lists network that are using Palo Alto firewall device") public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPaloAltoFirewallNetworksCmd.class.getName()); private static final String s_name = "listpaloaltofirewallnetworksresponse"; - @Inject PaloAltoFirewallElementService _paFwService; + @Inject + PaloAltoFirewallElementService _paFwService; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.LOAD_BALANCER_DEVICE_ID, type=CommandType.UUID, entityType = PaloAltoFirewallResponse.class, - required = true, description="palo alto balancer device ID") + @Parameter(name = ApiConstants.LOAD_BALANCER_DEVICE_ID, + type = CommandType.UUID, + entityType = PaloAltoFirewallResponse.class, + required = true, + description = "palo alto balancer device ID") private Long fwDeviceId; ///////////////////////////////////////////////////// @@ -65,9 +74,10 @@ public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { - List networks = _paFwService.listNetworks(this); + List networks = _paFwService.listNetworks(this); ListResponse response = new ListResponse(); List networkResponses = new ArrayList(); @@ -81,7 +91,7 @@ public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd { response.setResponses(networkResponses); response.setResponseName(getCommandName()); this.setResponseObject(response); - } catch (InvalidParameterValueException invalidParamExcp) { + } catch (InvalidParameterValueException invalidParamExcp) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); } catch (CloudRuntimeException runtimeExcp) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java index b788aca8c35..ad4be72cce8 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java @@ -21,12 +21,17 @@ import java.util.List; import javax.inject.Inject; -import org.apache.cloudstack.api.*; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -37,23 +42,22 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO; import com.cloud.network.element.PaloAltoFirewallElementService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = "listPaloAltoFirewalls", responseObject=PaloAltoFirewallResponse.class, description="lists Palo Alto firewall devices in a physical network") +@APICommand(name = "listPaloAltoFirewalls", responseObject = PaloAltoFirewallResponse.class, description = "lists Palo Alto firewall devices in a physical network") public class ListPaloAltoFirewallsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPaloAltoFirewallsCmd.class.getName()); private static final String s_name = "listpaloaltofirewallresponse"; - @Inject PaloAltoFirewallElementService _paFwService; + @Inject + PaloAltoFirewallElementService _paFwService; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, - description="the Physical Network ID") + @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, type = CommandType.UUID, entityType = PhysicalNetworkResponse.class, description = "the Physical Network ID") private Long physicalNetworkId; - @Parameter(name=ApiConstants.FIREWALL_DEVICE_ID, type=CommandType.UUID, entityType = PaloAltoFirewallResponse.class, - description="Palo Alto firewall device ID") + @Parameter(name = ApiConstants.FIREWALL_DEVICE_ID, type = CommandType.UUID, entityType = PaloAltoFirewallResponse.class, description = "Palo Alto firewall device ID") private Long fwDeviceId; ///////////////////////////////////////////////////// @@ -73,7 +77,8 @@ public class ListPaloAltoFirewallsCmd extends BaseListCmd { ///////////////////////////////////////////////////// @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { try { List fwDevices = _paFwService.listPaloAltoFirewalls(this); ListResponse response = new ListResponse(); @@ -89,7 +94,7 @@ public class ListPaloAltoFirewallsCmd extends BaseListCmd { response.setResponses(fwDevicesResponse); response.setResponseName(getCommandName()); this.setResponseObject(response); - } catch (InvalidParameterValueException invalidParamExcp) { + } catch (InvalidParameterValueException invalidParamExcp) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); } catch (CloudRuntimeException runtimeExcp) { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java b/plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java index cda018d7b4c..951c31e60bb 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/response/PaloAltoFirewallResponse.java @@ -16,64 +16,81 @@ // under the License. package com.cloud.api.response; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.EntityReference; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; import com.cloud.network.dao.ExternalFirewallDeviceVO; +import com.cloud.serializer.Param; -@EntityReference(value=ExternalFirewallDeviceVO.class) +@EntityReference(value = ExternalFirewallDeviceVO.class) @SuppressWarnings("unused") public class PaloAltoFirewallResponse extends BaseResponse { - @SerializedName(ApiConstants.FIREWALL_DEVICE_ID) @Param(description="device id of the Palo Alto firewall") + @SerializedName(ApiConstants.FIREWALL_DEVICE_ID) + @Param(description = "device id of the Palo Alto firewall") private String id; - @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network to which this Palo Alto firewall belongs to") + @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) + @Param(description = "the physical network to which this Palo Alto firewall belongs to") private String physicalNetworkId; - @SerializedName(ApiConstants.PROVIDER) @Param(description="name of the provider") + @SerializedName(ApiConstants.PROVIDER) + @Param(description = "name of the provider") private String providerName; - @SerializedName(ApiConstants.FIREWALL_DEVICE_NAME) @Param(description="device name") + @SerializedName(ApiConstants.FIREWALL_DEVICE_NAME) + @Param(description = "device name") private String deviceName; - @SerializedName(ApiConstants.FIREWALL_DEVICE_STATE) @Param(description="device state") + @SerializedName(ApiConstants.FIREWALL_DEVICE_STATE) + @Param(description = "device state") private String deviceState; - @SerializedName(ApiConstants.FIREWALL_DEVICE_CAPACITY) @Param(description="device capacity") + @SerializedName(ApiConstants.FIREWALL_DEVICE_CAPACITY) + @Param(description = "device capacity") private Long deviceCapacity; - @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of the external firewall") + @SerializedName(ApiConstants.ZONE_ID) + @Param(description = "the zone ID of the external firewall") private String zoneId; - @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external firewall") + @SerializedName(ApiConstants.IP_ADDRESS) + @Param(description = "the management IP address of the external firewall") private String ipAddress; - @SerializedName(ApiConstants.USERNAME) @Param(description="the username that's used to log in to the external firewall") + @SerializedName(ApiConstants.USERNAME) + @Param(description = "the username that's used to log in to the external firewall") private String username; - @SerializedName(ApiConstants.PUBLIC_INTERFACE) @Param(description="the public interface of the external firewall") + @SerializedName(ApiConstants.PUBLIC_INTERFACE) + @Param(description = "the public interface of the external firewall") private String publicInterface; - @SerializedName(ApiConstants.USAGE_INTERFACE) @Param(description="the usage interface of the external firewall") + @SerializedName(ApiConstants.USAGE_INTERFACE) + @Param(description = "the usage interface of the external firewall") private String usageInterface; - @SerializedName(ApiConstants.PRIVATE_INTERFACE) @Param(description="the private interface of the external firewall") + @SerializedName(ApiConstants.PRIVATE_INTERFACE) + @Param(description = "the private interface of the external firewall") private String privateInterface; - @SerializedName(ApiConstants.PUBLIC_ZONE) @Param(description="the public security zone of the external firewall") + @SerializedName(ApiConstants.PUBLIC_ZONE) + @Param(description = "the public security zone of the external firewall") private String publicZone; - @SerializedName(ApiConstants.PRIVATE_ZONE) @Param(description="the private security zone of the external firewall") + @SerializedName(ApiConstants.PRIVATE_ZONE) + @Param(description = "the private security zone of the external firewall") private String privateZone; - @SerializedName(ApiConstants.NUM_RETRIES) @Param(description="the number of times to retry requests to the external firewall") + @SerializedName(ApiConstants.NUM_RETRIES) + @Param(description = "the number of times to retry requests to the external firewall") private String numRetries; - @SerializedName(ApiConstants.TIMEOUT) @Param(description="the timeout (in seconds) for requests to the external firewall") + @SerializedName(ApiConstants.TIMEOUT) + @Param(description = "the timeout (in seconds) for requests to the external firewall") private String timeout; public void setId(String lbDeviceId) { diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java index 088e6830f4e..a38ca713de3 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java @@ -25,10 +25,12 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ExternalFirewallResponse; -import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; + import com.cloud.api.ApiDBUtils; import com.cloud.api.commands.AddExternalFirewallCmd; import com.cloud.api.commands.AddPaloAltoFirewallCmd; @@ -41,7 +43,6 @@ import com.cloud.api.commands.ListPaloAltoFirewallsCmd; import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.DataCenterVO; @@ -67,6 +68,7 @@ import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.PublicIpAddress; import com.cloud.network.dao.ExternalFirewallDeviceDao; import com.cloud.network.dao.ExternalFirewallDeviceVO; +import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkExternalFirewallDao; import com.cloud.network.dao.NetworkExternalFirewallVO; @@ -74,7 +76,6 @@ import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.network.resource.PaloAltoResource; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.PortForwardingRule; @@ -86,14 +87,11 @@ import com.cloud.utils.db.EntityManager; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, FirewallServiceProvider.class, - PortForwardingServiceProvider.class, IpDeployer.class, - SourceNatServiceProvider.class}) +@Local(value = {NetworkElement.class, FirewallServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class}) public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, -PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, StaticNatServiceProvider { + PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, StaticNatServiceProvider { private static final Logger s_logger = Logger.getLogger(PaloAltoExternalFirewallElement.class); @@ -151,8 +149,8 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati } @Override - public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException, ConcurrentOperationException, - InsufficientNetworkCapacityException { + public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException, + ConcurrentOperationException, InsufficientNetworkCapacityException { DataCenter zone = _entityMgr.findById(DataCenter.class, network.getDataCenterId()); // don't have to implement network is Basic zone @@ -176,8 +174,8 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati } @Override - public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientNetworkCapacityException, ResourceUnavailableException { + public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { return true; } @@ -285,7 +283,7 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati @Override public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException { + ResourceUnavailableException { // TODO Auto-generated method stub return true; } @@ -298,7 +296,8 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati @Override @Deprecated // should use more generic addNetworkDevice command to add firewall - public Host addExternalFirewall(AddExternalFirewallCmd cmd) { + public + Host addExternalFirewall(AddExternalFirewallCmd cmd) { Long zoneId = cmd.getZoneId(); DataCenterVO zone = null; PhysicalNetworkVO pNetwork = null; @@ -311,13 +310,14 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { - throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " - + zoneId + " to add this device."); + throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + + " to add this device."); } pNetwork = physicalNetworks.get(0); String deviceType = NetworkDevice.PaloAltoFirewall.getName(); - ExternalFirewallDeviceVO fwDeviceVO = addExternalFirewall(pNetwork.getId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceType, new PaloAltoResource()); + ExternalFirewallDeviceVO fwDeviceVO = + addExternalFirewall(pNetwork.getId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceType, new PaloAltoResource()); if (fwDeviceVO != null) { fwHost = _hostDao.findById(fwDeviceVO.getHostId()); } @@ -333,7 +333,8 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati @Override @Deprecated // should use more generic listNetworkDevice command - public List listExternalFirewalls(ListExternalFirewallsCmd cmd) { + public + List listExternalFirewalls(ListExternalFirewallsCmd cmd) { List firewallHosts = new ArrayList(); Long zoneId = cmd.getZoneId(); DataCenterVO zone = null; @@ -347,8 +348,8 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati List physicalNetworks = _physicalNetworkDao.listByZone(zoneId); if ((physicalNetworks == null) || (physicalNetworks.size() > 1)) { - throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " - + zoneId + " to add this device."); + throw new InvalidParameterValueException("There are no physical networks or multiple physical networks configured in zone with ID: " + zoneId + + " to add this device."); } pNetwork = physicalNetworks.get(0); } @@ -382,8 +383,7 @@ PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, Stati if (!deviceName.equalsIgnoreCase(NetworkDevice.PaloAltoFirewall.getName())) { throw new InvalidParameterValueException("Invalid Palo Alto firewall device type"); } - return addExternalFirewall(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, - new PaloAltoResource()); + return addExternalFirewall(cmd.getPhysicalNetworkId(), cmd.getUrl(), cmd.getUsername(), cmd.getPassword(), deviceName, new PaloAltoResource()); } @Override diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java index ecd32f928a4..17b3133b391 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java @@ -18,6 +18,8 @@ package com.cloud.network.element; import java.util.List; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; + import com.cloud.api.commands.AddExternalFirewallCmd; import com.cloud.api.commands.AddPaloAltoFirewallCmd; import com.cloud.api.commands.ConfigurePaloAltoFirewallCmd; @@ -30,11 +32,9 @@ import com.cloud.api.response.PaloAltoFirewallResponse; import com.cloud.host.Host; import com.cloud.network.Network; import com.cloud.network.dao.ExternalFirewallDeviceVO; - -import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.utils.component.PluggableService; -public interface PaloAltoFirewallElementService extends PluggableService { +public interface PaloAltoFirewallElementService extends PluggableService { /** * adds a Palo Alto firewall device in to a physical network @@ -73,16 +73,23 @@ public interface PaloAltoFirewallElementService extends PluggableService { public PaloAltoFirewallResponse createPaloAltoFirewallResponse(ExternalFirewallDeviceVO fwDeviceVO); + @Deprecated + // API helper function supported for backward compatibility + public + Host addExternalFirewall(AddExternalFirewallCmd cmd); - @Deprecated // API helper function supported for backward compatibility - public Host addExternalFirewall(AddExternalFirewallCmd cmd); + @Deprecated + // API helper function supported for backward compatibility + public + boolean deleteExternalFirewall(DeleteExternalFirewallCmd cmd); - @Deprecated // API helper function supported for backward compatibility - public boolean deleteExternalFirewall(DeleteExternalFirewallCmd cmd); + @Deprecated + // API helper function supported for backward compatibility + public + List listExternalFirewalls(ListExternalFirewallsCmd cmd); - @Deprecated // API helper function supported for backward compatibility - public List listExternalFirewalls(ListExternalFirewallsCmd cmd); - - @Deprecated // API helper function supported for backward compatibility - public ExternalFirewallResponse createExternalFirewallResponse(Host externalFirewall); + @Deprecated + // API helper function supported for backward compatibility + public + ExternalFirewallResponse createExternalFirewallResponse(Host externalFirewall); } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java index e95ef91e2c6..2fac31efac5 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java @@ -16,21 +16,47 @@ // under the License. package com.cloud.network.resource; -import java.io.BufferedReader; -import java.io.FileReader; import java.io.IOException; import java.io.StringReader; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; + import javax.naming.ConfigurationException; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +// for prettyFormat() +import javax.xml.transform.stream.StreamSource; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +// http client handling +import org.apache.http.client.ResponseHandler; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.BasicResponseHandler; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.protocol.HTTP; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; @@ -56,43 +82,11 @@ import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.agent.api.to.StaticNatRuleTO; import com.cloud.host.Host; import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.FirewallRule.TrafficType; -import com.cloud.network.rules.FirewallRule.Purpose; +import com.cloud.network.utils.HttpClientWrapper; import com.cloud.resource.ServerResource; import com.cloud.utils.NumbersUtil; import com.cloud.utils.exception.ExecutionException; import com.cloud.utils.net.NetUtils; -import com.cloud.utils.script.Script; - -// http client handling -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.BasicResponseHandler; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.NameValuePair; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.protocol.HTTP; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.net.URLDecoder; -import javax.xml.xpath.XPathFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import com.cloud.network.utils.HttpClientWrapper; - -// for prettyFormat() -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Source; -import java.io.StringWriter; public class PaloAltoResource implements ServerResource { @@ -129,122 +123,123 @@ public class PaloAltoResource implements ServerResource { } private enum InterfaceType { - AGGREGATE("aggregate-ethernet"), - ETHERNET("ethernet"); + AGGREGATE("aggregate-ethernet"), ETHERNET("ethernet"); private String type; private InterfaceType(String type) { this.type = type; } + + @Override public String toString() { return type; } } private enum Protocol { - TCP("tcp"), - UDP("udp"), - ICMP("icmp"), - ALL("all"); + TCP("tcp"), UDP("udp"), ICMP("icmp"), ALL("all"); private String protocol; private Protocol(String protocol) { this.protocol = protocol; } + + @Override public String toString() { return protocol; } } private enum GuestNetworkType { - SOURCE_NAT, - INTERFACE_NAT; + SOURCE_NAT, INTERFACE_NAT; } + @Override public Answer executeRequest(Command cmd) { if (cmd instanceof ReadyCommand) { - return execute((ReadyCommand) cmd); + return execute((ReadyCommand)cmd); } else if (cmd instanceof MaintainCommand) { - return execute((MaintainCommand) cmd); + return execute((MaintainCommand)cmd); } else if (cmd instanceof IpAssocCommand) { - return execute((IpAssocCommand) cmd); + return execute((IpAssocCommand)cmd); } else if (cmd instanceof SetStaticNatRulesCommand) { - return execute((SetStaticNatRulesCommand) cmd); + return execute((SetStaticNatRulesCommand)cmd); } else if (cmd instanceof SetPortForwardingRulesCommand) { - return execute((SetPortForwardingRulesCommand) cmd); + return execute((SetPortForwardingRulesCommand)cmd); } else if (cmd instanceof SetFirewallRulesCommand) { - return execute((SetFirewallRulesCommand) cmd); + return execute((SetFirewallRulesCommand)cmd); } else if (cmd instanceof ExternalNetworkResourceUsageCommand) { - return execute((ExternalNetworkResourceUsageCommand) cmd); + return execute((ExternalNetworkResourceUsageCommand)cmd); } else { return Answer.createUnsupportedCommandAnswer(cmd); } } + @Override public boolean configure(String name, Map params) throws ConfigurationException { try { - _name = (String) params.get("name"); + _name = (String)params.get("name"); if (_name == null) { throw new ConfigurationException("Unable to find name"); } - _zoneId = (String) params.get("zoneId"); + _zoneId = (String)params.get("zoneId"); if (_zoneId == null) { throw new ConfigurationException("Unable to find zone"); } - _ip = (String) params.get("ip"); + _ip = (String)params.get("ip"); if (_ip == null) { throw new ConfigurationException("Unable to find IP"); } - _username = (String) params.get("username"); + _username = (String)params.get("username"); if (_username == null) { throw new ConfigurationException("Unable to find username"); } - _password = (String) params.get("password"); + _password = (String)params.get("password"); if (_password == null) { throw new ConfigurationException("Unable to find password"); } - _publicInterface = (String) params.get("publicinterface"); + _publicInterface = (String)params.get("publicinterface"); if (_publicInterface == null) { throw new ConfigurationException("Unable to find public interface."); } - _privateInterface = (String) params.get("privateinterface"); + _privateInterface = (String)params.get("privateinterface"); if (_privateInterface == null) { throw new ConfigurationException("Unable to find private interface."); } - _publicZone = (String) params.get("publicnetwork"); + _publicZone = (String)params.get("publicnetwork"); if (_publicZone == null) { throw new ConfigurationException("Unable to find public zone"); } - _privateZone = (String) params.get("privatenetwork"); + _privateZone = (String)params.get("privatenetwork"); if (_privateZone == null) { throw new ConfigurationException("Unable to find private zone"); } - _virtualRouter = (String) params.get("pavr"); + _virtualRouter = (String)params.get("pavr"); if (_virtualRouter == null) { throw new ConfigurationException("Unable to find virtual router"); } - _threatProfile = (String) params.get("patp"); - _logProfile = (String) params.get("palp"); + _threatProfile = (String)params.get("patp"); + _logProfile = (String)params.get("palp"); - _guid = (String) params.get("guid"); + _guid = (String)params.get("guid"); if (_guid == null) { throw new ConfigurationException("Unable to find the guid"); } - _numRetries = NumbersUtil.parseInt((String) params.get("numretries"), 1); - _timeoutInSeconds = NumbersUtil.parseInt((String) params.get("timeout"), 300); + _numRetries = NumbersUtil.parseInt((String)params.get("numretries"), 1); + _timeoutInSeconds = NumbersUtil.parseInt((String)params.get("timeout"), 300); // Open a socket and login if (!refreshPaloAltoConnection()) { @@ -311,6 +306,7 @@ public class PaloAltoResource implements ServerResource { } + @Override public StartupCommand[] initialize() { StartupExternalFirewallCommand cmd = new StartupExternalFirewallCommand(); cmd.setName(_name); @@ -320,9 +316,10 @@ public class PaloAltoResource implements ServerResource { cmd.setStorageIpAddress(""); cmd.setVersion(PaloAltoResource.class.getPackage().getImplementationVersion()); cmd.setGuid(_guid); - return new StartupCommand[]{cmd}; + return new StartupCommand[] {cmd}; } + @Override public Host.Type getType() { return Host.Type.ExternalFirewall; } @@ -352,10 +349,12 @@ public class PaloAltoResource implements ServerResource { // nothing for now... } + @Override public IAgentControl getAgentControl() { return null; } + @Override public void setAgentControl(IAgentControl agentControl) { return; } @@ -363,7 +362,7 @@ public class PaloAltoResource implements ServerResource { /* * Login */ - private void openHttpConnection(){ + private void openHttpConnection() { _httpclient = new DefaultHttpClient(); // Allows you to connect via SSL using unverified certs @@ -399,7 +398,7 @@ public class PaloAltoResource implements ServerResource { XPath xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = xpath.compile("/response[@status='success']/result/key/text()"); - _key = (String) expr.evaluate(keygen_doc, XPathConstants.STRING); + _key = (String)expr.evaluate(keygen_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -409,10 +408,8 @@ public class PaloAltoResource implements ServerResource { return false; } - // ENTRY POINTS... - private Answer execute(ReadyCommand cmd) { return new ReadyAnswer(cmd); } @@ -425,7 +422,6 @@ public class PaloAltoResource implements ServerResource { return new ExternalNetworkResourceUsageAnswer(cmd); } - /* * Guest networks */ @@ -502,40 +498,41 @@ public class PaloAltoResource implements ServerResource { return new IpAssocAnswer(cmd, results); } - private void implementGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String publicIp, long privateVlanTag, String privateGateway, String privateSubnet, long privateCidrNumber) throws ExecutionException { - privateSubnet = privateSubnet+"/"+privateCidrNumber; + private void implementGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String publicIp, long privateVlanTag, + String privateGateway, String privateSubnet, long privateCidrNumber) throws ExecutionException { + privateSubnet = privateSubnet + "/" + privateCidrNumber; - managePrivateInterface(cmdList, PaloAltoPrimative.ADD, privateVlanTag, privateGateway+"/"+privateCidrNumber); + managePrivateInterface(cmdList, PaloAltoPrimative.ADD, privateVlanTag, privateGateway + "/" + privateCidrNumber); if (type.equals(GuestNetworkType.SOURCE_NAT)) { - managePublicInterface(cmdList, PaloAltoPrimative.ADD, publicVlanTag, publicIp+"/32", privateVlanTag); - manageSrcNatRule(cmdList, PaloAltoPrimative.ADD, type, publicVlanTag, publicIp+"/32", privateVlanTag, privateGateway+"/"+privateCidrNumber); + managePublicInterface(cmdList, PaloAltoPrimative.ADD, publicVlanTag, publicIp + "/32", privateVlanTag); + manageSrcNatRule(cmdList, PaloAltoPrimative.ADD, type, publicVlanTag, publicIp + "/32", privateVlanTag, privateGateway + "/" + privateCidrNumber); manageNetworkIsolation(cmdList, PaloAltoPrimative.ADD, privateVlanTag, privateSubnet, privateGateway); } - String msg = "Implemented guest network with type " + type + ". Guest VLAN tag: " + privateVlanTag + ", guest gateway: " + privateGateway+"/"+privateCidrNumber; + String msg = + "Implemented guest network with type " + type + ". Guest VLAN tag: " + privateVlanTag + ", guest gateway: " + privateGateway + "/" + privateCidrNumber; msg += type.equals(GuestNetworkType.SOURCE_NAT) ? ", source NAT IP: " + publicIp : ""; s_logger.debug(msg); } - private void shutdownGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, String privateGateway, String privateSubnet, long privateCidrSize) throws ExecutionException { - privateSubnet = privateSubnet+"/"+privateCidrSize; + private void shutdownGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, + String privateGateway, String privateSubnet, long privateCidrSize) throws ExecutionException { + privateSubnet = privateSubnet + "/" + privateCidrSize; if (type.equals(GuestNetworkType.SOURCE_NAT)) { manageNetworkIsolation(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateSubnet, privateGateway); - manageSrcNatRule(cmdList, PaloAltoPrimative.DELETE, type, publicVlanTag, sourceNatIpAddress+"/32", privateVlanTag, privateGateway+"/"+privateCidrSize); - managePublicInterface(cmdList, PaloAltoPrimative.DELETE, publicVlanTag, sourceNatIpAddress+"/32", privateVlanTag); + manageSrcNatRule(cmdList, PaloAltoPrimative.DELETE, type, publicVlanTag, sourceNatIpAddress + "/32", privateVlanTag, privateGateway + "/" + privateCidrSize); + managePublicInterface(cmdList, PaloAltoPrimative.DELETE, publicVlanTag, sourceNatIpAddress + "/32", privateVlanTag); } - managePrivateInterface(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateGateway+"/"+privateCidrSize); + managePrivateInterface(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateGateway + "/" + privateCidrSize); - String msg = "Shut down guest network with type " + type +". Guest VLAN tag: " + privateVlanTag + ", guest gateway: " + privateGateway+"/"+privateCidrSize; + String msg = "Shut down guest network with type " + type + ". Guest VLAN tag: " + privateVlanTag + ", guest gateway: " + privateGateway + "/" + privateCidrSize; msg += type.equals(GuestNetworkType.SOURCE_NAT) ? ", source NAT IP: " + sourceNatIpAddress : ""; s_logger.debug(msg); } - - /* * Firewall rule entry point */ @@ -573,7 +570,6 @@ public class PaloAltoResource implements ServerResource { } } - /* * Static NAT rule entry point */ @@ -613,11 +609,10 @@ public class PaloAltoResource implements ServerResource { } } - /* * Destination NAT (Port Forwarding) entry point */ - private synchronized Answer execute (SetPortForwardingRulesCommand cmd) { + private synchronized Answer execute(SetPortForwardingRulesCommand cmd) { refreshPaloAltoConnection(); return execute(cmd, _numRetries); } @@ -652,126 +647,131 @@ public class PaloAltoResource implements ServerResource { } } - // IMPLEMENTATIONS... - /* * Private interface implementation */ private String genPrivateInterfaceName(long vlanTag) { - return _privateInterface+"."+Long.toString(vlanTag); + return _privateInterface + "." + Long.toString(vlanTag); } - public boolean managePrivateInterface(ArrayList cmdList, PaloAltoPrimative prim, long privateVlanTag, String privateGateway) throws ExecutionException { - String interfaceName = genPrivateInterfaceName(privateVlanTag); + public boolean managePrivateInterface(ArrayList cmdList, PaloAltoPrimative prim, long privateVlanTag, String privateGateway) + throws ExecutionException { + String interfaceName = genPrivateInterfaceName(privateVlanTag); switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/network/interface/"+_privateInterfaceType+"/entry[@name='"+_privateInterface+"']/layer3/units/entry[@name='"+interfaceName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Private sub-interface exists: "+interfaceName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/network/interface/" + _privateInterfaceType + "/entry[@name='" + _privateInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Private sub-interface exists: " + interfaceName + ", " + result); + return result; + + case ADD: + if (managePrivateInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateGateway)) { + return true; + } + + // add cmds + // add sub-interface + Map a_sub_params = new HashMap(); + a_sub_params.put("type", "config"); + a_sub_params.put("action", "set"); + a_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _privateInterfaceType + "/entry[@name='" + _privateInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']"); + a_sub_params.put("element", "" + privateVlanTag + "" + + _pingManagementProfile + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + + // add sub-interface to VR... + Map a_vr_params = new HashMap(); + a_vr_params.put("type", "config"); + a_vr_params.put("action", "set"); + a_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='" + _virtualRouter + "']/interface"); + a_vr_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vr_params)); + + // add sub-interface to vsys... + Map a_vsys_params = new HashMap(); + a_vsys_params.put("type", "config"); + a_vsys_params.put("action", "set"); + a_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface"); + a_vsys_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vsys_params)); + + // add sub-interface to zone... + Map a_zone_params = new HashMap(); + a_zone_params.put("type", "config"); + a_zone_params.put("action", "set"); + a_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='" + _privateZone + "']/network/layer3"); + a_zone_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_zone_params)); - case ADD: - if (managePrivateInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateGateway)) { return true; - } - // add cmds - // add sub-interface - Map a_sub_params = new HashMap(); - a_sub_params.put("type", "config"); - a_sub_params.put("action", "set"); - a_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_privateInterfaceType+"/entry[@name='"+_privateInterface+"']/layer3/units/entry[@name='"+interfaceName+"']"); - a_sub_params.put("element", ""+privateVlanTag+""+_pingManagementProfile+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + case DELETE: + if (!managePrivateInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateGateway)) { + return true; + } - // add sub-interface to VR... - Map a_vr_params = new HashMap(); - a_vr_params.put("type", "config"); - a_vr_params.put("action", "set"); - a_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='"+_virtualRouter+"']/interface"); - a_vr_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vr_params)); + // add cmds to the list + // delete sub-interface from zone... + Map d_zone_params = new HashMap(); + d_zone_params.put("type", "config"); + d_zone_params.put("action", "delete"); + d_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='" + _privateZone + "']/network/layer3/member[text()='" + + interfaceName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_zone_params)); - // add sub-interface to vsys... - Map a_vsys_params = new HashMap(); - a_vsys_params.put("type", "config"); - a_vsys_params.put("action", "set"); - a_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface"); - a_vsys_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vsys_params)); + // delete sub-interface from vsys... + Map d_vsys_params = new HashMap(); + d_vsys_params.put("type", "config"); + d_vsys_params.put("action", "delete"); + d_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface/member[text()='" + interfaceName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_vsys_params)); - // add sub-interface to zone... - Map a_zone_params = new HashMap(); - a_zone_params.put("type", "config"); - a_zone_params.put("action", "set"); - a_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='"+_privateZone+"']/network/layer3"); - a_zone_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_zone_params)); + // delete sub-interface from VR... + Map d_vr_params = new HashMap(); + d_vr_params.put("type", "config"); + d_vr_params.put("action", "delete"); + d_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='" + _virtualRouter + "']/interface/member[text()='" + interfaceName + + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_vr_params)); - return true; + // delete sub-interface... + Map d_sub_params = new HashMap(); + d_sub_params.put("type", "config"); + d_sub_params.put("action", "delete"); + d_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _privateInterfaceType + "/entry[@name='" + _privateInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - case DELETE: - if (!managePrivateInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateGateway)) { return true; - } - // add cmds to the list - // delete sub-interface from zone... - Map d_zone_params = new HashMap(); - d_zone_params.put("type", "config"); - d_zone_params.put("action", "delete"); - d_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='"+_privateZone+"']/network/layer3/member[text()='"+interfaceName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_zone_params)); - - // delete sub-interface from vsys... - Map d_vsys_params = new HashMap(); - d_vsys_params.put("type", "config"); - d_vsys_params.put("action", "delete"); - d_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface/member[text()='"+interfaceName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_vsys_params)); - - // delete sub-interface from VR... - Map d_vr_params = new HashMap(); - d_vr_params.put("type", "config"); - d_vr_params.put("action", "delete"); - d_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='"+_virtualRouter+"']/interface/member[text()='"+interfaceName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_vr_params)); - - // delete sub-interface... - Map d_sub_params = new HashMap(); - d_sub_params.put("type", "config"); - d_sub_params.put("action", "delete"); - d_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_privateInterfaceType+"/entry[@name='"+_privateInterface+"']/layer3/units/entry[@name='"+interfaceName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - /* * Public Interface implementation */ private String genPublicInterfaceName(Long id) { - return _publicInterface+"."+Long.toString(id); + return _publicInterface + "." + Long.toString(id); } - public boolean managePublicInterface(ArrayList cmdList, PaloAltoPrimative prim, Long publicVlanTag, String publicIp, long privateVlanTag) throws ExecutionException { + public boolean managePublicInterface(ArrayList cmdList, PaloAltoPrimative prim, Long publicVlanTag, String publicIp, long privateVlanTag) + throws ExecutionException { String interfaceName; if (publicVlanTag == null) { interfaceName = genPublicInterfaceName(new Long("9999")); @@ -781,86 +781,89 @@ public class PaloAltoResource implements ServerResource { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+interfaceName+"']/ip/entry[@name='"+publicIp+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Public sub-interface & IP exists: "+interfaceName+" : "+publicIp+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']/ip/entry[@name='" + publicIp + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Public sub-interface & IP exists: " + interfaceName + " : " + publicIp + ", " + result); + return result; + + case ADD: + if (managePublicInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, publicVlanTag, publicIp, privateVlanTag)) { + return true; + } + + // add IP to the sub-interface + Map a_sub_params = new HashMap(); + a_sub_params.put("type", "config"); + a_sub_params.put("action", "set"); + a_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']/ip"); + a_sub_params.put("element", ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + + // add sub-interface to VR (does nothing if already done)... + Map a_vr_params = new HashMap(); + a_vr_params.put("type", "config"); + a_vr_params.put("action", "set"); + a_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='" + _virtualRouter + "']/interface"); + a_vr_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vr_params)); + + // add sub-interface to vsys (does nothing if already done)... + Map a_vsys_params = new HashMap(); + a_vsys_params.put("type", "config"); + a_vsys_params.put("action", "set"); + a_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface"); + a_vsys_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vsys_params)); + + // add sub-interface to zone (does nothing if already done)... + Map a_zone_params = new HashMap(); + a_zone_params.put("type", "config"); + a_zone_params.put("action", "set"); + a_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='" + _publicZone + "']/network/layer3"); + a_zone_params.put("element", "" + interfaceName + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_zone_params)); - case ADD: - if (managePublicInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, publicVlanTag, publicIp, privateVlanTag)) { return true; - } - // add IP to the sub-interface - Map a_sub_params = new HashMap(); - a_sub_params.put("type", "config"); - a_sub_params.put("action", "set"); - a_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+interfaceName+"']/ip"); - a_sub_params.put("element", ""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + case DELETE: + if (!managePublicInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, publicVlanTag, publicIp, privateVlanTag)) { + return true; + } - // add sub-interface to VR (does nothing if already done)... - Map a_vr_params = new HashMap(); - a_vr_params.put("type", "config"); - a_vr_params.put("action", "set"); - a_vr_params.put("xpath", "/config/devices/entry/network/virtual-router/entry[@name='"+_virtualRouter+"']/interface"); - a_vr_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vr_params)); + // delete IP from sub-interface... + Map d_sub_params = new HashMap(); + d_sub_params.put("type", "config"); + d_sub_params.put("action", "delete"); + d_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + interfaceName + "']/ip/entry[@name='" + publicIp + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - // add sub-interface to vsys (does nothing if already done)... - Map a_vsys_params = new HashMap(); - a_vsys_params.put("type", "config"); - a_vsys_params.put("action", "set"); - a_vsys_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/import/network/interface"); - a_vsys_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_vsys_params)); - - // add sub-interface to zone (does nothing if already done)... - Map a_zone_params = new HashMap(); - a_zone_params.put("type", "config"); - a_zone_params.put("action", "set"); - a_zone_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='"+_publicZone+"']/network/layer3"); - a_zone_params.put("element", ""+interfaceName+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_zone_params)); - - return true; - - case DELETE: - if (!managePublicInterface(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, publicVlanTag, publicIp, privateVlanTag)) { return true; - } - // delete IP from sub-interface... - Map d_sub_params = new HashMap(); - d_sub_params.put("type", "config"); - d_sub_params.put("action", "delete"); - d_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+interfaceName+"']/ip/entry[@name='"+publicIp+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - /* * Source NAT rule implementation */ private String genSrcNatRuleName(Long privateVlanTag) { - return "src_nat."+Long.toString(privateVlanTag); + return "src_nat." + Long.toString(privateVlanTag); } - public boolean manageSrcNatRule(ArrayList cmdList, PaloAltoPrimative prim, GuestNetworkType type, Long publicVlanTag, String publicIp, long privateVlanTag, String privateGateway) throws ExecutionException { + public boolean manageSrcNatRule(ArrayList cmdList, PaloAltoPrimative prim, GuestNetworkType type, Long publicVlanTag, String publicIp, + long privateVlanTag, String privateGateway) throws ExecutionException { String publicInterfaceName; if (publicVlanTag == null) { publicInterfaceName = genPublicInterfaceName(new Long("9999")); @@ -871,69 +874,68 @@ public class PaloAltoResource implements ServerResource { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+srcNatName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Source NAT exists: "+srcNatName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + srcNatName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Source NAT exists: " + srcNatName + ", " + result); + return result; + + case ADD: + if (manageSrcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, type, publicVlanTag, publicIp, privateVlanTag, privateGateway)) { + return true; + } + + String xml = ""; + xml += "" + _privateZone + ""; + xml += "" + _publicZone + ""; + xml += "" + privateGateway + ""; + xml += "any"; + xml += "any"; + xml += "ipv4"; + xml += "" + publicInterfaceName + ""; + xml += ""; + xml += "" + publicIp + ""; + xml += "" + publicInterfaceName + ""; + xml += ""; + + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + srcNatName + "']"); + a_params.put("element", xml); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - case ADD: - if (manageSrcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, type, publicVlanTag, publicIp, privateVlanTag, privateGateway)) { return true; - } - String xml = ""; - xml += ""+_privateZone+""; - xml += ""+_publicZone+""; - xml += ""+privateGateway+""; - xml += "any"; - xml += "any"; - xml += "ipv4"; - xml += ""+publicInterfaceName+""; - xml += ""; - xml += ""+publicIp+""; - xml += ""+publicInterfaceName+""; - xml += ""; + case DELETE: + if (!manageSrcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, type, publicVlanTag, publicIp, privateVlanTag, privateGateway)) { + return true; + } - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+srcNatName+"']"); - a_params.put("element", xml); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + srcNatName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - return true; - - case DELETE: - if (!manageSrcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, type, publicVlanTag, publicIp, privateVlanTag, privateGateway)) { return true; - } - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+srcNatName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - /* * Destination NAT rules (Port Forwarding) implementation */ private String genDstNatRuleName(String publicIp, long id) { - return "dst_nat."+genIpIdentifier(publicIp)+"_"+Long.toString(id); + return "dst_nat." + genIpIdentifier(publicIp) + "_" + Long.toString(id); } public boolean manageDstNatRule(ArrayList cmdList, PaloAltoPrimative prim, PortForwardingRuleTO rule) throws ExecutionException { @@ -950,132 +952,132 @@ public class PaloAltoResource implements ServerResource { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+dstNatName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Destination NAT exists: "+dstNatName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + dstNatName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Destination NAT exists: " + dstNatName + ", " + result); + return result; - case ADD: - if (manageDstNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { - return true; - } - - // build source service xml - String srcService; - String protocol = rule.getProtocol(); - int[] srcPortRange = rule.getSrcPortRange(); - if (srcPortRange != null) { - String portRange; - if (srcPortRange.length == 1 || srcPortRange[0] == srcPortRange[1]) { - portRange = String.valueOf(srcPortRange[0]); - } else { - portRange = String.valueOf(srcPortRange[0])+"-"+String.valueOf(srcPortRange[1]); + case ADD: + if (manageDstNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; } - manageService(cmdList, PaloAltoPrimative.ADD, protocol, portRange, null); - srcService = genServiceName(protocol, portRange, null); - } else { - // no equivalent config in PA, so allow all traffic... - srcService = "any"; - } - // build destination port xml (single port limit in PA) - String dstPortXML = ""; - int[] dstPortRange = rule.getDstPortRange(); - if (dstPortRange != null) { - dstPortXML = ""+dstPortRange[0]+""; - } + // build source service xml + String srcService; + String protocol = rule.getProtocol(); + int[] srcPortRange = rule.getSrcPortRange(); + if (srcPortRange != null) { + String portRange; + if (srcPortRange.length == 1 || srcPortRange[0] == srcPortRange[1]) { + portRange = String.valueOf(srcPortRange[0]); + } else { + portRange = String.valueOf(srcPortRange[0]) + "-" + String.valueOf(srcPortRange[1]); + } + manageService(cmdList, PaloAltoPrimative.ADD, protocol, portRange, null); + srcService = genServiceName(protocol, portRange, null); + } else { + // no equivalent config in PA, so allow all traffic... + srcService = "any"; + } - // add public IP to the sub-interface - Map a_sub_params = new HashMap(); - a_sub_params.put("type", "config"); - a_sub_params.put("action", "set"); - a_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+publicInterfaceName+"']/ip"); - a_sub_params.put("element", ""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + // build destination port xml (single port limit in PA) + String dstPortXML = ""; + int[] dstPortRange = rule.getDstPortRange(); + if (dstPortRange != null) { + dstPortXML = "" + dstPortRange[0] + ""; + } - // add the destination nat rule for the public IP - String xml = ""; - xml += ""+_publicZone+""; - xml += ""+_publicZone+""; - xml += "any"; - xml += ""+publicIp+""; - xml += ""+srcService+""; - xml += "ipv4"; - xml += ""+publicInterfaceName+""; - xml += ""+rule.getDstIp()+""+dstPortXML+""; + // add public IP to the sub-interface + Map a_sub_params = new HashMap(); + a_sub_params.put("type", "config"); + a_sub_params.put("action", "set"); + a_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + publicInterfaceName + "']/ip"); + a_sub_params.put("element", ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+dstNatName+"']"); - a_params.put("element", xml); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); + // add the destination nat rule for the public IP + String xml = ""; + xml += "" + _publicZone + ""; + xml += "" + _publicZone + ""; + xml += "any"; + xml += "" + publicIp + ""; + xml += "" + srcService + ""; + xml += "ipv4"; + xml += "" + publicInterfaceName + ""; + xml += "" + rule.getDstIp() + "" + dstPortXML + ""; - return true; + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + dstNatName + "']"); + a_params.put("element", xml); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - case DELETE: - if (!manageDstNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { return true; - } - // determine if we need to delete the ip from the interface as well... - Map c_params = new HashMap(); - c_params.put("type", "config"); - c_params.put("action", "get"); - c_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[destination/member[text()='"+publicIp+"']]"); - String c_response = request(PaloAltoMethod.GET, c_params); + case DELETE: + if (!manageDstNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; + } - String count = ""; - NodeList response_body; - Document doc = getDocument(c_response); - XPath xpath = XPathFactory.newInstance().newXPath(); - try { - XPathExpression expr = xpath.compile("/response[@status='success']/result"); - response_body = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - } catch (XPathExpressionException e) { - throw new ExecutionException(e.getCause().getMessage()); - } - if (response_body.getLength() > 0 && response_body.item(0).getAttributes().getLength() > 0) { - count = response_body.item(0).getAttributes().getNamedItem("count").getTextContent(); - } + // determine if we need to delete the ip from the interface as well... + Map c_params = new HashMap(); + c_params.put("type", "config"); + c_params.put("action", "get"); + c_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[destination/member[text()='" + publicIp + "']]"); + String c_response = request(PaloAltoMethod.GET, c_params); - // delete the dst nat rule - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+dstNatName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); + String count = ""; + NodeList response_body; + Document doc = getDocument(c_response); + XPath xpath = XPathFactory.newInstance().newXPath(); + try { + XPathExpression expr = xpath.compile("/response[@status='success']/result"); + response_body = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); + } catch (XPathExpressionException e) { + throw new ExecutionException(e.getCause().getMessage()); + } + if (response_body.getLength() > 0 && response_body.item(0).getAttributes().getLength() > 0) { + count = response_body.item(0).getAttributes().getNamedItem("count").getTextContent(); + } - if (!count.equals("") && Integer.parseInt(count) == 1) { // this dst nat rule is the last, so remove the ip... - // delete IP from sub-interface... - Map d_sub_params = new HashMap(); - d_sub_params.put("type", "config"); - d_sub_params.put("action", "delete"); - d_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+publicInterfaceName+"']/ip/entry[@name='"+publicIp+"/32']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - } + // delete the dst nat rule + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + dstNatName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - return true; + if (!count.equals("") && Integer.parseInt(count) == 1) { // this dst nat rule is the last, so remove the ip... + // delete IP from sub-interface... + Map d_sub_params = new HashMap(); + d_sub_params.put("type", "config"); + d_sub_params.put("action", "delete"); + d_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + publicInterfaceName + "']/ip/entry[@name='" + publicIp + "/32']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); + } - default: - s_logger.debug("Unrecognized command."); - return false; + return true; + + default: + s_logger.debug("Unrecognized command."); + return false; } } - - /* * Static NAT rule implementation */ private String genStcNatRuleName(String publicIp, long id) { - return "stc_nat."+genIpIdentifier(publicIp)+"_"+Long.toString(id); + return "stc_nat." + genIpIdentifier(publicIp) + "_" + Long.toString(id); } public boolean manageStcNatRule(ArrayList cmdList, PaloAltoPrimative prim, StaticNatRuleTO rule) throws ExecutionException { @@ -1092,85 +1094,85 @@ public class PaloAltoResource implements ServerResource { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+stcNatName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Static NAT exists: "+stcNatName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + stcNatName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Static NAT exists: " + stcNatName + ", " + result); + return result; + + case ADD: + if (manageStcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; + } + + // add public IP to the sub-interface + Map a_sub_params = new HashMap(); + a_sub_params.put("type", "config"); + a_sub_params.put("action", "set"); + a_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + publicInterfaceName + "']/ip"); + a_sub_params.put("element", ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + + // add the static nat rule for the public IP + String xml = ""; + xml += "" + _publicZone + ""; + xml += "" + _publicZone + ""; + xml += "any"; + xml += "" + publicIp + ""; + xml += "any"; + xml += "ipv4"; + xml += "" + publicInterfaceName + ""; + xml += "" + rule.getDstIp() + ""; + + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + stcNatName + "']"); + a_params.put("element", xml); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - case ADD: - if (manageStcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { return true; - } - // add public IP to the sub-interface - Map a_sub_params = new HashMap(); - a_sub_params.put("type", "config"); - a_sub_params.put("action", "set"); - a_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+publicInterfaceName+"']/ip"); - a_sub_params.put("element", ""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); + case DELETE: + if (!manageStcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; + } - // add the static nat rule for the public IP - String xml = ""; - xml += ""+_publicZone+""; - xml += ""+_publicZone+""; - xml += "any"; - xml += ""+publicIp+""; - xml += "any"; - xml += "ipv4"; - xml += ""+publicInterfaceName+""; - xml += ""+rule.getDstIp()+""; + // delete the static nat rule + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='" + stcNatName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); + // delete IP from sub-interface... + Map d_sub_params = new HashMap(); + d_sub_params.put("type", "config"); + d_sub_params.put("action", "delete"); + d_sub_params.put("xpath", "/config/devices/entry/network/interface/" + _publicInterfaceType + "/entry[@name='" + _publicInterface + + "']/layer3/units/entry[@name='" + publicInterfaceName + "']/ip/entry[@name='" + publicIp + "/32']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+stcNatName+"']"); - a_params.put("element", xml); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - - return true; - - case DELETE: - if (!manageStcNatRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { return true; - } - // delete the static nat rule - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='"+stcNatName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - - // delete IP from sub-interface... - Map d_sub_params = new HashMap(); - d_sub_params.put("type", "config"); - d_sub_params.put("action", "delete"); - d_sub_params.put("xpath", "/config/devices/entry/network/interface/"+_publicInterfaceType+"/entry[@name='"+_publicInterface+"']/layer3/units/entry[@name='"+publicInterfaceName+"']/ip/entry[@name='"+publicIp+"/32']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_sub_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - /* * Firewall rule implementation */ private String genFirewallRuleName(long id) { - return "policy_"+Long.toString(id); + return "policy_" + Long.toString(id); } public boolean manageFirewallRule(ArrayList cmdList, PaloAltoPrimative prim, FirewallRuleTO rule) throws ExecutionException { @@ -1178,329 +1180,325 @@ public class PaloAltoResource implements ServerResource { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Firewall policy exists: "+ruleName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Firewall policy exists: " + ruleName + ", " + result); + return result; - case ADD: - if (manageFirewallRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { - return true; - } + case ADD: + if (manageFirewallRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; + } - String srcZone; - String dstZone; - String dstAddressXML; - String appXML; - String serviceXML; + String srcZone; + String dstZone; + String dstAddressXML; + String appXML; + String serviceXML; - String protocol = rule.getProtocol(); + String protocol = rule.getProtocol(); - // Only ICMP will use an Application, so others will be any. - if (protocol.equals(Protocol.ICMP.toString())) { - appXML = "icmppingtraceroute"; // use the default icmp applications... - } else { - appXML = "any"; - } - - // Only TCP and UDP will use a Service, others will use any. - if (protocol.equals(Protocol.TCP.toString()) || protocol.equals(Protocol.UDP.toString())) { - String portRange; - if (rule.getSrcPortRange() != null) { - int startPort = rule.getSrcPortRange()[0]; - int endPort = rule.getSrcPortRange()[1]; - if (startPort == endPort) { - portRange = String.valueOf(startPort); - } else { - portRange = String.valueOf(startPort)+"-"+String.valueOf(endPort); - } - manageService(cmdList, PaloAltoPrimative.ADD, protocol, portRange, null); - serviceXML = ""+genServiceName(protocol, portRange, null)+""; + // Only ICMP will use an Application, so others will be any. + if (protocol.equals(Protocol.ICMP.toString())) { + appXML = "icmppingtraceroute"; // use the default icmp applications... + } else { + appXML = "any"; + } + + // Only TCP and UDP will use a Service, others will use any. + if (protocol.equals(Protocol.TCP.toString()) || protocol.equals(Protocol.UDP.toString())) { + String portRange; + if (rule.getSrcPortRange() != null) { + int startPort = rule.getSrcPortRange()[0]; + int endPort = rule.getSrcPortRange()[1]; + if (startPort == endPort) { + portRange = String.valueOf(startPort); + } else { + portRange = String.valueOf(startPort) + "-" + String.valueOf(endPort); + } + manageService(cmdList, PaloAltoPrimative.ADD, protocol, portRange, null); + serviceXML = "" + genServiceName(protocol, portRange, null) + ""; + } else { + // no equivalent config in PA, so allow all traffic... + serviceXML = "any"; + } } else { - // no equivalent config in PA, so allow all traffic... serviceXML = "any"; } - } else { - serviceXML = "any"; - } - if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { // Network egress rule - srcZone = _privateZone; - dstZone = _publicZone; - dstAddressXML = "any"; - } else { - srcZone = _publicZone; - dstZone = _privateZone; - dstAddressXML = ""+rule.getSrcIp()+""; - } + if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { // Network egress rule + srcZone = _privateZone; + dstZone = _publicZone; + dstAddressXML = "any"; + } else { + srcZone = _publicZone; + dstZone = _privateZone; + dstAddressXML = "" + rule.getSrcIp() + ""; + } - // build the source cidr xml - String srcCidrXML = ""; - List ruleSrcCidrList = rule.getSourceCidrList(); - if (ruleSrcCidrList.size() > 0) { // a cidr was entered, modify as needed... - for (int i = 0; i < ruleSrcCidrList.size(); i++) { - if (ruleSrcCidrList.get(i).trim().equals("0.0.0.0/0")) { // allow any - if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { - srcCidrXML += ""+getPrivateSubnet(rule.getSrcVlanTag())+""; + // build the source cidr xml + String srcCidrXML = ""; + List ruleSrcCidrList = rule.getSourceCidrList(); + if (ruleSrcCidrList.size() > 0) { // a cidr was entered, modify as needed... + for (int i = 0; i < ruleSrcCidrList.size(); i++) { + if (ruleSrcCidrList.get(i).trim().equals("0.0.0.0/0")) { // allow any + if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { + srcCidrXML += "" + getPrivateSubnet(rule.getSrcVlanTag()) + ""; + } else { + srcCidrXML += "any"; + } } else { - srcCidrXML += "any"; + srcCidrXML += "" + ruleSrcCidrList.get(i).trim() + ""; } + } + } else { // no cidr was entered, so allow ALL according to firewall rule type + if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { + srcCidrXML = "" + getPrivateSubnet(rule.getSrcVlanTag()) + ""; } else { - srcCidrXML += ""+ruleSrcCidrList.get(i).trim()+""; + srcCidrXML = "any"; } } - } else { // no cidr was entered, so allow ALL according to firewall rule type - if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { - srcCidrXML = ""+getPrivateSubnet(rule.getSrcVlanTag())+""; - } else { - srcCidrXML = "any"; + + String xml = ""; + xml += "" + srcZone + ""; + xml += "" + dstZone + ""; + xml += "" + srcCidrXML + ""; + xml += "" + dstAddressXML + ""; + xml += "" + appXML + ""; + xml += "" + serviceXML + ""; + xml += "allow"; + xml += "no"; + xml += "no"; + if (_threatProfile != null) { // add the threat profile if it exists + xml += "" + _threatProfile + ""; + } + if (_logProfile != null) { // add the log profile if it exists + xml += "" + _logProfile + ""; } - } - String xml = ""; - xml += ""+srcZone+""; - xml += ""+dstZone+""; - xml += ""+srcCidrXML+""; - xml += ""+dstAddressXML+""; - xml += ""+appXML+""; - xml += ""+serviceXML+""; - xml += "allow"; - xml += "no"; - xml += "no"; - if (_threatProfile != null) { // add the threat profile if it exists - xml += ""+_threatProfile+""; - } - if (_logProfile != null) { // add the log profile if it exists - xml += ""+_logProfile+""; - } + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + a_params.put("element", xml); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - a_params.put("element", xml); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - - return true; - - case DELETE: - if (!manageFirewallRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { return true; - } - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); + case DELETE: + if (!manageFirewallRule(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, rule)) { + return true; + } - return true; + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - default: - s_logger.debug("Unrecognized command."); - return false; + return true; + + default: + s_logger.debug("Unrecognized command."); + return false; } } - - /* * Usage */ - - /* * Helper config functions */ // ensure guest network isolation private String genNetworkIsolationName(long privateVlanTag) { - return "isolate_"+Long.toString(privateVlanTag); + return "isolate_" + Long.toString(privateVlanTag); } - public boolean manageNetworkIsolation(ArrayList cmdList, PaloAltoPrimative prim, long privateVlanTag, String privateSubnet, String privateGateway) throws ExecutionException { + public boolean manageNetworkIsolation(ArrayList cmdList, PaloAltoPrimative prim, long privateVlanTag, String privateSubnet, String privateGateway) + throws ExecutionException { String ruleName = genNetworkIsolationName(privateVlanTag); switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Firewall policy exists: "+ruleName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Firewall policy exists: " + ruleName + ", " + result); + return result; + + case ADD: + if (manageNetworkIsolation(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateSubnet, privateGateway)) { + return true; + } + + String xml = ""; + xml += "" + _privateZone + ""; + xml += "" + _privateZone + ""; + xml += "" + privateSubnet + ""; + xml += "" + privateGateway + ""; + xml += "any"; + xml += "any"; + xml += "deny"; + xml += "no"; + xml += "yes"; + + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + a_params.put("element", xml); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); - case ADD: - if (manageNetworkIsolation(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateSubnet, privateGateway)) { return true; - } - String xml = ""; - xml += ""+_privateZone+""; - xml += ""+_privateZone+""; - xml += ""+privateSubnet+""; - xml += ""+privateGateway+""; - xml += "any"; - xml += "any"; - xml += "deny"; - xml += "no"; - xml += "yes"; + case DELETE: + if (!manageNetworkIsolation(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateSubnet, privateGateway)) { + return true; + } - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - a_params.put("element", xml); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, a_params)); + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='" + ruleName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - return true; - - case DELETE: - if (!manageNetworkIsolation(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, privateVlanTag, privateSubnet, privateGateway)) { return true; - } - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='"+ruleName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.POST, d_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - // make the interfaces pingable for basic network troubleshooting public boolean managePingProfile(ArrayList cmdList, PaloAltoPrimative prim) throws ExecutionException { switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='"+_pingManagementProfile+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Management profile exists: "+_pingManagementProfile+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='" + _pingManagementProfile + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Management profile exists: " + _pingManagementProfile + ", " + result); + return result; + + case ADD: + if (managePingProfile(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS)) { + return true; + } + + // add ping profile... + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='" + _pingManagementProfile + "']"); + a_params.put("element", "yes"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_params)); - case ADD: - if (managePingProfile(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS)) { return true; - } - // add ping profile... - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='"+_pingManagementProfile+"']"); - a_params.put("element", "yes"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_params)); + case DELETE: + if (!managePingProfile(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS)) { + return true; + } - return true; + // delete ping profile... + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='" + _pingManagementProfile + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_params)); - case DELETE: - if (!managePingProfile(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS)) { return true; - } - // delete ping profile... - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/network/profiles/interface-management-profile/entry[@name='"+_pingManagementProfile+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } - private String genServiceName(String protocol, String dstPorts, String srcPorts) { String name; if (srcPorts == null) { - name = "cs_"+protocol.toLowerCase()+"_"+dstPorts.replace(',', '.'); + name = "cs_" + protocol.toLowerCase() + "_" + dstPorts.replace(',', '.'); } else { - name = "cs_"+protocol.toLowerCase()+"_"+dstPorts.replace(',', '.')+"_"+srcPorts.replace(',', '.'); + name = "cs_" + protocol.toLowerCase() + "_" + dstPorts.replace(',', '.') + "_" + srcPorts.replace(',', '.'); } return name; } - public boolean manageService(ArrayList cmdList, PaloAltoPrimative prim, String protocol, String dstPorts, String srcPorts) throws ExecutionException { + public boolean manageService(ArrayList cmdList, PaloAltoPrimative prim, String protocol, String dstPorts, String srcPorts) + throws ExecutionException { String serviceName = genServiceName(protocol, dstPorts, srcPorts); switch (prim) { - case CHECK_IF_EXISTS: - // check if one exists already - Map params = new HashMap(); - params.put("type", "config"); - params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='"+serviceName+"']"); - String response = request(PaloAltoMethod.GET, params); - boolean result = (validResponse(response) && responseNotEmpty(response)); - s_logger.debug("Service exists: "+serviceName+", "+result); - return result; + case CHECK_IF_EXISTS: + // check if one exists already + Map params = new HashMap(); + params.put("type", "config"); + params.put("action", "get"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='" + serviceName + "']"); + String response = request(PaloAltoMethod.GET, params); + boolean result = (validResponse(response) && responseNotEmpty(response)); + s_logger.debug("Service exists: " + serviceName + ", " + result); + return result; + + case ADD: + if (manageService(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, protocol, dstPorts, srcPorts)) { + return true; + } + + String dstPortXML = "" + dstPorts + ""; + String srcPortXML = ""; + if (srcPorts != null) { + srcPortXML = "" + srcPorts + ""; + } + + // add ping profile... + Map a_params = new HashMap(); + a_params.put("type", "config"); + a_params.put("action", "set"); + a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='" + serviceName + "']"); + a_params.put("element", "<" + protocol.toLowerCase() + ">" + dstPortXML + srcPortXML + ""); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_params)); - case ADD: - if (manageService(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, protocol, dstPorts, srcPorts)) { return true; - } - String dstPortXML = ""+dstPorts+""; - String srcPortXML = ""; - if (srcPorts != null) { - srcPortXML = ""+srcPorts+""; - } + case DELETE: + if (!manageService(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, protocol, dstPorts, srcPorts)) { + return true; + } - // add ping profile... - Map a_params = new HashMap(); - a_params.put("type", "config"); - a_params.put("action", "set"); - a_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='"+serviceName+"']"); - a_params.put("element", "<"+protocol.toLowerCase()+">"+dstPortXML+srcPortXML+""); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_params)); + // delete ping profile... + Map d_params = new HashMap(); + d_params.put("type", "config"); + d_params.put("action", "delete"); + d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='" + serviceName + "']"); + cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_params)); - return true; - - case DELETE: - if (!manageService(cmdList, PaloAltoPrimative.CHECK_IF_EXISTS, protocol, dstPorts, srcPorts)) { return true; - } - // delete ping profile... - Map d_params = new HashMap(); - d_params.put("type", "config"); - d_params.put("action", "delete"); - d_params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='"+serviceName+"']"); - cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, d_params)); - - return true; - - default: - s_logger.debug("Unrecognized command."); - return false; + default: + s_logger.debug("Unrecognized command."); + return false; } } @@ -1509,7 +1507,8 @@ public class PaloAltoResource implements ServerResource { Map params = new HashMap(); params.put("type", "config"); params.put("action", "get"); - params.put("xpath", "/config/devices/entry/network/interface/"+_privateInterfaceType+"/entry[@name='"+_privateInterface+"']/layer3/units/entry[@name='"+_interfaceName+"']/ip/entry"); + params.put("xpath", "/config/devices/entry/network/interface/" + _privateInterfaceType + "/entry[@name='" + _privateInterface + "']/layer3/units/entry[@name='" + + _interfaceName + "']/ip/entry"); String response = request(PaloAltoMethod.GET, params); if (validResponse(response) && responseNotEmpty(response)) { NodeList response_body; @@ -1517,7 +1516,7 @@ public class PaloAltoResource implements ServerResource { XPath xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = xpath.compile("/response[@status='success']/result/entry"); - response_body = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + response_body = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1528,7 +1527,6 @@ public class PaloAltoResource implements ServerResource { return null; } - /* * XML API commands */ @@ -1551,13 +1549,13 @@ public class PaloAltoResource implements ServerResource { queryString = queryString + "&"; } try { - queryString = queryString + key+"="+URLEncoder.encode(params.get(key), "UTF-8"); + queryString = queryString + key + "=" + URLEncoder.encode(params.get(key), "UTF-8"); } catch (UnsupportedEncodingException e) { throw new ExecutionException(e.getMessage()); } } if (_key != null) { - queryString = queryString + "&key="+_key; + queryString = queryString + "&key=" + _key; } try { @@ -1566,7 +1564,6 @@ public class PaloAltoResource implements ServerResource { debug_msg = debug_msg + "GET request: https://" + _ip + _apiUri + queryString + "\n"; } - HttpGet get_request = new HttpGet("https://" + _ip + _apiUri + queryString); ResponseHandler responseHandler = new BasicResponseHandler(); try { @@ -1578,7 +1575,7 @@ public class PaloAltoResource implements ServerResource { // a POST method... if (method == PaloAltoMethod.POST) { - List nvps = new ArrayList (); + List nvps = new ArrayList(); for (String key : params.keySet()) { nvps.add(new BasicNameValuePair(key, params.get(key))); } @@ -1588,7 +1585,7 @@ public class PaloAltoResource implements ServerResource { debug_msg = debug_msg + "POST request: https://" + _ip + _apiUri + "\n"; for (NameValuePair nvp : nvps) { - debug_msg = debug_msg + "param: "+nvp.getName()+", "+nvp.getValue() + "\n"; + debug_msg = debug_msg + "param: " + nvp.getName() + ", " + nvp.getValue() + "\n"; } HttpPost post_request = new HttpPost("https://" + _ip + _apiUri); @@ -1620,7 +1617,7 @@ public class PaloAltoResource implements ServerResource { XPath xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = xpath.compile("/response[@status='success']/result/job/text()"); - job_id = (String) expr.evaluate(doc, XPathConstants.STRING); + job_id = (String)expr.evaluate(doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1628,7 +1625,7 @@ public class PaloAltoResource implements ServerResource { boolean finished = false; Map job_params = new HashMap(); job_params.put("type", "op"); - job_params.put("cmd", ""+job_id+""); + job_params.put("cmd", "" + job_id + ""); while (!finished) { String job_status; @@ -1637,7 +1634,7 @@ public class PaloAltoResource implements ServerResource { XPath job_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = job_xpath.compile("/response[@status='success']/result/job/status/text()"); - job_status = (String) expr.evaluate(job_doc, XPathConstants.STRING); + job_status = (String)expr.evaluate(job_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1646,7 +1643,7 @@ public class PaloAltoResource implements ServerResource { String job_result; try { XPathExpression expr = job_xpath.compile("/response[@status='success']/result/job/result/text()"); - job_result = (String) expr.evaluate(job_doc, XPathConstants.STRING); + job_result = (String)expr.evaluate(job_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1654,7 +1651,7 @@ public class PaloAltoResource implements ServerResource { NodeList job_details; try { XPathExpression expr = job_xpath.compile("/response[@status='success']/result/job/details/line"); - job_details = (NodeList) expr.evaluate(job_doc, XPathConstants.NODESET); + job_details = (NodeList)expr.evaluate(job_doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1668,7 +1665,8 @@ public class PaloAltoResource implements ServerResource { } else { try { Thread.sleep(2000); // poll periodically for the status of the async job... - } catch (InterruptedException e) { /* do nothing */ } + } catch (InterruptedException e) { /* do nothing */ + } } } } else { @@ -1693,7 +1691,7 @@ public class PaloAltoResource implements ServerResource { XPath check_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = check_xpath.compile("/response[@status='success']/result/text()"); - pending_changes = (String) expr.evaluate(check_doc, XPathConstants.STRING); + pending_changes = (String)expr.evaluate(check_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1710,7 +1708,7 @@ public class PaloAltoResource implements ServerResource { XPath add_lock_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = add_lock_xpath.compile("/response[@status='success']/result/text()"); - add_lock_status = (String) expr.evaluate(add_lock_doc, XPathConstants.STRING); + add_lock_status = (String)expr.evaluate(add_lock_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1734,7 +1732,7 @@ public class PaloAltoResource implements ServerResource { XPath commit_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = commit_xpath.compile("/response[@status='success']/result/job/id/text()"); - commit_job_id = (String) expr.evaluate(commit_doc, XPathConstants.STRING); + commit_job_id = (String)expr.evaluate(commit_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1749,7 +1747,7 @@ public class PaloAltoResource implements ServerResource { XPath remove_lock_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = remove_lock_xpath.compile("/response[@status='success']/result/text()"); - remove_lock_status = (String) expr.evaluate(remove_lock_doc, XPathConstants.STRING); + remove_lock_status = (String)expr.evaluate(remove_lock_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1776,7 +1774,7 @@ public class PaloAltoResource implements ServerResource { XPath remove_lock_xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = remove_lock_xpath.compile("/response[@status='success']/result/text()"); - remove_lock_status = (String) expr.evaluate(remove_lock_doc, XPathConstants.STRING); + remove_lock_status = (String)expr.evaluate(remove_lock_doc, XPathConstants.STRING); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1801,7 +1799,7 @@ public class PaloAltoResource implements ServerResource { XPath xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = xpath.compile("/response[@status='success']"); - response_body = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + response_body = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1812,14 +1810,14 @@ public class PaloAltoResource implements ServerResource { NodeList error_details; try { XPathExpression expr = xpath.compile("/response/msg/line/line"); - error_details = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + error_details = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } if (error_details.getLength() == 0) { try { XPathExpression expr = xpath.compile("/response/msg/line"); - error_details = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + error_details = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1827,7 +1825,7 @@ public class PaloAltoResource implements ServerResource { if (error_details.getLength() == 0) { try { XPathExpression expr = xpath.compile("/response/result/msg"); - error_details = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + error_details = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } @@ -1848,14 +1846,13 @@ public class PaloAltoResource implements ServerResource { XPath xpath = XPathFactory.newInstance().newXPath(); try { XPathExpression expr = xpath.compile("/response[@status='success']"); - response_body = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); + response_body = (NodeList)expr.evaluate(doc, XPathConstants.NODESET); } catch (XPathExpressionException e) { throw new ExecutionException(e.getCause().getMessage()); } if (response_body.getLength() > 0 && - (!response_body.item(0).getTextContent().equals("") || - (response_body.item(0).hasChildNodes() && response_body.item(0).getFirstChild().hasChildNodes()))) { + (!response_body.item(0).getTextContent().equals("") || (response_body.item(0).hasChildNodes() && response_body.item(0).getFirstChild().hasChildNodes()))) { return true; } else { return false; @@ -1864,12 +1861,12 @@ public class PaloAltoResource implements ServerResource { /* Get the type of interface from the PA device. */ private String getInterfaceType(String interface_name) throws ExecutionException { - String[] types = { InterfaceType.ETHERNET.toString(), InterfaceType.AGGREGATE.toString() }; + String[] types = {InterfaceType.ETHERNET.toString(), InterfaceType.AGGREGATE.toString()}; for (String type : types) { Map params = new HashMap(); params.put("type", "config"); params.put("action", "get"); - params.put("xpath", "/config/devices/entry/network/interface/"+type+"/entry[@name='"+interface_name+"']"); + params.put("xpath", "/config/devices/entry/network/interface/" + type + "/entry[@name='" + interface_name + "']"); String ethernet_response = request(PaloAltoMethod.GET, params); if (validResponse(ethernet_response) && responseNotEmpty(ethernet_response)) { return type; @@ -1883,7 +1880,7 @@ public class PaloAltoResource implements ServerResource { Map params = new HashMap(); params.put("type", "config"); params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/profile-group/entry[@name='"+profile+"']"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/profile-group/entry[@name='" + profile + "']"); String response = request(PaloAltoMethod.GET, params); return (validResponse(response) && responseNotEmpty(response)); } @@ -1893,7 +1890,7 @@ public class PaloAltoResource implements ServerResource { Map params = new HashMap(); params.put("type", "config"); params.put("action", "get"); - params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/log-settings/profiles/entry[@name='"+profile+"']"); + params.put("xpath", "/config/devices/entry/vsys/entry[@name='vsys1']/log-settings/profiles/entry[@name='" + profile + "']"); String response = request(PaloAltoMethod.GET, params); return (validResponse(response) && responseNotEmpty(response)); } @@ -1908,13 +1905,15 @@ public class PaloAltoResource implements ServerResource { PaloAltoMethod method; Map params; - public AbstractPaloAltoCommand() {} + public AbstractPaloAltoCommand() { + } public AbstractPaloAltoCommand(PaloAltoMethod method, Map params) { this.method = method; this.params = params; } + @Override public boolean execute() throws ExecutionException { String response = request(method, params); return validResponse(response); @@ -1928,7 +1927,6 @@ public class PaloAltoResource implements ServerResource { } } - /* * Misc */ @@ -1991,37 +1989,42 @@ public class PaloAltoResource implements ServerResource { transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.transform(xmlInput, xmlOutput); return xmlOutput.getWriter().toString(); - } catch(Throwable t) { + } catch (Throwable t) { return input; } } } //@Override + @Override public void setName(String name) { // TODO Auto-generated method stub } //@Override + @Override public void setConfigParams(Map params) { // TODO Auto-generated method stub } //@Override + @Override public Map getConfigParams() { // TODO Auto-generated method stub return null; } //@Override + @Override public int getRunLevel() { // TODO Auto-generated method stub return 0; } //@Override + @Override public void setRunLevel(int level) { // TODO Auto-generated method stub diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java b/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java index 79c7884ea21..8fdc82d34c5 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java @@ -16,14 +16,17 @@ // under the License. package com.cloud.network.utils; +import java.io.IOException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; + import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.Scheme; @@ -32,8 +35,6 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.impl.client.DefaultHttpClient; -import java.io.*; - public class HttpClientWrapper { public static HttpClient wrapClient(HttpClient base) { @@ -41,12 +42,15 @@ public class HttpClientWrapper { SSLContext ctx = SSLContext.getInstance("TLS"); X509TrustManager tm = new X509TrustManager() { + @Override public void checkClientTrusted(X509Certificate[] xcs, String string) throws CertificateException { } + @Override public void checkServerTrusted(X509Certificate[] xcs, String string) throws CertificateException { } + @Override public X509Certificate[] getAcceptedIssuers() { return null; } @@ -70,7 +74,7 @@ public class HttpClientWrapper { return true; } }; - ctx.init(null, new TrustManager[]{tm}, null); + ctx.init(null, new TrustManager[] {tm}, null); SSLSocketFactory ssf = new SSLSocketFactory(ctx); ssf.setHostnameVerifier(verifier); ClientConnectionManager ccm = base.getConnectionManager(); diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java index 312601cc835..3b70bd61776 100755 --- a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java +++ b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java @@ -16,92 +16,22 @@ // under the License. package com.cloud.network.resource; -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import javax.naming.ConfigurationException; -import javax.xml.parsers.DocumentBuilderFactory; -import com.cloud.agent.IAgentControl; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.Command; -import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer; -import com.cloud.agent.api.ExternalNetworkResourceUsageCommand; -import com.cloud.agent.api.MaintainAnswer; -import com.cloud.agent.api.MaintainCommand; -import com.cloud.agent.api.PingCommand; -import com.cloud.agent.api.ReadyAnswer; -import com.cloud.agent.api.ReadyCommand; -import com.cloud.agent.api.StartupCommand; -import com.cloud.agent.api.StartupExternalFirewallCommand; -import com.cloud.agent.api.routing.IpAssocAnswer; -import com.cloud.agent.api.routing.IpAssocCommand; -import com.cloud.agent.api.routing.NetworkElementCommand; -import com.cloud.agent.api.routing.SetFirewallRulesCommand; -import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; -import com.cloud.agent.api.routing.SetStaticNatRulesCommand; -import com.cloud.agent.api.to.FirewallRuleTO; -import com.cloud.agent.api.to.IpAddressTO; -import com.cloud.agent.api.to.PortForwardingRuleTO; -import com.cloud.agent.api.to.StaticNatRuleTO; -import com.cloud.host.Host; -import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.FirewallRule.TrafficType; -import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.resource.ServerResource; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.exception.ExecutionException; -import com.cloud.utils.net.NetUtils; -import com.cloud.utils.script.Script; - // http client handling -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.BasicResponseHandler; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.NameValuePair; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.protocol.HTTP; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.net.URLDecoder; -import javax.xml.xpath.XPathFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import com.cloud.network.utils.HttpClientWrapper; - // for prettyFormat() -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Source; -import java.io.StringWriter; - public class MockablePaloAltoResource extends PaloAltoResource { private HashMap context; + public void setMockContext(HashMap context) { this.context = context; } /* Fake the calls to the Palo Alto API */ + @Override protected String request(PaloAltoMethod method, Map params) throws ExecutionException { if (method != PaloAltoMethod.GET && method != PaloAltoMethod.POST) { throw new ExecutionException("Invalid http method used to access the Palo Alto API."); @@ -123,7 +53,8 @@ public class MockablePaloAltoResource extends PaloAltoResource { if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']")) { if (context.containsKey("public_using_ethernet") && context.get("public_using_ethernet").equals("true")) { context.put("public_interface_type", "ethernet"); - response = "no20060064unspecifiedunspecified1800nononounspecifiedno3011noEUI-64nono20060064unspecifiedunspecified1800nononounspecifiedno3011noEUI-64no3033autoautoauto"; + response = + "no20060064unspecifiedunspecified1800nononounspecifiedno3011noEUI-64nono20060064unspecifiedunspecified1800nononounspecifiedno3011noEUI-64no3033autoautoauto"; } else { response = ""; } @@ -131,7 +62,16 @@ public class MockablePaloAltoResource extends PaloAltoResource { if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']")) { if (context.containsKey("private_using_ethernet") && context.get("private_using_ethernet").equals("true")) { context.put("private_interface_type", "ethernet"); - response = "no20060064unspecifiedunspecified1800nononounspecifiedno3011noEUI-64noautoautoauto"; + response = + "" + + "no20060064" + + "unspecifiedunspecified1800" + + "nonono" + + "unspecifiedno30" + + "11noEUI-64" + + "no" + + "autoautoauto"; } else { response = ""; } @@ -140,39 +80,56 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get management profile | has_management_profile if (params.get("xpath").equals("/config/devices/entry/network/profiles/interface-management-profile/entry[@name='Ping']")) { if (context.containsKey("has_management_profile") && context.get("has_management_profile").equals("true")) { - response = "yes"; + response = + "yes"; } else { response = ""; } } // get public interface IP | has_public_interface - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.102/32']")) { + if (params.get("xpath").equals( + "/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']" + + "/layer3/units/entry[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.102/32']")) { if (context.containsKey("has_public_interface") && context.get("has_public_interface").equals("true")) { - response = ""; + response = + "" + + ""; } else { response = ""; } } // get private interface | has_private_interface - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { + if (params.get("xpath") + .equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { if (context.containsKey("has_private_interface") && context.get("has_private_interface").equals("true")) { - response = "3954Ping"; + response = + "" + + "3954" + + "Ping"; } else { response = ""; } } // get private interface ip - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']/ip/entry")) { + if (params.get("xpath").equals( + "/config/devices/entry/network/interface/ethernet/entry" + "[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']/ip/entry")) { response = ""; } // get source nat | has_src_nat_rule if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='src_nat.3954']")) { if (context.containsKey("has_src_nat_rule") && context.get("has_src_nat_rule").equals("true")) { - response = "untrusttrust10.5.80.1/20anyanyipv4ethernet1/1.9999192.168.80.102/32ethernet1/1.9999"; + response = + "" + + "" + + "untrusttrust" + + "10.5.80.1/20anyany" + + "ipv4ethernet1/1.9999" + + "192.168.80.102/32ethernet1/1.9999" + + ""; } else { response = ""; } @@ -181,7 +138,13 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get isolation firewall rule | has_isolation_fw_rule if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='isolate_3954']")) { if (context.containsKey("has_isolation_fw_rule") && context.get("has_isolation_fw_rule").equals("true")) { - response = "trusttrust10.5.80.0/2010.5.80.1anyanydenynoyes"; + response = + "" + + "" + + "trusttrust" + + "10.5.80.0/2010.5.80.1any" + + "anydenynoyes" + + ""; } else { response = ""; } @@ -190,7 +153,9 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get service | has_service if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/service/entry[@name='cs_tcp_80']")) { if (context.containsKey("has_service_tcp_80") && context.get("has_service_tcp_80").equals("true")) { - response = "80"; + response = + "" + + "80"; } else { response = ""; } @@ -199,7 +164,12 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get egress firewall rule | has_egress_fw_rule | policy_0 if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='policy_0']")) { if (context.containsKey("has_egress_fw_rule") && context.get("has_egress_fw_rule").equals("true")) { - response = "trustuntrust10.3.96.1/20anyanycs_tcp_80allownono"; + response = + "" + + "" + + "trustuntrust10.3.96.1/20" + + "anyanycs_tcp_80" + + "allownono"; } else { response = ""; } @@ -208,7 +178,13 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get ingress firewall rule | has_ingress_fw_rule | policy_8 if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/security/rules/entry[@name='policy_8']")) { if (context.containsKey("has_ingress_fw_rule") && context.get("has_ingress_fw_rule").equals("true")) { - response = "untrusttrustany192.168.80.103anycs_tcp_80allownono"; + response = + "" + + "" + + "untrusttrustany" + + "192.168.80.103any" + + "cs_tcp_80allownono" + + ""; } else { response = ""; } @@ -217,7 +193,13 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get destination nat rule (port forwarding) | has_dst_nat_rule if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='dst_nat.192-168-80-103_9']")) { if (context.containsKey("has_dst_nat_rule") && context.get("has_dst_nat_rule").equals("true")) { - response = "untrustuntrustany192.168.80.103cs_tcp_80ipv4ethernet1/1.999910.3.97.1588080"; + response = + "" + + "" + + "untrustuntrustany" + + "192.168.80.103cs_tcp_80ipv4" + + "ethernet1/1.999910.3.97.158" + + "8080"; } else { response = ""; } @@ -226,7 +208,13 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get destination nat rules (returns all dst nat rules per ip) if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[destination/member[text()='192.168.80.103']]")) { if (context.containsKey("has_dst_nat_rule") && context.get("has_dst_nat_rule").equals("true")) { - response = "untrustuntrustany192.168.80.103cs_tcp_80ipv4ethernet1/1.999910.3.97.1588080"; + response = + "" + + "" + + "untrustuntrustany" + + "192.168.80.103cs_tcp_80ipv4" + + "ethernet1/1.999910.3.97.158" + + "8080"; } else { response = ""; } @@ -235,7 +223,13 @@ public class MockablePaloAltoResource extends PaloAltoResource { // get static nat rule | has_stc_nat_rule if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/rulebase/nat/rules/entry[@name='stc_nat.192-168-80-103_0']")) { if (context.containsKey("has_stc_nat_rule") && context.get("has_stc_nat_rule").equals("true")) { - response = "untrustuntrustany192.168.80.103anyipv4ethernet1/1.999910.3.97.158"; + response = + "" + + "" + + "untrustuntrustany" + + "192.168.80.103anyipv4" + + "ethernet1/1.999910.3.97.158" + + ""; } else { response = ""; } @@ -252,13 +246,15 @@ public class MockablePaloAltoResource extends PaloAltoResource { } // add private interface - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { + if (params.get("xpath") + .equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { response = "command succeeded"; context.put("has_private_interface", "true"); } // add public ip to public interface - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry[@name='ethernet1/1.9999']/ip")) { + if (params.get("xpath").equals( + "/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry[@name='ethernet1/1.9999']/ip")) { response = "command succeeded"; context.put("has_public_interface", "true"); } @@ -353,7 +349,9 @@ public class MockablePaloAltoResource extends PaloAltoResource { } // remove public ip from interface (dst_nat | stc_nat) - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.103/32']")) { + if (params.get("xpath").equals( + "/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry" + + "[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.103/32']")) { response = "command succeeded"; } @@ -370,13 +368,16 @@ public class MockablePaloAltoResource extends PaloAltoResource { } // remove public source nat ip - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.102/32']")) { + if (params.get("xpath").equals( + "/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/1']/layer3/units/entry" + + "[@name='ethernet1/1.9999']/ip/entry[@name='192.168.80.102/32']")) { response = "command succeeded"; context.remove("has_public_interface"); } // remove private interface from the zone - if (params.get("xpath").equals("/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='trust']/network/layer3/member[text()='ethernet1/2.3954']")) { + if (params.get("xpath").equals( + "/config/devices/entry/vsys/entry[@name='vsys1']/zone/entry[@name='trust']/network/layer3/member[text()='ethernet1/2.3954']")) { response = "command succeeded"; } @@ -391,7 +392,8 @@ public class MockablePaloAltoResource extends PaloAltoResource { } // remove private interface - if (params.get("xpath").equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { + if (params.get("xpath") + .equals("/config/devices/entry/network/interface/ethernet/entry[@name='ethernet1/2']/layer3/units/entry[@name='ethernet1/2.3954']")) { response = "command succeeded"; context.remove("has_private_interface"); } @@ -412,15 +414,23 @@ public class MockablePaloAltoResource extends PaloAltoResource { // add a config lock if (params.get("cmd").equals("")) { - response = "Successfully acquired lock. Other administrators will not be able to modify configuration for scope shared until lock is released"; + response = + "Successfully acquired lock. Other administrators will not be able to modify configuration " + + "for scope shared until lock is released"; } // check job status if (params.get("cmd").equals("1")) { if (context.containsKey("simulate_commit_failure") && context.get("simulate_commit_failure").equals("true")) { - response = "2013/07/10 11:11:491adminCommitFINnoFAIL11:11:5411:11:54
Bad configCommit failed
"; + response = + "2013/07/10 11:11:491adminCommit" + + "FINnoFAIL11:11:5411:11:54
" + + "Bad configCommit failed
"; } else { - response = "2013/07/02 14:49:491adminCommitFINnoOK14:50:0214:50:02
Configuration committed successfully
"; + response = + "2013/07/02 14:49:491admin" + + "CommitFINnoOK14:50:0214:50:02" + + "
Configuration committed successfully
"; } } @@ -443,16 +453,15 @@ public class MockablePaloAltoResource extends PaloAltoResource { } } // end 'commit' - // print out the details into the console if (context.containsKey("enable_console_output") && context.get("enable_console_output") == "true") { if (params.containsKey("xpath")) { - System.out.println("XPATH("+params.get("action")+"): "+params.get("xpath")); + System.out.println("XPATH(" + params.get("action") + "): " + params.get("xpath")); } if (params.containsKey("type") && params.get("type").equals("op")) { - System.out.println("OP CMD: "+params.get("cmd")); + System.out.println("OP CMD: " + params.get("cmd")); } - System.out.println(response+"\n"); + System.out.println(response + "\n"); } return response; diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java index 6eb07bf6093..4ef8ecc338d 100755 --- a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java +++ b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java @@ -17,42 +17,20 @@ package com.cloud.network.resource; // test imports -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertTrue; -import java.util.Collections; - -// basic imports -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import javax.naming.ConfigurationException; -import javax.xml.parsers.DocumentBuilderFactory; -import com.cloud.agent.IAgentControl; +import javax.naming.ConfigurationException; + +import org.junit.Before; +import org.junit.Test; + import com.cloud.agent.api.Answer; -import com.cloud.agent.api.Command; -import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer; -import com.cloud.agent.api.ExternalNetworkResourceUsageCommand; -import com.cloud.agent.api.MaintainAnswer; -import com.cloud.agent.api.MaintainCommand; -import com.cloud.agent.api.PingCommand; -import com.cloud.agent.api.ReadyAnswer; -import com.cloud.agent.api.ReadyCommand; import com.cloud.agent.api.StartupCommand; -import com.cloud.agent.api.StartupExternalFirewallCommand; import com.cloud.agent.api.routing.IpAssocAnswer; import com.cloud.agent.api.routing.IpAssocCommand; import com.cloud.agent.api.routing.NetworkElementCommand; @@ -63,47 +41,14 @@ import com.cloud.agent.api.to.FirewallRuleTO; import com.cloud.agent.api.to.IpAddressTO; import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.agent.api.to.StaticNatRuleTO; -import com.cloud.host.Host; -import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.FirewallRule.TrafficType; import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.FirewallRule.State; -import com.cloud.resource.ServerResource; -import com.cloud.utils.NumbersUtil; +import com.cloud.network.rules.FirewallRuleVO; import com.cloud.utils.exception.ExecutionException; -import com.cloud.utils.net.NetUtils; -import com.cloud.utils.script.Script; - +// basic imports // http client handling -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.BasicResponseHandler; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.NameValuePair; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.protocol.HTTP; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.net.URLDecoder; -import javax.xml.xpath.XPathFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import com.cloud.network.utils.HttpClientWrapper; - // for prettyFormat() -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Source; -import java.io.StringWriter; public class PaloAltoResourceTest { // configuration data @@ -157,7 +102,7 @@ public class PaloAltoResourceTest { _resource.setMockContext(_context); } - @Test (expected=ConfigurationException.class) + @Test(expected = ConfigurationException.class) public void resourceConfigureFailure() throws ConfigurationException { _resource.configure("PaloAltoResource", new HashMap()); } @@ -182,7 +127,7 @@ public class PaloAltoResourceTest { _resource.configure("PaloAltoResource", _resource_params); } - @Test (expected=ConfigurationException.class) + @Test(expected = ConfigurationException.class) public void simulateFirewallNotConfigurable() throws ConfigurationException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: simulateFirewallNotConfigurable"); @@ -194,7 +139,7 @@ public class PaloAltoResourceTest { _resource.configure("PaloAltoResource", _resource_params); } - @Test (expected=ConfigurationException.class) + @Test(expected = ConfigurationException.class) public void simulateFirewallCommitFailure() throws ConfigurationException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: simulateFirewallCommitFailure"); @@ -221,8 +166,10 @@ public class PaloAltoResourceTest { assertTrue("TestZone".equals(sc[0].getDataCenter())); } - @Test // implement public & private interfaces, source nat, guest network - public void implementGuestNetwork() throws ConfigurationException, ExecutionException { + @Test + // implement public & private interfaces, source nat, guest network + public + void implementGuestNetwork() throws ConfigurationException, ExecutionException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: implementGuestNetwork"); System.out.println("---------------------------------------------------"); @@ -237,12 +184,14 @@ public class PaloAltoResourceTest { cmd.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR, "10.3.96.1/20"); cmd.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG, "3954"); - IpAssocAnswer answer = (IpAssocAnswer) _resource.executeRequest(cmd); + IpAssocAnswer answer = (IpAssocAnswer)_resource.executeRequest(cmd); assertTrue(answer.getResult()); } - @Test // remove public & private interface details, source nat, guest network - public void shutdownGuestNetwork() throws ConfigurationException, ExecutionException { + @Test + // remove public & private interface details, source nat, guest network + public + void shutdownGuestNetwork() throws ConfigurationException, ExecutionException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: shutdownGuestNetwork"); System.out.println("---------------------------------------------------"); @@ -262,7 +211,7 @@ public class PaloAltoResourceTest { cmd.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR, "10.3.96.1/20"); cmd.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG, "3954"); - IpAssocAnswer answer = (IpAssocAnswer) _resource.executeRequest(cmd); + IpAssocAnswer answer = (IpAssocAnswer)_resource.executeRequest(cmd); assertTrue(answer.getResult()); } @@ -284,9 +233,7 @@ public class PaloAltoResourceTest { List rules = new ArrayList(); List cidrList = new ArrayList(); cidrList.add("0.0.0.0/0"); - FirewallRuleTO active = new FirewallRuleTO(8, - null, "192.168.80.103", "tcp", 80, 80, false, false, - FirewallRule.Purpose.Firewall, cidrList, null, null); + FirewallRuleTO active = new FirewallRuleTO(8, null, "192.168.80.103", "tcp", 80, 80, false, false, FirewallRule.Purpose.Firewall, cidrList, null, null); rules.add(active); SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); @@ -314,9 +261,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - FirewallRuleTO revoked = new FirewallRuleTO(8, - null, "192.168.80.103", "tcp", 80, 80, true, false, - FirewallRule.Purpose.Firewall, null, null, null); + FirewallRuleTO revoked = new FirewallRuleTO(8, null, "192.168.80.103", "tcp", 80, 80, true, false, FirewallRule.Purpose.Firewall, null, null, null); rules.add(revoked); SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); @@ -345,9 +290,7 @@ public class PaloAltoResourceTest { List rules = new ArrayList(); List cidrList = new ArrayList(); cidrList.add("0.0.0.0/0"); - FirewallRuleVO activeVO = new FirewallRuleVO(null, null, 80, 80, "tcp", - 1, 1, 1, Purpose.Firewall, cidrList, null, - null, null, FirewallRule.TrafficType.Egress); + FirewallRuleVO activeVO = new FirewallRuleVO(null, null, 80, 80, "tcp", 1, 1, 1, Purpose.Firewall, cidrList, null, null, null, FirewallRule.TrafficType.Egress); FirewallRuleTO active = new FirewallRuleTO(activeVO, Long.toString(vlanId), null, Purpose.Firewall, FirewallRule.TrafficType.Egress); rules.add(active); @@ -376,8 +319,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - FirewallRuleVO revokedVO = new FirewallRuleVO(null, null, 80, 80, "tcp", - 1, 1, 1, Purpose.Firewall, null, null, null, null, FirewallRule.TrafficType.Egress); + FirewallRuleVO revokedVO = new FirewallRuleVO(null, null, 80, 80, "tcp", 1, 1, 1, Purpose.Firewall, null, null, null, null, FirewallRule.TrafficType.Egress); revokedVO.setState(State.Revoke); FirewallRuleTO revoked = new FirewallRuleTO(revokedVO, Long.toString(vlanId), null, Purpose.Firewall, FirewallRule.TrafficType.Egress); rules.add(revoked); @@ -406,8 +348,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - StaticNatRuleTO active = new StaticNatRuleTO(0, "192.168.80.103", null, - null, "10.3.97.158", null, null, null, false, false); + StaticNatRuleTO active = new StaticNatRuleTO(0, "192.168.80.103", null, null, "10.3.97.158", null, null, null, false, false); rules.add(active); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rules, null); @@ -435,8 +376,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - StaticNatRuleTO revoked = new StaticNatRuleTO(0, "192.168.80.103", null, - null, "10.3.97.158", null, null, null, true, false); + StaticNatRuleTO revoked = new StaticNatRuleTO(0, "192.168.80.103", null, null, "10.3.97.158", null, null, null, true, false); rules.add(revoked); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rules, null); @@ -463,8 +403,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - PortForwardingRuleTO active = new PortForwardingRuleTO(9, "192.168.80.103", 80, - 80, "10.3.97.158", 8080, 8080, "tcp", false, false); + PortForwardingRuleTO active = new PortForwardingRuleTO(9, "192.168.80.103", 80, 80, "10.3.97.158", 8080, 8080, "tcp", false, false); rules.add(active); SetPortForwardingRulesCommand cmd = new SetPortForwardingRulesCommand(rules); @@ -492,8 +431,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - PortForwardingRuleTO revoked = new PortForwardingRuleTO(9, "192.168.80.103", 80, - 80, "10.3.97.158", 8080, 8080, "tcp", true, false); + PortForwardingRuleTO revoked = new PortForwardingRuleTO(9, "192.168.80.103", 80, 80, "10.3.97.158", 8080, 8080, "tcp", true, false); rules.add(revoked); SetPortForwardingRulesCommand cmd = new SetPortForwardingRulesCommand(rules); @@ -504,4 +442,3 @@ public class PaloAltoResourceTest { assertTrue(answer.getResult()); } } - diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java index 80168aea03b..085f873eceb 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java @@ -18,17 +18,17 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.SspResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.element.SspService; -import org.apache.log4j.Logger; - import com.cloud.dc.dao.DataCenterDao; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java index 45de8cf3084..e23f64232d5 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java @@ -18,17 +18,17 @@ package org.apache.cloudstack.api.commands; import javax.inject.Inject; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.api.response.HostResponse; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.network.element.SspService; -import org.apache.log4j.Logger; - import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java index 0ae652b0087..84d26016b62 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; import com.cloud.host.HostVO; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; @EntityReference(value = HostVO.class) public class SspResponse extends BaseResponse { diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java index 11257449291..d088e7fad0a 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java @@ -107,6 +107,7 @@ public class SspUuidDaoImpl extends GenericDaoBase implements S return null; } + @Override public int removeUuid(String uuid) { SearchCriteria cs = uuidfetch.create(); cs.setParameters("uuid", uuid); diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java index 5dbabc64e5e..50bacf30005 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java @@ -30,6 +30,8 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.commands.AddSspCmd; import org.apache.cloudstack.api.commands.DeleteSspCmd; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -41,8 +43,6 @@ import org.apache.cloudstack.network.dao.SspTenantVO; import org.apache.cloudstack.network.dao.SspUuidDao; import org.apache.cloudstack.network.dao.SspUuidVO; -import org.apache.log4j.Logger; - import com.cloud.dc.dao.DataCenterDao; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; @@ -69,15 +69,14 @@ import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.element.ConnectivityProvider; import com.cloud.network.element.NetworkElement; import com.cloud.offering.NetworkOffering; +import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.NicProfile; import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -import com.cloud.resource.ResourceManager; /** * Stratosphere sdn platform network element @@ -308,6 +307,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp return _hostDao.remove(cmd.getHostId()); } + @Override public boolean createNetwork(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) { if (_sspUuidDao.findUuidByNetwork(network) != null) { s_logger.info("Network already has ssp TenantNetwork uuid :" + network.toString()); @@ -344,6 +344,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp } } + @Override public boolean deleteNetwork(Network network) { String tenantNetworkUuid = _sspUuidDao.findUuidByNetwork(network); if (tenantNetworkUuid != null) { @@ -365,6 +366,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp } // we use context.reservationId for dedup of guru & element operations. + @Override public boolean createNicEnv(Network network, NicProfile nic, DeployDestination dest, ReservationContext context) { String tenantNetworkUuid = _sspUuidDao.findUuidByNetwork(network); if (tenantNetworkUuid == null) { @@ -416,6 +418,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp return false; } + @Override public boolean deleteNicEnv(Network network, NicProfile nic, ReservationContext context) { if (context == null) { s_logger.error("ReservationContext was null for " + nic + " " + network); @@ -503,8 +506,8 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * @see org.apache.cloudstack.network.element.NetworkElement#prepare(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { s_logger.trace("prepare"); return createNicEnv(network, nic, dest, context); } @@ -517,7 +520,8 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * @see org.apache.cloudstack.network.element.NetworkElement#release(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.vm.ReservationContext) */ @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { s_logger.trace("release"); return deleteNicEnv(network, nic, context); } @@ -536,7 +540,8 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { s_logger.trace("shutdownProviderInstances"); return true; } diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java index a206b4bc0e1..995c35fa4c3 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java @@ -19,9 +19,10 @@ package org.apache.cloudstack.network.guru; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.network.element.SspElement; import org.apache.cloudstack.network.element.SspManager; -import org.apache.log4j.Logger; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.deploy.DeployDestination; @@ -40,7 +41,6 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.ReservationContextImpl; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** @@ -99,7 +99,8 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr * @see org.apache.cloudstack.network.guru.GuestNetworkGuru#implement(com.cloud.network.Network, com.cloud.offering.NetworkOffering, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { s_logger.trace("implement " + network.toString()); super.implement(network, offering, dest, context); _sspMgr.createNetwork(network, offering, dest, context); diff --git a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java index 119a801d66f..2cff927e287 100644 --- a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java +++ b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java @@ -16,9 +16,13 @@ // under the License. package org.apache.cloudstack.network.element; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.UUID; -import org.apache.cloudstack.network.element.SspClient; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.URI; @@ -27,9 +31,6 @@ import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - public class SspClientTest { HttpClient _client = mock(HttpClient.class); PostMethod _postMethod = mock(PostMethod.class); diff --git a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java index e7f998ed76f..d0aaffada7f 100644 --- a/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java +++ b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java @@ -16,19 +16,23 @@ // under the License. package org.apache.cloudstack.network.element; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Arrays; import java.util.HashMap; +import org.junit.Before; +import org.junit.Test; + import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.dao.SspCredentialDao; import org.apache.cloudstack.network.dao.SspCredentialVO; import org.apache.cloudstack.network.dao.SspTenantDao; import org.apache.cloudstack.network.dao.SspUuidDao; -import org.apache.cloudstack.network.element.SspElement; - -import org.junit.Before; -import org.junit.Test; import com.cloud.dc.dao.DataCenterDao; import com.cloud.host.Host; @@ -45,10 +49,6 @@ import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.resource.ResourceManager; import com.cloud.vm.dao.NicDao; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.*; - public class SspElementTest { SspElement _element = new SspElement(); diff --git a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java index 059680d4f6d..e0450ef0269 100644 --- a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java +++ b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java @@ -18,10 +18,11 @@ package com.cloud.network.guru; import javax.ejb.Local; -import org.apache.cloudstack.context.CallContext; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.context.CallContext; + import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.deploy.DeployDestination; @@ -32,9 +33,9 @@ import com.cloud.event.EventVO; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; -import com.cloud.network.NetworkProfile; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; +import com.cloud.network.NetworkProfile; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; @@ -43,7 +44,6 @@ import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Component @@ -81,11 +81,14 @@ public class VxlanGuestNetworkGuru extends GuestNetworkGuru { return network; } - protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) throws InsufficientVirtualNetworkCapcityException { + @Override + protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) + throws InsufficientVirtualNetworkCapcityException { if (network.getBroadcastUri() == null) { String vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId())); if (vnet == null) { - throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, dcId); + throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, + dcId); } implemented.setBroadcastUri(BroadcastDomainType.Vxlan.toUri(vnet)); allocateVnetComplete(network, implemented, dcId, physicalNetworkId, reservationId, vnet); @@ -102,7 +105,8 @@ public class VxlanGuestNetworkGuru extends GuestNetworkGuru { } @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (network.getState() == State.Implementing) : "Why are we implementing " + network; long dcId = dest.getDataCenter().getId(); @@ -115,8 +119,9 @@ public class VxlanGuestNetworkGuru extends GuestNetworkGuru { physicalNetworkId = _networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); } - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, - network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, + network.getDataCenterId(), physicalNetworkId); allocateVnet(network, implemented, dcId, physicalNetworkId, context.getReservationId()); diff --git a/plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java b/plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java index 58bde4cb18b..3cfb33ffc50 100644 --- a/plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java +++ b/plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java @@ -16,21 +16,31 @@ // under the License. package com.cloud.network.guru; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import java.net.URI; import java.net.URISyntaxException; +import java.util.Arrays; -import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import com.cloud.agent.AgentManager; -import com.cloud.agent.api.Command; import com.cloud.dc.DataCenter; -import com.cloud.dc.DataCenterVO; import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; @@ -38,7 +48,6 @@ import com.cloud.domain.Domain; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; -import com.cloud.network.Network.Service; import com.cloud.network.Network.State; import com.cloud.network.NetworkModel; import com.cloud.network.NetworkProfile; @@ -49,13 +58,10 @@ import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.offering.NetworkOffering; -import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.server.ConfigurationServer; import com.cloud.user.Account; import com.cloud.vm.ReservationContext; -import java.util.Arrays; - public class VxlanGuestNetworkGuruTest { PhysicalNetworkDao physnetdao = mock(PhysicalNetworkDao.class); DataCenterDao dcdao = mock(DataCenterDao.class); @@ -81,7 +87,7 @@ public class VxlanGuestNetworkGuruTest { when(dc.getNetworkType()).thenReturn(NetworkType.Advanced); when(dc.getGuestNetworkCidr()).thenReturn("10.1.1.1/24"); - when(dcdao.findById(anyLong())).thenReturn((DataCenterVO)dc); + when(dcdao.findById(anyLong())).thenReturn(dc); } @Test diff --git a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java index 49437f68f3c..83c23c2a536 100644 --- a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java +++ b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java @@ -21,16 +21,16 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.storage.ScopeType; import com.cloud.storage.StoragePool; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = StoragePoolAllocator.class) diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java index 8298d75f95a..0450a7a0786 100644 --- a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java +++ b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java @@ -18,15 +18,16 @@ */ package org.apache.cloudstack.storage.datastore.driver; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.*; import org.apache.log4j.Logger; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.image.BaseImageStoreDriverImpl; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java index 23de36fb952..51ef3d7d0b1 100644 --- a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java +++ b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageStoreProviderImpl.java @@ -21,8 +21,11 @@ package org.apache.cloudstack.storage.datastore.provider; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -34,7 +37,6 @@ import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; -import org.springframework.stereotype.Component; import com.cloud.storage.ScopeType; import com.cloud.utils.component.ComponentContext; diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java index d9a2b6323fb..b6743aa3994 100644 --- a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java +++ b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java @@ -24,6 +24,8 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -32,8 +34,6 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao; import org.apache.cloudstack.storage.image.BaseImageStoreDriverImpl; import org.apache.cloudstack.storage.image.store.ImageStoreImpl; -import org.apache.log4j.Logger; - import com.cloud.agent.api.to.DataStoreTO; import com.cloud.agent.api.to.S3TO; import com.cloud.configuration.Config; @@ -56,11 +56,11 @@ public class S3ImageStoreDriverImpl extends BaseImageStoreDriverImpl { Map details = _imageStoreDetailsDao.getDetails(imgStore.getId()); return new S3TO(imgStore.getId(), imgStore.getUuid(), details.get(ApiConstants.S3_ACCESS_KEY), details.get(ApiConstants.S3_SECRET_KEY), details.get(ApiConstants.S3_END_POINT), details.get(ApiConstants.S3_BUCKET_NAME), details.get(ApiConstants.S3_HTTPS_FLAG) == null ? false - : Boolean.parseBoolean(details.get(ApiConstants.S3_HTTPS_FLAG)), details.get(ApiConstants.S3_CONNECTION_TIMEOUT) == null ? null - : Integer.valueOf(details.get(ApiConstants.S3_CONNECTION_TIMEOUT)), details.get(ApiConstants.S3_MAX_ERROR_RETRY) == null ? null - : Integer.valueOf(details.get(ApiConstants.S3_MAX_ERROR_RETRY)), details.get(ApiConstants.S3_SOCKET_TIMEOUT) == null ? null - : Integer.valueOf(details.get(ApiConstants.S3_SOCKET_TIMEOUT)), imgStore.getCreated(), _configDao.getValue(Config.S3EnableRRS.toString()) == null ? false - : Boolean.parseBoolean(_configDao.getValue(Config.S3EnableRRS.toString())), getMaxSingleUploadSizeInBytes()); + : Boolean.parseBoolean(details.get(ApiConstants.S3_HTTPS_FLAG)), details.get(ApiConstants.S3_CONNECTION_TIMEOUT) == null ? null + : Integer.valueOf(details.get(ApiConstants.S3_CONNECTION_TIMEOUT)), details.get(ApiConstants.S3_MAX_ERROR_RETRY) == null ? null + : Integer.valueOf(details.get(ApiConstants.S3_MAX_ERROR_RETRY)), details.get(ApiConstants.S3_SOCKET_TIMEOUT) == null ? null + : Integer.valueOf(details.get(ApiConstants.S3_SOCKET_TIMEOUT)), imgStore.getCreated(), _configDao.getValue(Config.S3EnableRRS.toString()) == null ? false + : Boolean.parseBoolean(_configDao.getValue(Config.S3EnableRRS.toString())), getMaxSingleUploadSizeInBytes()); } diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java index 8bcdb44f9c0..fff55a06f04 100644 --- a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java +++ b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java @@ -21,8 +21,11 @@ package org.apache.cloudstack.storage.datastore.provider; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -34,7 +37,6 @@ import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; -import org.springframework.stereotype.Component; import com.cloud.storage.ScopeType; import com.cloud.utils.component.ComponentContext; diff --git a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java b/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java index ebc0690e070..5ffeb9df934 100644 --- a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java +++ b/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java @@ -24,6 +24,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.storage.image.BaseImageStoreDriverImpl; + import com.cloud.agent.api.to.DataStoreTO; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.dao.VMTemplateDao; diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java index 788eebcd145..79bbff7b856 100644 --- a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java +++ b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/provider/SwiftImageStoreProviderImpl.java @@ -21,8 +21,11 @@ package org.apache.cloudstack.storage.datastore.provider; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; @@ -34,7 +37,6 @@ import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; -import org.springframework.stereotype.Component; import com.cloud.storage.ScopeType; import com.cloud.utils.component.ComponentContext; diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java index 4c903093bf2..e41b437689f 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java @@ -24,12 +24,21 @@ import java.util.UUID; import javax.inject.Inject; -import com.cloud.storage.*; -import org.apache.cloudstack.engine.subsystem.api.storage.*; -import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.log4j.Logger; import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.command.CommandResult; @@ -39,6 +48,7 @@ import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.cloudstack.storage.to.TemplateObjectTO; import org.apache.cloudstack.storage.volume.VolumeObject; @@ -52,6 +62,12 @@ import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.configuration.Config; import com.cloud.exception.StorageUnavailableException; import com.cloud.host.dao.HostDao; +import com.cloud.storage.CreateSnapshotPayload; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.ResizeVolumePayload; +import com.cloud.storage.Storage; +import com.cloud.storage.StorageManager; +import com.cloud.storage.StoragePool; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; @@ -288,8 +304,9 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri StoragePool pool = (StoragePool)data.getDataStore(); ResizeVolumePayload resizeParameter = (ResizeVolumePayload)vol.getpayload(); - ResizeVolumeCommand resizeCmd = new ResizeVolumeCommand(vol.getPath(), new StorageFilerTO(pool), vol.getSize(), resizeParameter.newSize, resizeParameter.shrinkOk, - resizeParameter.instanceName); + ResizeVolumeCommand resizeCmd = + new ResizeVolumeCommand(vol.getPath(), new StorageFilerTO(pool), vol.getSize(), resizeParameter.newSize, resizeParameter.shrinkOk, + resizeParameter.instanceName); CreateCmdResult result = new CreateCmdResult(null, null); try { ResizeVolumeAnswer answer = (ResizeVolumeAnswer)storageMgr.sendToPool(pool, resizeParameter.hosts, resizeCmd); diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java index aba514b316c..a8108bddd37 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java @@ -347,10 +347,10 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore protected boolean createStoragePool(long hostId, StoragePool pool) { s_logger.debug("creating pool " + pool.getName() + " on host " + hostId); - if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem && pool.getPoolType() != StoragePoolType.IscsiLUN && - pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS && pool.getPoolType() != StoragePoolType.SharedMountPoint && - pool.getPoolType() != StoragePoolType.PreSetup && pool.getPoolType() != StoragePoolType.OCFS2 && pool.getPoolType() != StoragePoolType.RBD && - pool.getPoolType() != StoragePoolType.CLVM) { + if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem && + pool.getPoolType() != StoragePoolType.IscsiLUN && pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS && + pool.getPoolType() != StoragePoolType.SharedMountPoint && pool.getPoolType() != StoragePoolType.PreSetup && pool.getPoolType() != StoragePoolType.OCFS2 && + pool.getPoolType() != StoragePoolType.RBD && pool.getPoolType() != StoragePoolType.CLVM) { s_logger.warn(" Doesn't support storage pool type " + pool.getPoolType()); return false; } @@ -376,7 +376,8 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore public boolean attachCluster(DataStore store, ClusterScope scope) { PrimaryDataStoreInfo primarystore = (PrimaryDataStoreInfo)store; // Check if there is host up in this cluster - List allHosts = _resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, primarystore.getClusterId(), primarystore.getPodId(), primarystore.getDataCenterId()); + List allHosts = + _resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, primarystore.getClusterId(), primarystore.getPodId(), primarystore.getDataCenterId()); if (allHosts.isEmpty()) { primaryDataStoreDao.expunge(primarystore.getId()); throw new CloudRuntimeException("No host up to associate a storage pool with in cluster " + primarystore.getClusterId()); diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java index 1d760042d8e..5e5a9340486 100644 --- a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java +++ b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.storage.datastore.driver; +import java.util.Map; + import javax.inject.Inject; import org.apache.log4j.Logger; @@ -43,9 +45,6 @@ import com.cloud.agent.api.to.DataTO; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.utils.exception.CloudRuntimeException; -import java.util.HashMap; -import java.util.Map; - public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver { private static final Logger s_logger = Logger.getLogger(SamplePrimaryDataStoreDriverImpl.class); @Inject diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java index 7c9d99c25ba..d85ed0da820 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java @@ -17,13 +17,21 @@ package org.apache.cloudstack.storage.datastore.driver; import java.text.NumberFormat; -import java.util.HashMap; import java.util.List; import java.util.Map; import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.*; +import org.apache.commons.lang.StringUtils; + +import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; @@ -31,7 +39,6 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.util.SolidFireUtil; -import org.apache.commons.lang.StringUtils; import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DataObjectType; @@ -288,8 +295,9 @@ public class SolidfirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { volumeSize += volumeSize * (hypervisorSnapshotReserve / 100f); } - long sfVolumeId = SolidFireUtil.createSolidFireVolume(mVip, mPort, clusterAdminUsername, clusterAdminPassword, getSolidFireVolumeName(volumeInfo.getName()), sfAccountId, - volumeSize, true, NumberFormat.getNumberInstance().format(volumeInfo.getSize().toString()), iops.getMinIops(), iops.getMaxIops(), iops.getBurstIops()); + long sfVolumeId = + SolidFireUtil.createSolidFireVolume(mVip, mPort, clusterAdminUsername, clusterAdminPassword, getSolidFireVolumeName(volumeInfo.getName()), sfAccountId, + volumeSize, true, NumberFormat.getNumberInstance().format(volumeInfo.getSize().toString()), iops.getMinIops(), iops.getMaxIops(), iops.getBurstIops()); return SolidFireUtil.getSolidFireVolume(mVip, mPort, clusterAdminUsername, clusterAdminPassword, sfVolumeId); } @@ -465,7 +473,8 @@ public class SolidfirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { String clusterAdminUsername = sfConnection.getClusterAdminUsername(); String clusterAdminPassword = sfConnection.getClusterAdminPassword(); - List sfVolumes = SolidFireUtil.getSolidFireVolumesForAccountId(mVip, mPort, clusterAdminUsername, clusterAdminPassword, sfAccountId); + List sfVolumes = + SolidFireUtil.getSolidFireVolumesForAccountId(mVip, mPort, clusterAdminUsername, clusterAdminPassword, sfAccountId); if (sfVolumes != null) { for (SolidFireUtil.SolidFireVolume sfVolume : sfVolumes) { diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java index 384ce9297a4..d085ddc00a0 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java @@ -160,7 +160,7 @@ public class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC if (lClusterDefaultMinIops > lClusterDefaultMaxIops) { throw new CloudRuntimeException("The parameter '" + SolidFireUtil.CLUSTER_DEFAULT_MIN_IOPS + "' must be less than " + "or equal to the parameter '" + - SolidFireUtil.CLUSTER_DEFAULT_MAX_IOPS + "'."); + SolidFireUtil.CLUSTER_DEFAULT_MAX_IOPS + "'."); } if (Float.compare(fClusterDefaultBurstIopsPercentOfMaxIops, 1.0f) < 0) { diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java index 48916a3cf93..53143141778 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidFireHostListener.java @@ -20,9 +20,10 @@ package org.apache.cloudstack.storage.datastore.provider; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -83,8 +84,8 @@ public class SolidFireHostListener implements HypervisorHostListener { _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, storagePool.getDataCenterId(), storagePool.getPodId(), msg, msg); - throw new CloudRuntimeException("Unable to establish a connection from agent to storage pool " + storagePool.getId() + " due to " + answer.getDetails() + " (" + - storagePool.getId() + ")"); + throw new CloudRuntimeException("Unable to establish a connection from agent to storage pool " + storagePool.getId() + " due to " + answer.getDetails() + + " (" + storagePool.getId() + ")"); } assert (answer instanceof ModifyStoragePoolAnswer) : "ModifyStoragePoolAnswer expected ; Pool = " + storagePool.getId() + " Host = " + hostId; diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java index 3bb33aa38f6..20def091ff9 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java @@ -18,9 +18,11 @@ */ package org.apache.cloudstack.storage.datastore.provider; +import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.HashSet; + +import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener; @@ -29,7 +31,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvid import org.apache.cloudstack.storage.datastore.driver.SolidfirePrimaryDataStoreDriver; import org.apache.cloudstack.storage.datastore.lifecycle.SolidFirePrimaryDataStoreLifeCycle; import org.apache.cloudstack.storage.datastore.util.SolidFireUtil; -import org.springframework.stereotype.Component; import com.cloud.utils.component.ComponentContext; diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java index a3ee666612a..5f26c97b97c 100644 --- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java +++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java @@ -17,8 +17,8 @@ package org.apache.cloudstack.storage.datastore.util; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; @@ -27,8 +27,8 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.List; import java.util.ArrayList; +import java.util.List; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; @@ -37,8 +37,8 @@ import javax.net.ssl.X509TrustManager; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.methods.HttpPost; import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.methods.HttpPost; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ssl.SSLSocketFactory; @@ -46,10 +46,11 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.BasicClientConnectionManager; -import com.cloud.utils.exception.CloudRuntimeException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.cloud.utils.exception.CloudRuntimeException; + public class SolidFireUtil { public static final String PROVIDER_NAME = "SolidFire"; @@ -76,11 +77,12 @@ public class SolidFireUtil { public static final String USE_MUTUAL_CHAP_FOR_VMWARE = "useMutualChapForVMware"; - public static long createSolidFireVolume(String strSfMvip, int iSfPort, String strSfAdmin, String strSfPassword, String strSfVolumeName, long lSfAccountId, long lTotalSize, - boolean bEnable512e, final String strCloudStackVolumeSize, long lMinIops, long lMaxIops, long lBurstIops) { + public static long createSolidFireVolume(String strSfMvip, int iSfPort, String strSfAdmin, String strSfPassword, String strSfVolumeName, long lSfAccountId, + long lTotalSize, boolean bEnable512e, final String strCloudStackVolumeSize, long lMinIops, long lMaxIops, long lBurstIops) { final Gson gson = new GsonBuilder().create(); - VolumeToCreate volumeToCreate = new VolumeToCreate(strSfVolumeName, lSfAccountId, lTotalSize, bEnable512e, strCloudStackVolumeSize, lMinIops, lMaxIops, lBurstIops); + VolumeToCreate volumeToCreate = + new VolumeToCreate(strSfVolumeName, lSfAccountId, lTotalSize, bEnable512e, strCloudStackVolumeSize, lMinIops, lMaxIops, lBurstIops); String strVolumeToCreateJson = gson.toJson(volumeToCreate); @@ -414,8 +416,8 @@ public class SolidFireUtil { private final VolumeToCreateParamsQoS qos; private final VolumeToCreateParamsAttributes attributes; - private VolumeToCreateParams(final String strVolumeName, final long lAccountId, final long lTotalSize, final boolean bEnable512e, final String strCloudStackVolumeSize, - final long lMinIOPS, final long lMaxIOPS, final long lBurstIOPS) { + private VolumeToCreateParams(final String strVolumeName, final long lAccountId, final long lTotalSize, final boolean bEnable512e, + final String strCloudStackVolumeSize, final long lMinIOPS, final long lMaxIOPS, final long lBurstIOPS) { name = strVolumeName; accountID = lAccountId; totalSize = lTotalSize; @@ -700,12 +702,15 @@ public class SolidFireUtil { try { SSLContext sslContext = SSLContext.getInstance("SSL"); X509TrustManager tm = new X509TrustManager() { + @Override public void checkClientTrusted(X509Certificate[] xcs, String string) throws CertificateException { } + @Override public void checkServerTrusted(X509Certificate[] xcs, String string) throws CertificateException { } + @Override public X509Certificate[] getAcceptedIssuers() { return null; } diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java index a1d683d5c3a..1d7d60550ee 100644 --- a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java +++ b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.storage.test; -import org.apache.cloudstack.storage.image.motion.ImageMotionService; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; +import org.apache.cloudstack.storage.image.motion.ImageMotionService; + import com.cloud.agent.AgentManager; import com.cloud.host.dao.HostDao; diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java index 8e98771feab..db1c3ce2008 100644 --- a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java +++ b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/TestConfiguration.java @@ -16,11 +16,12 @@ // under the License. package org.apache.cloudstack.storage.test; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; + import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDaoImpl; diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java index 04d1de33175..71bc603a1b6 100644 --- a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java @@ -24,8 +24,6 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,9 @@ import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; + import com.cloud.agent.AgentManager; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter.NetworkType; @@ -73,8 +74,9 @@ public class VolumeTest { @Before public void setUp() { // create data center - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); dc = dcDao.persist(dc); dcId = dc.getId(); // create pod diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java index ae4731704a3..100ffe6b70d 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java @@ -23,6 +23,9 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.NamingException; +import org.apache.log4j.Logger; +import org.bouncycastle.util.encoders.Base64; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -34,8 +37,6 @@ import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapUser; -import org.apache.log4j.Logger; -import org.bouncycastle.util.encoders.Base64; import com.cloud.user.Account; import com.cloud.user.AccountService; @@ -94,8 +95,8 @@ public class LdapCreateAccountCmd extends BaseCmd { } UserAccount createCloudstackUserAccount(final LdapUser user) { - return _accountService.createUserAccount(username, generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, accountName, accountType, - domainId, networkDomain, details, accountUUID, userUUID); + return _accountService.createUserAccount(username, generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, accountName, + accountType, domainId, networkDomain, details, accountUUID, userUUID); } @Override diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java index a4bb68fa4a8..b45bce59e1e 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java @@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; @@ -25,7 +27,6 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.LdapConfigurationResponse; import org.apache.cloudstack.ldap.LdapManager; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java index 09f28db86dd..129392ea931 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java @@ -25,19 +25,30 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.cloudstack.api.*; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.bouncycastle.util.encoders.Base64; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.LdapUserResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapUser; import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.bouncycastle.util.encoders.Base64; import com.cloud.domain.Domain; -import com.cloud.exception.*; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.AccountService; import com.cloud.user.DomainService; @@ -66,12 +77,12 @@ public class LdapImportUsersCmd extends BaseListCmd { type = CommandType.UUID, entityType = DomainResponse.class, description = "Specifies the domain to which the ldap users are to be " - + "imported. If no domain is specified, a domain will created using group parameter. If the group is also not specified, a domain name based on the OU information will be " - + "created. If no OU hierarchy exists, will be defaulted to ROOT domain") + + "imported. If no domain is specified, a domain will created using group parameter. If the group is also not specified, a domain name based on the OU information will be " + + "created. If no OU hierarchy exists, will be defaulted to ROOT domain") private Long domainId; @Parameter(name = ApiConstants.GROUP, type = CommandType.STRING, description = "Specifies the group name from which the ldap users are to be imported. " - + "If no group is specified, all the users will be imported.") + + "If no group is specified, all the users will be imported.") private String groupName; private Domain _domain; @@ -91,8 +102,8 @@ public class LdapImportUsersCmd extends BaseListCmd { } @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { List users; try { @@ -110,8 +121,8 @@ public class LdapImportUsersCmd extends BaseListCmd { for (LdapUser user : users) { Domain domain = getDomain(user); try { - _accountService.createUserAccount(user.getUsername(), generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, user.getUsername(), - accountType, domain.getId(), domain.getNetworkDomain(), details, UUID.randomUUID().toString(), UUID.randomUUID().toString()); + _accountService.createUserAccount(user.getUsername(), generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, + user.getUsername(), accountType, domain.getId(), domain.getNetworkDomain(), details, UUID.randomUUID().toString(), UUID.randomUUID().toString()); addedUsers.add(user); } catch (InvalidParameterValueException ex) { s_logger.error("Failed to create user with username: " + user.getUsername() + " ::: " + ex.getMessage()); diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java index b2935756679..b50970f05f1 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; @@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.LdapConfigurationResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.ldap.LdapConfigurationVO; import org.apache.cloudstack.ldap.LdapManager; -import org.apache.log4j.Logger; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java index 9ed7919cf7c..5c65ac4a2b6 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; @@ -33,7 +35,6 @@ import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapUser; import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException; import org.apache.cloudstack.query.QueryService; -import org.apache.log4j.Logger; import com.cloud.user.Account; @@ -48,7 +49,10 @@ public class LdapListUsersCmd extends BaseListCmd { @Inject private QueryService _queryService; - @Parameter(name = "listtype", type = CommandType.STRING, required = false, description = "Determines whether all ldap users are returned or just non-cloudstack users") + @Parameter(name = "listtype", + type = CommandType.STRING, + required = false, + description = "Determines whether all ldap users are returned or just non-cloudstack users") private String listType; public LdapListUsersCmd() { diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java index 358db449b2f..e2b050d3d2a 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapUser; import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException; -import org.apache.log4j.Logger; import com.cloud.user.Account; diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java index 312e52b4cb0..a4e47828844 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapConfigurationResponse.java @@ -16,10 +16,11 @@ // under the License. package org.apache.cloudstack.api.response; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class LdapConfigurationResponse extends BaseResponse { @SerializedName("hostname") diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java index e91524af3fe..5648a55cb48 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/response/LdapUserResponse.java @@ -16,10 +16,12 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; +import com.cloud.serializer.Param; + public class LdapUserResponse extends BaseResponse { @SerializedName("email") @Param(description = "The user's email") diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java index 735387a3774..7b7eb8ec86e 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java @@ -22,8 +22,8 @@ import javax.inject.Inject; import javax.naming.directory.SearchControls; import org.apache.cloudstack.api.command.LdapListConfigurationCmd; - import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.utils.Pair; public class LdapConfiguration { diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java index 9768a773230..4f6bb618c26 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java @@ -53,7 +53,8 @@ public class LdapContextFactory { return createInitialDirContext(principal, password, null, isSystemContext); } - private DirContext createInitialDirContext(final String principal, final String password, final String providerUrl, final boolean isSystemContext) throws NamingException { + private DirContext createInitialDirContext(final String principal, final String password, final String providerUrl, final boolean isSystemContext) + throws NamingException { return new InitialDirContext(getEnvironment(principal, password, providerUrl, isSystemContext)); } diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java index 88af432b32c..f41bd3a8b7e 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapManagerImpl.java @@ -24,13 +24,20 @@ import javax.inject.Inject; import javax.naming.NamingException; import javax.naming.directory.DirContext; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.LdapValidator; -import org.apache.cloudstack.api.command.*; +import org.apache.cloudstack.api.command.LdapAddConfigurationCmd; +import org.apache.cloudstack.api.command.LdapCreateAccountCmd; +import org.apache.cloudstack.api.command.LdapDeleteConfigurationCmd; +import org.apache.cloudstack.api.command.LdapImportUsersCmd; +import org.apache.cloudstack.api.command.LdapListConfigurationCmd; +import org.apache.cloudstack.api.command.LdapListUsersCmd; +import org.apache.cloudstack.api.command.LdapUserSearchCmd; import org.apache.cloudstack.api.response.LdapConfigurationResponse; import org.apache.cloudstack.api.response.LdapUserResponse; import org.apache.cloudstack.ldap.dao.LdapConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.exception.InvalidParameterValueException; import com.cloud.utils.Pair; diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java index 341c67d1616..2dacafebb75 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java @@ -23,7 +23,11 @@ import java.util.List; import javax.inject.Inject; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.*; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; public class LdapUserManager { diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java index 1eb497e89b5..0f2a0150eba 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java @@ -20,9 +20,10 @@ import java.util.List; import javax.ejb.Local; -import org.apache.cloudstack.ldap.LdapConfigurationVO; import org.springframework.stereotype.Component; +import org.apache.cloudstack.ldap.LdapConfigurationVO; + import com.cloud.utils.Pair; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java index 8dbe0bb3ac5..f1fe448ffb5 100644 --- a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java +++ b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java @@ -59,6 +59,7 @@ public class MD5UserAuthenticator extends DefaultUserAuthenticator { return true; } + @Override public String encode(String password) { MessageDigest md5 = null; try { diff --git a/pom.xml b/pom.xml index 71d052fe8c2..fb4765dbf9b 100644 --- a/pom.xml +++ b/pom.xml @@ -471,7 +471,7 @@ true ${project.basedir} **\/*.java - **\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat + **\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat diff --git a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java index 098d0703853..7db26684812 100644 --- a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java +++ b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java @@ -19,18 +19,18 @@ package com.cloud.acl; import javax.ejb.Local; import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; -import org.springframework.stereotype.Component; import com.cloud.exception.PermissionDeniedException; import com.cloud.user.Account; import com.cloud.user.AccountManager; -import com.cloud.user.DomainManager; @Component @Local(value = SecurityChecker.class) diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java index b68a57e1e6c..2e43da3b1da 100755 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -19,11 +19,12 @@ package com.cloud.acl; import javax.ejb.Local; import javax.inject.Inject; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.api.BaseCmd; -import org.springframework.stereotype.Component; import com.cloud.dc.DataCenter; import com.cloud.dc.DedicatedResourceVO; @@ -176,7 +177,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { //if account is normal user or domain admin //check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for disk offering) else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN || - account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) { + account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) { if (account.getDomainId() == dof.getDomainId()) { return true; //disk offering and account at exact node } else { @@ -213,7 +214,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { //if account is normal user or domain admin //check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for service offering) else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN || - account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) { + account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) { if (account.getDomainId() == so.getDomainId()) { return true; //service offering and account at exact node } else { diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java index 0d884c8bb57..7150317fa0b 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java @@ -281,7 +281,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator { if (_capacityMgr.checkIfHostReachMaxGuestLimit(host)) { if (s_logger.isDebugEnabled()) { s_logger.debug("Host name: " + host.getName() + ", hostId: " + host.getId() + - " already has max Running VMs(count includes system VMs), skipping this and trying other available hosts"); + " already has max Running VMs(count includes system VMs), skipping this and trying other available hosts"); } continue; } @@ -296,8 +296,9 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator { Float cpuOvercommitRatio = Float.parseFloat(clusterDetailsCpuOvercommit.getValue()); Float memoryOvercommitRatio = Float.parseFloat(clusterDetailsRamOvercommmt.getValue()); - boolean hostHasCapacity = _capacityMgr.checkIfHostHasCapacity(host.getId(), cpu_requested, ram_requested, false, cpuOvercommitRatio, memoryOvercommitRatio, - considerReservedCapacity); + boolean hostHasCapacity = + _capacityMgr.checkIfHostHasCapacity(host.getId(), cpu_requested, ram_requested, false, cpuOvercommitRatio, memoryOvercommitRatio, + considerReservedCapacity); if (numCpusGood && cpuFreqGood && hostHasCapacity) { if (s_logger.isDebugEnabled()) { @@ -306,7 +307,8 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator { suitableHosts.add(host); } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Not using host " + host.getId() + "; numCpusGood: " + numCpusGood + "; cpuFreqGood: " + cpuFreqGood + ", host has capacity?" + hostHasCapacity); + s_logger.debug("Not using host " + host.getId() + "; numCpusGood: " + numCpusGood + "; cpuFreqGood: " + cpuFreqGood + ", host has capacity?" + + hostHasCapacity); } avoid.addHost(host.getId()); } diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java index 74e57bd2342..78a9149afce 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java @@ -18,7 +18,9 @@ package com.cloud.agent.manager.allocator.impl; import java.util.ArrayList; import java.util.List; + import javax.ejb.Local; + import org.apache.log4j.NDC; import com.cloud.agent.manager.allocator.HostAllocator; @@ -26,7 +28,6 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.host.Host; import com.cloud.host.Host.Type; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = {HostAllocator.class}) diff --git a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java index fbc76daab12..161c9658be0 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java @@ -27,17 +27,17 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.agent.AgentManager; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; + import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; +import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.HostPodVO; import com.cloud.dc.PodCluster; -import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; @@ -128,7 +128,7 @@ public class RecreateHostAllocator extends FirstFitRoutingAllocator { if (p.getPod().getAllocationState() != Grouping.AllocationState.Enabled) { if (s_logger.isDebugEnabled()) { s_logger.debug("Pod name: " + p.getPod().getName() + ", podId: " + p.getPod().getId() + " is in " + p.getPod().getAllocationState().name() + - " state, skipping this and trying other pods"); + " state, skipping this and trying other pods"); } continue; } @@ -136,7 +136,7 @@ public class RecreateHostAllocator extends FirstFitRoutingAllocator { if (p.getCluster() != null && p.getCluster().getAllocationState() != Grouping.AllocationState.Enabled) { if (s_logger.isDebugEnabled()) { s_logger.debug("Cluster name: " + p.getCluster().getName() + ", clusterId: " + clusterId + " is in " + p.getCluster().getAllocationState().name() + - " state, skipping this and trying other pod-clusters"); + " state, skipping this and trying other pod-clusters"); } continue; } diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java index 55746a5c660..b67eccbd2d7 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java @@ -32,6 +32,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import com.cloud.agent.manager.allocator.PodAllocator; +import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.dc.DataCenter; @@ -107,8 +108,8 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat // enough memory for the service offering, plus // some extra padding for xen overhead long[] hostCandiates = new long[1]; - boolean enoughCapacity = dataCenterAndPodHasEnoughCapacity(zoneId, podId, (offering.getRamSize()) * 1024L * 1024L, CapacityVO.CAPACITY_TYPE_MEMORY, - hostCandiates); + boolean enoughCapacity = + dataCenterAndPodHasEnoughCapacity(zoneId, podId, (offering.getRamSize()) * 1024L * 1024L, Capacity.CAPACITY_TYPE_MEMORY, hostCandiates); if (!enoughCapacity) { if (s_logger.isDebugEnabled()) { @@ -118,7 +119,8 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat } // test for enough CPU in the pod - enoughCapacity = dataCenterAndPodHasEnoughCapacity(zoneId, podId, (offering.getCpu() * offering.getSpeed()), CapacityVO.CAPACITY_TYPE_CPU, hostCandiates); + enoughCapacity = + dataCenterAndPodHasEnoughCapacity(zoneId, podId, (offering.getCpu() * offering.getSpeed()), Capacity.CAPACITY_TYPE_CPU, hostCandiates); if (!enoughCapacity) { if (s_logger.isDebugEnabled()) { s_logger.debug("Not enough cpu available in zone/pod to allocate storage for user VM (zone: " + zoneId + ", pod: " + podId + ")"); @@ -170,7 +172,7 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat boolean enoughCapacity = false; if (capacities != null) { for (CapacityVO capacity : capacities) { - if (capacityType == CapacityVO.CAPACITY_TYPE_CPU || capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { + if (capacityType == Capacity.CAPACITY_TYPE_CPU || capacityType == Capacity.CAPACITY_TYPE_MEMORY) { // // for CPU/Memory, we now switch to static allocation // @@ -217,7 +219,7 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat if (millisecondsSinceLastUpdate > secondsToSkipVMs * 1000L) { if (s_logger.isDebugEnabled()) { s_logger.debug("Skip counting " + vm.getState().toString() + " vm " + vm.getInstanceName() + " in capacity allocation as it has been " + - vm.getState().toString().toLowerCase() + " for " + millisecondsSinceLastUpdate / 60000 + " minutes"); + vm.getState().toString().toLowerCase() + " for " + millisecondsSinceLastUpdate / 60000 + " minutes"); } return true; } @@ -236,7 +238,7 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat * @return */ private long calcHostAllocatedCpuMemoryCapacity(long hostId, short capacityType) { - assert (capacityType == CapacityVO.CAPACITY_TYPE_MEMORY || capacityType == CapacityVO.CAPACITY_TYPE_CPU) : "Invalid capacity type passed in calcHostAllocatedCpuCapacity()"; + assert (capacityType == Capacity.CAPACITY_TYPE_MEMORY || capacityType == Capacity.CAPACITY_TYPE_CPU) : "Invalid capacity type passed in calcHostAllocatedCpuCapacity()"; // List vms = _vmInstanceDao.listByLastHostId(hostId); List vms = null; @@ -257,19 +259,19 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat so = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId()); - if (capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { + if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) { usedCapacity += so.getRamSize() * 1024L * 1024L; if (s_logger.isDebugEnabled()) { s_logger.debug("Counting memory capacity used by vm: " + vm.getId() + ", size: " + so.getRamSize() + "MB, host: " + hostId + ", currently counted: " + - usedCapacity + " Bytes"); + usedCapacity + " Bytes"); } - } else if (capacityType == CapacityVO.CAPACITY_TYPE_CPU) { + } else if (capacityType == Capacity.CAPACITY_TYPE_CPU) { usedCapacity += so.getCpu() * so.getSpeed(); if (s_logger.isDebugEnabled()) { s_logger.debug("Counting cpu capacity used by vm: " + vm.getId() + ", cpu: " + so.getCpu() + ", speed: " + so.getSpeed() + ", currently counted: " + - usedCapacity + " Bytes"); + usedCapacity + " Bytes"); } } } diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index eac7fe9a8f9..cdb65e15eed 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Timer; -import java.util.TimerTask; import javax.ejb.Local; import javax.inject.Inject; @@ -239,8 +238,8 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi if (_emailAlert != null) { _emailAlert.sendAlert(alertType, dataCenterId, podId, null, subject, body); } else { - s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null + " // message:: " + - subject); + s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null + + " // message:: " + subject); } } catch (Exception ex) { s_logger.error("Problem sending email alert", ex); @@ -362,11 +361,11 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi // Calculate new Public IP capacity for Virtual Network if (datacenter.getNetworkType() == NetworkType.Advanced) { - createOrUpdateIpCapacity(dcId, null, CapacityVO.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP, datacenter.getAllocationState()); + createOrUpdateIpCapacity(dcId, null, Capacity.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP, datacenter.getAllocationState()); } // Calculate new Public IP capacity for Direct Attached Network - createOrUpdateIpCapacity(dcId, null, CapacityVO.CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP, datacenter.getAllocationState()); + createOrUpdateIpCapacity(dcId, null, Capacity.CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP, datacenter.getAllocationState()); if (datacenter.getNetworkType() == NetworkType.Advanced) { //Calculate VLAN's capacity @@ -385,7 +384,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi long podId = pod.getId(); long dcId = pod.getDataCenterId(); - createOrUpdateIpCapacity(dcId, podId, CapacityVO.CAPACITY_TYPE_PRIVATE_IP, _configMgr.findPodAllocationState(pod)); + createOrUpdateIpCapacity(dcId, podId, Capacity.CAPACITY_TYPE_PRIVATE_IP, _configMgr.findPodAllocationState(pod)); } if (s_logger.isDebugEnabled()) { @@ -438,10 +437,10 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi int totalIPs; int allocatedIPs; capacities = _capacityDao.search(capacitySC, null); - if (capacityType == CapacityVO.CAPACITY_TYPE_PRIVATE_IP) { + if (capacityType == Capacity.CAPACITY_TYPE_PRIVATE_IP) { totalIPs = _privateIPAddressDao.countIPs(podId, dcId, false); allocatedIPs = _privateIPAddressDao.countIPs(podId, dcId, true); - } else if (capacityType == CapacityVO.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP) { + } else if (capacityType == Capacity.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP) { totalIPs = _publicIPAddressDao.countIPsForNetwork(dcId, false, VlanType.VirtualNetwork); allocatedIPs = _publicIPAddressDao.countIPsForNetwork(dcId, true, VlanType.VirtualNetwork); } else { @@ -562,8 +561,8 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi double totalCapacity = capacity.get(0).getTotalCapacity(); double usedCapacity = capacity.get(0).getUsedCapacity() + capacity.get(0).getReservedCapacity(); if (totalCapacity != 0 && usedCapacity / totalCapacity > threshold) { - generateEmailAlert(ApiDBUtils.findZoneById(cluster.getDataCenterId()), ApiDBUtils.findPodById(cluster.getPodId()), cluster, totalCapacity, usedCapacity, - capacityType); + generateEmailAlert(ApiDBUtils.findZoneById(cluster.getDataCenterId()), ApiDBUtils.findPodById(cluster.getPodId()), cluster, totalCapacity, + usedCapacity, capacityType); } } } @@ -599,38 +598,40 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi switch (capacityType) { //Cluster Level - case CapacityVO.CAPACITY_TYPE_MEMORY: + case Capacity.CAPACITY_TYPE_MEMORY: msgSubject = "System Alert: Low Available Memory in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); usedStr = formatBytesToMegabytes(usedCapacity); msgContent = "System memory is low, total: " + totalStr + " MB, used: " + usedStr + " MB (" + pctStr + "%)"; alertType = ALERT_TYPE_MEMORY; break; - case CapacityVO.CAPACITY_TYPE_CPU: + case Capacity.CAPACITY_TYPE_CPU: msgSubject = "System Alert: Low Unallocated CPU in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + dc.getName(); totalStr = _dfWhole.format(totalCapacity); usedStr = _dfWhole.format(usedCapacity); msgContent = "Unallocated CPU is low, total: " + totalStr + " Mhz, used: " + usedStr + " Mhz (" + pctStr + "%)"; alertType = ALERT_TYPE_CPU; break; - case CapacityVO.CAPACITY_TYPE_STORAGE: + case Capacity.CAPACITY_TYPE_STORAGE: msgSubject = "System Alert: Low Available Storage in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); usedStr = formatBytesToMegabytes(usedCapacity); msgContent = "Available storage space is low, total: " + totalStr + " MB, used: " + usedStr + " MB (" + pctStr + "%)"; alertType = ALERT_TYPE_STORAGE; break; - case CapacityVO.CAPACITY_TYPE_STORAGE_ALLOCATED: - msgSubject = "System Alert: Remaining unallocated Storage is low in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + - dc.getName(); + case Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED: + msgSubject = + "System Alert: Remaining unallocated Storage is low in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); usedStr = formatBytesToMegabytes(usedCapacity); msgContent = "Unallocated storage space is low, total: " + totalStr + " MB, allocated: " + usedStr + " MB (" + pctStr + "%)"; alertType = ALERT_TYPE_STORAGE_ALLOCATED; break; - case CapacityVO.CAPACITY_TYPE_LOCAL_STORAGE: - msgSubject = "System Alert: Remaining unallocated Local Storage is low in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + - dc.getName(); + case Capacity.CAPACITY_TYPE_LOCAL_STORAGE: + msgSubject = + "System Alert: Remaining unallocated Local Storage is low in cluster " + cluster.getName() + " pod " + pod.getName() + " of availability zone " + + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); usedStr = formatBytesToMegabytes(usedCapacity); msgContent = "Unallocated storage space is low, total: " + totalStr + " MB, allocated: " + usedStr + " MB (" + pctStr + "%)"; @@ -638,7 +639,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi break; //Pod Level - case CapacityVO.CAPACITY_TYPE_PRIVATE_IP: + case Capacity.CAPACITY_TYPE_PRIVATE_IP: msgSubject = "System Alert: Number of unallocated private IPs is low in pod " + pod.getName() + " of availability zone " + dc.getName(); totalStr = Double.toString(totalCapacity); usedStr = Double.toString(usedCapacity); @@ -647,28 +648,28 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi break; //Zone Level - case CapacityVO.CAPACITY_TYPE_SECONDARY_STORAGE: + case Capacity.CAPACITY_TYPE_SECONDARY_STORAGE: msgSubject = "System Alert: Low Available Secondary Storage in availability zone " + dc.getName(); totalStr = formatBytesToMegabytes(totalCapacity); usedStr = formatBytesToMegabytes(usedCapacity); msgContent = "Available secondary storage space is low, total: " + totalStr + " MB, used: " + usedStr + " MB (" + pctStr + "%)"; alertType = ALERT_TYPE_SECONDARY_STORAGE; break; - case CapacityVO.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP: + case Capacity.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP: msgSubject = "System Alert: Number of unallocated virtual network public IPs is low in availability zone " + dc.getName(); totalStr = Double.toString(totalCapacity); usedStr = Double.toString(usedCapacity); msgContent = "Number of unallocated public IPs is low, total: " + totalStr + ", allocated: " + usedStr + " (" + pctStr + "%)"; alertType = ALERT_TYPE_VIRTUAL_NETWORK_PUBLIC_IP; break; - case CapacityVO.CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP: + case Capacity.CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP: msgSubject = "System Alert: Number of unallocated shared network IPs is low in availability zone " + dc.getName(); totalStr = Double.toString(totalCapacity); usedStr = Double.toString(usedCapacity); msgContent = "Number of unallocated shared network IPs is low, total: " + totalStr + ", allocated: " + usedStr + " (" + pctStr + "%)"; alertType = ALERT_TYPE_DIRECT_ATTACHED_PUBLIC_IP; break; - case CapacityVO.CAPACITY_TYPE_VLAN: + case Capacity.CAPACITY_TYPE_VLAN: msgSubject = "System Alert: Number of unallocated VLANs is low in availability zone " + dc.getName(); totalStr = Double.toString(totalCapacity); usedStr = Double.toString(usedCapacity); @@ -729,8 +730,8 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi private final String _smtpPassword; private final String _emailSender; - public EmailAlert(String[] recipientList, String smtpHost, int smtpPort, boolean smtpUseAuth, final String smtpUsername, final String smtpPassword, String emailSender, - boolean smtpDebug) { + public EmailAlert(String[] recipientList, String smtpHost, int smtpPort, boolean smtpUseAuth, final String smtpUsername, final String smtpPassword, + String emailSender, boolean smtpDebug) { if (recipientList != null) { _recipientList = new InternetAddress[recipientList.length]; for (int i = 0; i < recipientList.length; i++) { @@ -784,12 +785,13 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi // TODO: make sure this handles SSL transport (useAuth is true) and regular public void sendAlert(short alertType, long dataCenterId, Long podId, Long clusterId, String subject, String content) throws MessagingException, UnsupportedEncodingException { - s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null + " // message:: " + - subject); + s_alertsLogger.warn(" alertType:: " + alertType + " // dataCenterId:: " + dataCenterId + " // podId:: " + podId + " // clusterId:: " + null + + " // message:: " + subject); AlertVO alert = null; if ((alertType != AlertManager.ALERT_TYPE_HOST) && (alertType != AlertManager.ALERT_TYPE_USERVM) && (alertType != AlertManager.ALERT_TYPE_DOMAIN_ROUTER) && - (alertType != AlertManager.ALERT_TYPE_CONSOLE_PROXY) && (alertType != AlertManager.ALERT_TYPE_SSVM) && (alertType != AlertManager.ALERT_TYPE_STORAGE_MISC) && - (alertType != AlertManager.ALERT_TYPE_MANAGMENT_NODE) && (alertType != AlertManager.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED)) { + (alertType != AlertManager.ALERT_TYPE_CONSOLE_PROXY) && (alertType != AlertManager.ALERT_TYPE_SSVM) && + (alertType != AlertManager.ALERT_TYPE_STORAGE_MISC) && (alertType != AlertManager.ALERT_TYPE_MANAGMENT_NODE) && + (alertType != AlertManager.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED)) { alert = _alertDao.getLastAlert(alertType, dataCenterId, podId, clusterId); } diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java index 941fe01d5d1..1c04b229ea6 100644 --- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java +++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java @@ -60,85 +60,83 @@ public class ConsoleProxyAlertAdapter extends AdapterBase implements AlertAdapte case ConsoleProxyAlertEventArgs.PROXY_CREATED: if (s_logger.isDebugEnabled()) s_logger.debug("New console proxy created, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + proxy.getPrivateIpAddress()); + ", private IP: " + proxy.getPrivateIpAddress()); break; case ConsoleProxyAlertEventArgs.PROXY_UP: if (s_logger.isDebugEnabled()) s_logger.debug("Console proxy is up, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + proxy.getPrivateIpAddress()); + ", private IP: " + proxy.getPrivateIpAddress()); - _alertMgr.sendAlert( - AlertManager.ALERT_TYPE_CONSOLE_PROXY, - args.getZoneId(), - proxy.getPodIdToDeployIn(), - "Console proxy up in zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + - (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy up (zone " + dc.getName() + ")"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), "Console proxy up in zone: " + dc.getName() + + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy up (zone " + dc.getName() + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_DOWN: if (s_logger.isDebugEnabled()) s_logger.debug("Console proxy is down, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); - _alertMgr.sendAlert( - AlertManager.ALERT_TYPE_CONSOLE_PROXY, - args.getZoneId(), - proxy.getPodIdToDeployIn(), - "Console proxy down in zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + - (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy down (zone " + dc.getName() + ")"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), "Console proxy down in zone: " + dc.getName() + + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy down (zone " + dc.getName() + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_REBOOTED: if (s_logger.isDebugEnabled()) s_logger.debug("Console proxy is rebooted, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), - "Console proxy rebooted in zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + - (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy rebooted (zone " + dc.getName() + ")"); + "Console proxy rebooted in zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy rebooted (zone " + dc.getName() + + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE: if (s_logger.isDebugEnabled()) - s_logger.debug("Console proxy creation failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); + s_logger.debug("Console proxy creation failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + + proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), - "Console proxy creation failure. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + - (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(), + "Console proxy creation failure. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(), "Console proxy creation failure (zone " + dc.getName() + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_START_FAILURE: if (s_logger.isDebugEnabled()) - s_logger.debug("Console proxy startup failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); + s_logger.debug("Console proxy startup failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + + proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), - "Console proxy startup failure. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " + - (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(), + "Console proxy startup failure. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(), "Console proxy startup failure (zone " + dc.getName() + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_FIREWALL_ALERT: if (s_logger.isDebugEnabled()) - s_logger.debug("Console proxy firewall alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); + s_logger.debug("Console proxy firewall alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + + proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress())); - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(), - "Failed to open console proxy firewall port. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy alert (zone " + dc.getName() + ")"); + _alertMgr.sendAlert( + AlertManager.ALERT_TYPE_CONSOLE_PROXY, + args.getZoneId(), + proxy.getPodIdToDeployIn(), + "Failed to open console proxy firewall port. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + + proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), + "Console proxy alert (zone " + dc.getName() + ")"); break; case ConsoleProxyAlertEventArgs.PROXY_STORAGE_ALERT: if (s_logger.isDebugEnabled()) - s_logger.debug("Console proxy storage alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + - ", private IP: " + proxy.getPrivateIpAddress() + ", message: " + args.getMessage()); + s_logger.debug("Console proxy storage alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + + proxy.getPublicIpAddress() + ", private IP: " + proxy.getPrivateIpAddress() + ", message: " + args.getMessage()); - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), proxy.getPodIdToDeployIn(), "Console proxy storage issue. zone: " + dc.getName() + - ", message: " + args.getMessage(), - "Console proxy alert (zone " + dc.getName() + ")"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), proxy.getPodIdToDeployIn(), + "Console proxy storage issue. zone: " + dc.getName() + ", message: " + args.getMessage(), "Console proxy alert (zone " + dc.getName() + ")"); break; } } diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java index 6f23c1abd8f..91744567596 100644 --- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java +++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java @@ -25,9 +25,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.alert.AlertAdapter; -import com.cloud.alert.AlertManager; -import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.storage.secondary.SecStorageVmAlertEventArgs; @@ -63,109 +60,88 @@ public class SecondaryStorageVmAlertAdapter extends AdapterBase implements Alert case SecStorageVmAlertEventArgs.SSVM_CREATED: if (s_logger.isDebugEnabled()) s_logger.debug("New secondary storage vm created, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress()); + secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress()); break; case SecStorageVmAlertEventArgs.SSVM_UP: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm is up, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress()); + secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress()); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm up in zone: " + - dc.getName() + - ", secStorageVm: " + - secStorageVm.getHostName() + - ", public IP: " + - secStorageVm.getPublicIpAddress() + - ", private IP: " + - (secStorageVm.getPrivateIpAddress() == null ? "N/A" - : secStorageVm.getPrivateIpAddress()), - "Secondary Storage Vm up (zone " + dc.getName() + ")"); + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " + + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), "Secondary Storage Vm up (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_DOWN: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm is down, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm down in zone: " + - dc.getName() + - ", secStorageVm: " + - secStorageVm.getHostName() + - ", public IP: " + - secStorageVm.getPublicIpAddress() + - ", private IP: " + - (secStorageVm.getPrivateIpAddress() == null ? "N/A" - : secStorageVm.getPrivateIpAddress()), + _alertMgr.sendAlert( + AlertManager.ALERT_TYPE_SSVM, + args.getZoneId(), + secStorageVm.getPodIdToDeployIn(), + "Secondary Storage Vm down in zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), "Secondary Storage Vm down (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_REBOOTED: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm is rebooted, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm rebooted in zone: " + - dc.getName() + - ", secStorageVm: " + - secStorageVm.getHostName() + - ", public IP: " + - secStorageVm.getPublicIpAddress() + - ", private IP: " + - (secStorageVm.getPrivateIpAddress() == null ? "N/A" - : secStorageVm.getPrivateIpAddress()), + _alertMgr.sendAlert( + AlertManager.ALERT_TYPE_SSVM, + args.getZoneId(), + secStorageVm.getPodIdToDeployIn(), + "Secondary Storage Vm rebooted in zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), "Secondary Storage Vm rebooted (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_CREATE_FAILURE: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm creation failure, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); - _alertMgr.sendAlert( - AlertManager.ALERT_TYPE_SSVM, - args.getZoneId(), - secStorageVm.getPodIdToDeployIn(), - "Secondary Storage Vm creation failure. zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + - ", error details: " + args.getMessage(), "Secondary Storage Vm creation failure (zone " + dc.getName() + ")"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm creation failure. zone: " + + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " + + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + ", error details: " + args.getMessage(), + "Secondary Storage Vm creation failure (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_START_FAILURE: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm startup failure, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); - _alertMgr.sendAlert( - AlertManager.ALERT_TYPE_SSVM, - args.getZoneId(), - secStorageVm.getPodIdToDeployIn(), - "Secondary Storage Vm startup failure. zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + - ", error details: " + args.getMessage(), "Secondary Storage Vm startup failure (zone " + dc.getName() + ")"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm startup failure. zone: " + + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " + + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + ", error details: " + args.getMessage(), + "Secondary Storage Vm startup failure (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_FIREWALL_ALERT: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm firewall alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress())); - _alertMgr.sendAlert( - AlertManager.ALERT_TYPE_SSVM, - args.getZoneId(), - secStorageVm.getPodIdToDeployIn(), + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Failed to open secondary storage vm firewall port. zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), + secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), "Secondary Storage Vm alert (zone " + dc.getName() + ")"); break; case SecStorageVmAlertEventArgs.SSVM_STORAGE_ALERT: if (s_logger.isDebugEnabled()) s_logger.debug("Secondary Storage Vm storage alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + - secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress() + ", message: " + args.getMessage()); + secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress() + ", message: " + args.getMessage()); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), - "Secondary Storage Vm storage issue. zone: " + dc.getName() + ", message: " + args.getMessage(), "Secondary Storage Vm alert (zone " + dc.getName() + ")"); + "Secondary Storage Vm storage issue. zone: " + dc.getName() + ", message: " + args.getMessage(), "Secondary Storage Vm alert (zone " + dc.getName() + + ")"); break; } } diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 1545196a396..097c2aec660 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -1394,8 +1394,8 @@ public class ApiDBUtils { if (template != null) { jobInstanceId = template.getUuid(); } - } else if (jobInstanceType == ApiCommandJobType.VirtualMachine || jobInstanceType == ApiCommandJobType.ConsoleProxy || jobInstanceType == ApiCommandJobType.SystemVm || - jobInstanceType == ApiCommandJobType.DomainRouter) { + } else if (jobInstanceType == ApiCommandJobType.VirtualMachine || jobInstanceType == ApiCommandJobType.ConsoleProxy || + jobInstanceType == ApiCommandJobType.SystemVm || jobInstanceType == ApiCommandJobType.DomainRouter) { VMInstanceVO vm = ApiDBUtils.findVMInstanceById(job.getInstanceId()); if (vm != null) { jobInstanceId = vm.getUuid(); diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index 5fad55dd4e7..225cbdc43b6 100755 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -210,8 +210,8 @@ public class ApiDispatcher { Object paramObj = unpackedParams.get(parameterAnnotation.name()); if (paramObj == null) { if (parameterAnnotation.required()) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + - " due to missing parameter " + parameterAnnotation.name()); + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to missing parameter " + parameterAnnotation.name()); } continue; } @@ -221,20 +221,21 @@ public class ApiDispatcher { setFieldValue(field, cmd, paramObj, parameterAnnotation); } catch (IllegalArgumentException argEx) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to execute API command " + cmd.getCommandName() + " due to invalid value " + paramObj + " for parameter " + parameterAnnotation.name()); + s_logger.debug("Unable to execute API command " + cmd.getCommandName() + " due to invalid value " + paramObj + " for parameter " + + parameterAnnotation.name()); } - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + - " due to invalid value " + paramObj + " for parameter " + parameterAnnotation.name()); + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to invalid value " + paramObj + " for parameter " + + parameterAnnotation.name()); } catch (ParseException parseEx) { if (s_logger.isDebugEnabled()) { s_logger.debug("Invalid date parameter " + paramObj + " passed to command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8)); } throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to parse date " + paramObj + " for command " + - cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + - ", please pass dates in the format mentioned in the api documentation"); + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + ", please pass dates in the format mentioned in the api documentation"); } catch (InvalidParameterValueException invEx) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + - " due to invalid value. " + invEx.getMessage()); + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " + + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to invalid value. " + invEx.getMessage()); } catch (CloudRuntimeException cloudEx) { s_logger.error("CloudRuntimeException", cloudEx); // FIXME: Better error message? This only happens if the API command is not executable, which typically @@ -242,7 +243,7 @@ public class ApiDispatcher { // there was // and IllegalAccessException setting one of the parameters. throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Internal error executing API command " + - cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8)); + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8)); } //check access on the resource this field points to @@ -320,10 +321,12 @@ public class ApiDispatcher { } catch (IllegalArgumentException e) { s_logger.error("Error initializing command " + cmd.getCommandName() + ", field " + field.getName() + " is not accessible."); - throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() + " is not accessible]"); + throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() + + " is not accessible]"); } catch (IllegalAccessException e) { s_logger.error("Error initializing command " + cmd.getCommandName() + ", field " + field.getName() + " is not accessible."); - throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() + " is not accessible]"); + throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() + + " is not accessible]"); } } @@ -384,7 +387,7 @@ public class ApiDispatcher { if (s_logger.isDebugEnabled()) s_logger.debug("Object entity uuid = " + uuid + " does not exist in the database."); throw new InvalidParameterValueException("Invalid parameter " + annotation.name() + " value=" + uuid + - " due to incorrect long value format, or entity does not exist or due to incorrect parameter annotation for the field in api cmd class."); + " due to incorrect long value format, or entity does not exist or due to incorrect parameter annotation for the field in api cmd class."); } return internalId; } @@ -402,8 +405,8 @@ public class ApiDispatcher { // This piece of code is for maintaining backward compatibility // and support both the date formats(Bug 9724) // Do the date messaging for ListEventsCmd only - if (cmdObj instanceof ListEventsCmd || cmdObj instanceof DeleteEventsCmd || cmdObj instanceof ArchiveEventsCmd || cmdObj instanceof ArchiveAlertsCmd || - cmdObj instanceof DeleteAlertsCmd) { + if (cmdObj instanceof ListEventsCmd || cmdObj instanceof DeleteEventsCmd || cmdObj instanceof ArchiveEventsCmd || + cmdObj instanceof ArchiveAlertsCmd || cmdObj instanceof DeleteAlertsCmd) { boolean isObjInNewDateFormat = isObjInNewDateFormat(paramObj.toString()); if (isObjInNewDateFormat) { DateFormat newFormat = BaseCmd.NEW_INPUT_FORMAT; @@ -504,7 +507,8 @@ public class ApiDispatcher { } } catch (IllegalAccessException ex) { s_logger.error("Error initializing command " + cmdObj.getCommandName() + ", field " + field.getName() + " is not accessible."); - throw new CloudRuntimeException("Internal error initializing parameters for command " + cmdObj.getCommandName() + " [field " + field.getName() + " is not accessible]"); + throw new CloudRuntimeException("Internal error initializing parameters for command " + cmdObj.getCommandName() + " [field " + field.getName() + + " is not accessible]"); } } diff --git a/server/src/com/cloud/api/ApiGsonHelper.java b/server/src/com/cloud/api/ApiGsonHelper.java index 6163860f0c8..58f29ceeee7 100644 --- a/server/src/com/cloud/api/ApiGsonHelper.java +++ b/server/src/com/cloud/api/ApiGsonHelper.java @@ -16,11 +16,12 @@ // under the License. package com.cloud.api; -import com.google.gson.GsonBuilder; -import org.apache.cloudstack.api.ResponseObject; - import java.util.Map; +import com.google.gson.GsonBuilder; + +import org.apache.cloudstack.api.ResponseObject; + public class ApiGsonHelper { private static final GsonBuilder s_gBuilder; static { diff --git a/server/src/com/cloud/api/ApiResponseGsonHelper.java b/server/src/com/cloud/api/ApiResponseGsonHelper.java index 6bccf9a12af..3352cc8a91d 100644 --- a/server/src/com/cloud/api/ApiResponseGsonHelper.java +++ b/server/src/com/cloud/api/ApiResponseGsonHelper.java @@ -17,6 +17,7 @@ package com.cloud.api; import com.google.gson.GsonBuilder; + import org.apache.cloudstack.api.ResponseObject; /** diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 758107b0d8d..9cbed82c9c0 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -31,6 +31,8 @@ import java.util.TimeZone; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.affinity.AffinityGroup; @@ -146,7 +148,6 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.usage.Usage; import org.apache.cloudstack.usage.UsageService; import org.apache.cloudstack.usage.UsageTypes; -import org.apache.log4j.Logger; import com.cloud.api.query.ViewResponseHelper; import com.cloud.api.query.vo.AccountJoinVO; @@ -2177,7 +2178,8 @@ public class ApiResponseHelper implements ResponseGenerator { reservation = (NetUtils.long2Ip(startGuestIp) + "-" + NetUtils.long2Ip(startVmIp - 1)); } if (startVmIp > startGuestIp + 1 && endVmIp < endGuestIp - 1) { - reservation = (NetUtils.long2Ip(startGuestIp) + "-" + NetUtils.long2Ip(startVmIp - 1) + " , " + NetUtils.long2Ip(endVmIp + 1) + "-" + NetUtils.long2Ip(endGuestIp)); + reservation = + (NetUtils.long2Ip(startGuestIp) + "-" + NetUtils.long2Ip(startVmIp - 1) + " , " + NetUtils.long2Ip(endVmIp + 1) + "-" + NetUtils.long2Ip(endGuestIp)); } } response.setReservedIpRange(reservation); @@ -3336,7 +3338,7 @@ public class ApiResponseHelper implements ResponseGenerator { usageRecResponse.setNetworkId(network.getUuid()); } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE || - usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) { + usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) { //Device Type usageRecResponse.setType(usageRecord.getType()); //VM Instance Id diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index fd314f27ee6..3eb5382989a 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -51,6 +51,37 @@ import javax.naming.ConfigurationException; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.codec.binary.Base64; +import org.apache.http.ConnectionClosedException; +import org.apache.http.HttpException; +import org.apache.http.HttpRequest; +import org.apache.http.HttpResponse; +import org.apache.http.HttpServerConnection; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.entity.BasicHttpEntity; +import org.apache.http.impl.DefaultHttpResponseFactory; +import org.apache.http.impl.DefaultHttpServerConnection; +import org.apache.http.impl.NoConnectionReuseStrategy; +import org.apache.http.impl.SocketHttpServerConnection; +import org.apache.http.params.BasicHttpParams; +import org.apache.http.params.CoreConnectionPNames; +import org.apache.http.params.CoreProtocolPNames; +import org.apache.http.params.HttpParams; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.BasicHttpProcessor; +import org.apache.http.protocol.HttpContext; +import org.apache.http.protocol.HttpRequestHandler; +import org.apache.http.protocol.HttpRequestHandlerRegistry; +import org.apache.http.protocol.HttpService; +import org.apache.http.protocol.ResponseConnControl; +import org.apache.http.protocol.ResponseContent; +import org.apache.http.protocol.ResponseDate; +import org.apache.http.protocol.ResponseServer; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; @@ -88,36 +119,6 @@ import org.apache.cloudstack.framework.jobs.AsyncJob; import org.apache.cloudstack.framework.jobs.AsyncJobManager; import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.commons.codec.binary.Base64; -import org.apache.http.ConnectionClosedException; -import org.apache.http.HttpException; -import org.apache.http.HttpRequest; -import org.apache.http.HttpResponse; -import org.apache.http.HttpServerConnection; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.entity.BasicHttpEntity; -import org.apache.http.impl.DefaultHttpResponseFactory; -import org.apache.http.impl.DefaultHttpServerConnection; -import org.apache.http.impl.NoConnectionReuseStrategy; -import org.apache.http.impl.SocketHttpServerConnection; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.CoreConnectionPNames; -import org.apache.http.params.CoreProtocolPNames; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.BasicHttpContext; -import org.apache.http.protocol.BasicHttpProcessor; -import org.apache.http.protocol.HttpContext; -import org.apache.http.protocol.HttpRequestHandler; -import org.apache.http.protocol.HttpRequestHandlerRegistry; -import org.apache.http.protocol.HttpService; -import org.apache.http.protocol.ResponseConnControl; -import org.apache.http.protocol.ResponseContent; -import org.apache.http.protocol.ResponseDate; -import org.apache.http.protocol.ResponseServer; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.api.response.ApiResponseSerializer; import com.cloud.configuration.Config; @@ -181,7 +182,8 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer private static final DateFormat _dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); private static Map> _apiNameCmdClassMap = new HashMap>(); - private static ExecutorService _executor = new ThreadPoolExecutor(10, 150, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), new NamedThreadFactory("ApiServer")); + private static ExecutorService _executor = new ThreadPoolExecutor(10, 150, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), new NamedThreadFactory( + "ApiServer")); public ApiServer() { } @@ -353,7 +355,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer String newValue = StringUtils.stripControlCharacters(value[0]); if (!newValue.equals(value[0])) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Received value " + value[0] + " for parameter " + key + - " is invalid, contains illegal ASCII non-printable characters"); + " is invalid, contains illegal ASCII non-printable characters"); } } paramMap.put(key, value[0]); @@ -492,8 +494,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer asyncCmd.setStartEventId(startEventId); // save the scheduled event - Long eventId = ActionEventUtils.onScheduledActionEvent((callerUserId == null) ? User.UID_SYSTEM : callerUserId, asyncCmd.getEntityOwnerId(), asyncCmd.getEventType(), - asyncCmd.getEventDescription(), startEventId); + Long eventId = + ActionEventUtils.onScheduledActionEvent((callerUserId == null) ? User.UID_SYSTEM : callerUserId, asyncCmd.getEntityOwnerId(), asyncCmd.getEventType(), + asyncCmd.getEventDescription(), startEventId); if (startEventId == 0) { // There was no create event before, set current event id as start eventId startEventId = eventId; @@ -503,8 +506,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer params.put("cmdEventType", asyncCmd.getEventType().toString()); Long instanceId = (objectId == null) ? asyncCmd.getInstanceId() : objectId; - AsyncJobVO job = new AsyncJobVO(ctx.getContextId(), callerUserId, caller.getId(), cmdObj.getClass().getName(), ApiGsonHelper.getBuilder().create().toJson(params), - instanceId, asyncCmd.getInstanceType() != null ? asyncCmd.getInstanceType().toString() : null); + AsyncJobVO job = + new AsyncJobVO(ctx.getContextId(), callerUserId, caller.getId(), cmdObj.getClass().getName(), ApiGsonHelper.getBuilder().create().toJson(params), + instanceId, asyncCmd.getInstanceType() != null ? asyncCmd.getInstanceType().toString() : null); job.setDispatcher(_asyncDispatcher.getName()); long jobId = _asyncMgr.submitAsyncJob(job); @@ -531,8 +535,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer if (cmdObj instanceof BaseListCmd && !(cmdObj instanceof ListVMsCmd) && !(cmdObj instanceof ListRoutersCmd) && !(cmdObj instanceof ListSecurityGroupsCmd) && !(cmdObj instanceof ListTagsCmd) && !(cmdObj instanceof ListEventsCmd) && !(cmdObj instanceof ListVMGroupsCmd) && !(cmdObj instanceof ListProjectsCmd) && !(cmdObj instanceof ListProjectAccountsCmd) && !(cmdObj instanceof ListProjectInvitationsCmd) && !(cmdObj instanceof ListHostsCmd) && - !(cmdObj instanceof ListVolumesCmd) && !(cmdObj instanceof ListUsersCmd) && !(cmdObj instanceof ListAccountsCmd) && !(cmdObj instanceof ListStoragePoolsCmd) && - !(cmdObj instanceof ListDiskOfferingsCmd) && !(cmdObj instanceof ListServiceOfferingsCmd) && !(cmdObj instanceof ListZonesByCmd)) { + !(cmdObj instanceof ListVolumesCmd) && !(cmdObj instanceof ListUsersCmd) && !(cmdObj instanceof ListAccountsCmd) && + !(cmdObj instanceof ListStoragePoolsCmd) && !(cmdObj instanceof ListDiskOfferingsCmd) && !(cmdObj instanceof ListServiceOfferingsCmd) && + !(cmdObj instanceof ListZonesByCmd)) { buildAsyncListResponse((BaseListCmd)cmdObj, caller); } @@ -707,7 +712,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer if (user.getState() != Account.State.enabled || !account.getState().equals(Account.State.enabled)) { s_logger.info("disabled or locked user accessing the api, userid = " + user.getId() + "; name = " + user.getUsername() + "; state: " + user.getState() + - "; accountState: " + account.getState()); + "; accountState: " + account.getState()); return false; } @@ -716,7 +721,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer } catch (PermissionDeniedException ex) { s_logger.debug("The given command:" + commandName + " does not exist or it is not available for user"); throw new ServerApiException(ApiErrorCode.UNSUPPORTED_ACTION_ERROR, "The given command:" + commandName + - " does not exist or it is not available for user with id:" + userId); + " does not exist or it is not available for user with id:" + userId); } // verify secret key exists @@ -755,13 +760,13 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer } @Override - public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress, Map requestParameters) - throws CloudAuthenticationException { + public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress, + Map requestParameters) throws CloudAuthenticationException { // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist // we will default to ROOT if (domainId == null) { if (domainPath == null || domainPath.trim().length() == 0) { - domainId = DomainVO.ROOT_DOMAIN; + domainId = Domain.ROOT_DOMAIN; } else { Domain domainObj = _domainMgr.findDomainByPath(domainPath); if (domainObj != null) { diff --git a/server/src/com/cloud/api/ApiServerService.java b/server/src/com/cloud/api/ApiServerService.java index 7a1f0adcdbe..8e078c62d15 100644 --- a/server/src/com/cloud/api/ApiServerService.java +++ b/server/src/com/cloud/api/ApiServerService.java @@ -29,8 +29,8 @@ public interface ApiServerService { public Long fetchDomainId(String domainUUID); - public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress, Map requestParameters) - throws CloudAuthenticationException; + public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress, + Map requestParameters) throws CloudAuthenticationException; public void logoutUser(long userId); diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index 0ebc10c6f2d..6a33c14baaf 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -34,6 +34,7 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.springframework.web.context.support.SpringBeanAutowiringSupport; + import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ServerApiException; @@ -202,8 +203,9 @@ public class ApiServlet extends HttpServlet { } catch (NumberFormatException e) { s_logger.warn("Invalid domain id entered by user"); auditTrailSb.append(" " + HttpServletResponse.SC_UNAUTHORIZED + " " + "Invalid domain id entered, please enter a valid one"); - String serializedResponse = _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, - "Invalid domain id entered, please enter a valid one", params, responseType); + String serializedResponse = + _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid domain id entered, please enter a valid one", params, + responseType); writeResponse(resp, serializedResponse, HttpServletResponse.SC_UNAUTHORIZED, responseType); } } @@ -227,7 +229,7 @@ public class ApiServlet extends HttpServlet { try { _apiServer.loginUser(session, username[0], pwd, domainId, domain, req.getRemoteAddr(), params); auditTrailSb.insert(0, "(userId=" + session.getAttribute("userid") + " accountId=" + ((Account)session.getAttribute("accountobj")).getId() + - " sessionId=" + session.getId() + ")"); + " sessionId=" + session.getId() + ")"); String loginResponse = getLoginSuccessResponse(session, responseType); writeResponse(resp, loginResponse, HttpServletResponse.SC_OK, responseType); return; @@ -239,8 +241,9 @@ public class ApiServlet extends HttpServlet { } auditTrailSb.append(" " + ApiErrorCode.ACCOUNT_ERROR + " " + ex.getMessage() != null ? ex.getMessage() - : "failed to authenticate user, check if username/password are correct"); - String serializedResponse = _apiServer.getSerializedApiError(ApiErrorCode.ACCOUNT_ERROR.getHttpCode(), ex.getMessage() != null ? ex.getMessage() + : "failed to authenticate user, check if username/password are correct"); + String serializedResponse = + _apiServer.getSerializedApiError(ApiErrorCode.ACCOUNT_ERROR.getHttpCode(), ex.getMessage() != null ? ex.getMessage() : "failed to authenticate user, check if username/password are correct", params, responseType); writeResponse(resp, serializedResponse, ApiErrorCode.ACCOUNT_ERROR.getHttpCode(), responseType); return; @@ -268,7 +271,8 @@ public class ApiServlet extends HttpServlet { } catch (IllegalStateException ise) { } auditTrailSb.append(" " + HttpServletResponse.SC_UNAUTHORIZED + " " + "unable to verify user credentials"); - String serializedResponse = _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials", params, responseType); + String serializedResponse = + _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials", params, responseType); writeResponse(resp, serializedResponse, HttpServletResponse.SC_UNAUTHORIZED, responseType); return; } @@ -294,7 +298,8 @@ public class ApiServlet extends HttpServlet { } auditTrailSb.append(" " + HttpServletResponse.SC_UNAUTHORIZED + " " + "unable to verify user credentials"); - String serializedResponse = _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials", params, responseType); + String serializedResponse = + _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials", params, responseType); writeResponse(resp, serializedResponse, HttpServletResponse.SC_UNAUTHORIZED, responseType); return; } @@ -316,8 +321,8 @@ public class ApiServlet extends HttpServlet { * key mechanism updateUserContext(params, session != null ? session.getId() : null); */ - auditTrailSb.insert(0, "(userId=" + CallContext.current().getCallingUserId() + " accountId=" + CallContext.current().getCallingAccount().getId() + " sessionId=" + - (session != null ? session.getId() : null) + ")"); + auditTrailSb.insert(0, "(userId=" + CallContext.current().getCallingUserId() + " accountId=" + CallContext.current().getCallingAccount().getId() + + " sessionId=" + (session != null ? session.getId() : null) + ")"); // Add the HTTP method (GET/POST/PUT/DELETE) as well into the params map. params.put("httpmethod", new String[] {req.getMethod()}); @@ -332,8 +337,9 @@ public class ApiServlet extends HttpServlet { } auditTrailSb.append(" " + HttpServletResponse.SC_UNAUTHORIZED + " " + "unable to verify user credentials and/or request signature"); - String serializedResponse = _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials and/or request signature", - params, responseType); + String serializedResponse = + _apiServer.getSerializedApiError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials and/or request signature", params, + responseType); writeResponse(resp, serializedResponse, HttpServletResponse.SC_UNAUTHORIZED, responseType); } diff --git a/server/src/com/cloud/api/EncodedStringTypeAdapter.java b/server/src/com/cloud/api/EncodedStringTypeAdapter.java index fa151a49efa..cde144830aa 100644 --- a/server/src/com/cloud/api/EncodedStringTypeAdapter.java +++ b/server/src/com/cloud/api/EncodedStringTypeAdapter.java @@ -20,12 +20,13 @@ import java.lang.reflect.Type; import org.apache.log4j.Logger; -import com.cloud.utils.encoding.URLEncoder; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import com.cloud.utils.encoding.URLEncoder; + public class EncodedStringTypeAdapter implements JsonSerializer { public static final Logger s_logger = Logger.getLogger(EncodedStringTypeAdapter.class.getName()); diff --git a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java index 9e5c895e494..a4bc6caa1cd 100644 --- a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java +++ b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java @@ -19,16 +19,17 @@ package com.cloud.api; import java.lang.reflect.Method; import java.lang.reflect.Type; -import org.apache.cloudstack.api.ResponseObject; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.response.ExceptionResponse; -import org.apache.cloudstack.api.response.SuccessResponse; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import org.apache.cloudstack.api.ResponseObject; +import org.apache.cloudstack.api.response.ExceptionResponse; +import org.apache.cloudstack.api.response.SuccessResponse; + public class ResponseObjectTypeAdapter implements JsonSerializer { public static final Logger s_logger = Logger.getLogger(ResponseObjectTypeAdapter.class.getName()); @@ -59,7 +60,7 @@ public class ResponseObjectTypeAdapter implements JsonSerializer } catch (NoSuchMethodException e1) { if (s_logger.isTraceEnabled()) { s_logger.trace("ResponseObject " + o.getClass().getName() + " does not have " + methodName + "() method for property: " + propName + - ", will check is-prefixed method to see if it is boolean property"); + ", will check is-prefixed method to see if it is boolean property"); } } diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java index 8b56432d80a..a91530b3825 100644 --- a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java +++ b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java @@ -394,12 +394,14 @@ public class ApiXmlDocWriter { // Generate request request.add(new Argument("username", "Username", true)); - request.add(new Argument("password", - "Hashed password (Default is MD5). If you wish to use any other hashing algorithm, you would need to write a custom authentication adapter See Docs section.", true)); + request.add(new Argument( + "password", + "Hashed password (Default is MD5). If you wish to use any other hashing algorithm, you would need to write a custom authentication adapter See Docs section.", + true)); request.add(new Argument("domain", "path of the domain that the user belongs to. Example: domain=/com/cloud/internal. If no domain is passed in, the ROOT domain is assumed.", false)); - request.add(new Argument("domainId", "id of the domain that the user belongs to. If both domain and domainId are passed in, \"domainId\" parameter takes precendence", - false)); + request.add(new Argument("domainId", + "id of the domain that the user belongs to. If both domain and domainId are passed in, \"domainId\" parameter takes precendence", false)); apiCommand.setRequest(request); // Generate response diff --git a/server/src/com/cloud/api/doc/Argument.java b/server/src/com/cloud/api/doc/Argument.java index 5e674138fae..1ca5ace27dc 100644 --- a/server/src/com/cloud/api/doc/Argument.java +++ b/server/src/com/cloud/api/doc/Argument.java @@ -89,6 +89,7 @@ public class Argument implements Comparable { this.sinceVersion = sinceVersion; } + @Override public int compareTo(Object anotherAgrument) throws ClassCastException { if (!(anotherAgrument instanceof Argument)) throw new ClassCastException("An Argument object expected."); diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index df4ac87dfa3..bda7b4dcb20 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -359,8 +359,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException { Pair, Integer> result = searchForUsersInternal(cmd); ListResponse response = new ListResponse(); - List userResponses = ViewResponseHelper.createUserResponse(CallContext.current().getCallingAccount().getDomainId(), - result.first().toArray(new UserAccountJoinVO[result.first().size()])); + List userResponses = + ViewResponseHelper.createUserResponse(CallContext.current().getCallingAccount().getDomainId(), + result.first().toArray(new UserAccountJoinVO[result.first().size()])); response.setResponses(userResponses, result.second()); return response; } @@ -483,8 +484,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Integer entryTime = cmd.getEntryTime(); Integer duration = cmd.getDuration(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -590,8 +591,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { String customerName = cmd.getCustomer(); boolean listAll = cmd.listAll(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, listAll, false); Long domainId = domainIdRecursiveListProject.first(); @@ -660,8 +661,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -699,8 +700,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse searchForUserVMs(ListVMsCmd cmd) { Pair, Integer> result = searchForUserVMsInternal(cmd); ListResponse response = new ListResponse(); - List vmResponses = ViewResponseHelper.createUserVmResponse("virtualmachine", cmd.getDetails(), - result.first().toArray(new UserVmJoinVO[result.first().size()])); + List vmResponses = + ViewResponseHelper.createUserVmResponse("virtualmachine", cmd.getDetails(), result.first().toArray(new UserVmJoinVO[result.first().size()])); response.setResponses(vmResponses, result.second()); return response; } @@ -713,8 +714,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Long id = cmd.getId(); Map tags = cmd.getTags(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, listAll, false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -964,7 +965,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { return response; } - private Pair, Integer> searchForSecurityGroupsInternal(ListSecurityGroupsCmd cmd) throws PermissionDeniedException, InvalidParameterValueException { + private Pair, Integer> searchForSecurityGroupsInternal(ListSecurityGroupsCmd cmd) throws PermissionDeniedException, + InvalidParameterValueException { Account caller = CallContext.current().getCallingAccount(); Long instanceId = cmd.getVirtualMachineId(); String securityGroup = cmd.getSecurityGroupName(); @@ -982,8 +984,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { return listSecurityGroupRulesByVM(instanceId.longValue(), cmd.getStartIndex(), cmd.getPageSizeVal()); } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -1065,8 +1067,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { @Override public ListResponse searchForRouters(ListRoutersCmd cmd) { - Pair, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), - cmd.getClusterId(), cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getVersion()); + Pair, Integer> result = + searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getClusterId(), cmd.getHostId(), + cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getVersion()); ListResponse response = new ListResponse(); List routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()])); @@ -1076,8 +1079,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { @Override public ListResponse searchForInternalLbVms(ListInternalLBVMsCmd cmd) { - Pair, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), null, - cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), null); + Pair, Integer> result = + searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), null, cmd.getHostId(), cmd.getKeyword(), + cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), null); ListResponse response = new ListResponse(); List routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()])); @@ -1091,8 +1095,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -1346,8 +1350,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse listProjectInvitations(ListProjectInvitationsCmd cmd) { Pair, Integer> invites = listProjectInvitationsInternal(cmd); ListResponse response = new ListResponse(); - List projectInvitationResponses = ViewResponseHelper.createProjectInvitationResponse(invites.first().toArray( - new ProjectInvitationJoinVO[invites.first().size()])); + List projectInvitationResponses = + ViewResponseHelper.createProjectInvitationResponse(invites.first().toArray(new ProjectInvitationJoinVO[invites.first().size()])); response.setResponses(projectInvitationResponses, invites.second()); return response; @@ -1368,7 +1372,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, true); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -1411,8 +1416,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse listProjectAccounts(ListProjectAccountsCmd cmd) { Pair, Integer> projectAccounts = listProjectAccountsInternal(cmd); ListResponse response = new ListResponse(); - List projectResponses = ViewResponseHelper.createProjectAccountResponse(projectAccounts.first().toArray( - new ProjectAccountJoinVO[projectAccounts.first().size()])); + List projectResponses = + ViewResponseHelper.createProjectAccountResponse(projectAccounts.first().toArray(new ProjectAccountJoinVO[projectAccounts.first().size()])); response.setResponses(projectResponses, projectAccounts.second()); return response; } @@ -1615,8 +1620,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { podId = cmd.getPodId(); } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -1869,8 +1874,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), null, permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -2202,7 +2207,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse searchForDiskOfferings(ListDiskOfferingsCmd cmd) { Pair, Integer> result = searchForDiskOfferingsInternal(cmd); ListResponse response = new ListResponse(); - List offeringResponses = ViewResponseHelper.createDiskOfferingResponse(result.first().toArray(new DiskOfferingJoinVO[result.first().size()])); + List offeringResponses = + ViewResponseHelper.createDiskOfferingResponse(result.first().toArray(new DiskOfferingJoinVO[result.first().size()])); response.setResponses(offeringResponses, result.second()); return response; } @@ -2326,7 +2332,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse searchForServiceOfferings(ListServiceOfferingsCmd cmd) { Pair, Integer> result = searchForServiceOfferingsInternal(cmd); ListResponse response = new ListResponse(); - List offeringResponses = ViewResponseHelper.createServiceOfferingResponse(result.first().toArray(new ServiceOfferingJoinVO[result.first().size()])); + List offeringResponses = + ViewResponseHelper.createServiceOfferingResponse(result.first().toArray(new ServiceOfferingJoinVO[result.first().size()])); response.setResponses(offeringResponses, result.second()); return response; } @@ -2470,7 +2477,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public ListResponse listDataCenters(ListZonesByCmd cmd) { Pair, Integer> result = listDataCentersInternal(cmd); ListResponse response = new ListResponse(); - List dcResponses = ViewResponseHelper.createDataCenterResponse(cmd.getShowCapacities(), result.first().toArray(new DataCenterJoinVO[result.first().size()])); + List dcResponses = + ViewResponseHelper.createDataCenterResponse(cmd.getShowCapacities(), result.first().toArray(new DataCenterJoinVO[result.first().size()])); response.setResponses(dcResponses, result.second()); return response; } @@ -2720,8 +2728,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } List permittedAccountIds = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject, listAll, false); ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); List permittedAccounts = new ArrayList(); @@ -2732,8 +2740,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { boolean showDomr = ((templateFilter != TemplateFilter.selfexecutable) && (templateFilter != TemplateFilter.featured)); HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor()); - return searchForTemplatesInternal(id, cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), - hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria, tags); + return searchForTemplatesInternal(id, cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, cmd.getPageSizeVal(), cmd.getStartIndex(), + cmd.getZoneId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria, tags); } private Pair, Integer> searchForTemplatesInternal(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, @@ -2793,7 +2801,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (!permittedAccounts.isEmpty()) { domain = _domainDao.findById(permittedAccounts.get(0).getDomainId()); } else { - domain = _domainDao.findById(DomainVO.ROOT_DOMAIN); + domain = _domainDao.findById(Domain.ROOT_DOMAIN); } // List hypers = null; @@ -3004,8 +3012,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } List permittedAccountIds = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject, listAll, false); ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); List permittedAccounts = new ArrayList(); @@ -3020,10 +3028,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } @Override - public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, String accountName, - Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize) { - Pair, Integer> result = listAffinityGroupsInternal(affinityGroupId, affinityGroupName, affinityGroupType, vmId, accountName, domainId, - isRecursive, listAll, startIndex, pageSize); + public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, + String accountName, Long domainId, boolean isRecursive, boolean listAll, Long startIndex, Long pageSize) { + Pair, Integer> result = + listAffinityGroupsInternal(affinityGroupId, affinityGroupName, affinityGroupType, vmId, accountName, domainId, isRecursive, listAll, startIndex, pageSize); ListResponse response = new ListResponse(); List agResponses = ViewResponseHelper.createAffinityGroupResponses(result.first()); response.setResponses(agResponses, result.second()); @@ -3047,15 +3055,17 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, affinityGroupId, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, true); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); Filter searchFilter = new Filter(AffinityGroupJoinVO.class, "id", true, startIndex, pageSize); - SearchCriteria sc = buildAffinityGroupSearchCriteria(domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria, affinityGroupId, - affinityGroupName, affinityGroupType); + SearchCriteria sc = + buildAffinityGroupSearchCriteria(domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria, affinityGroupId, affinityGroupName, + affinityGroupType); Pair, Integer> uniqueGroupsPair = _affinityGroupJoinDao.searchAndCount(sc, searchFilter); // search group details by ids @@ -3074,23 +3084,26 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (!permittedAccounts.isEmpty()) { // add domain level affinity groups if (domainId != null) { - SearchCriteria scDomain = buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, - affinityGroupId, affinityGroupName, affinityGroupType); + SearchCriteria scDomain = + buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, affinityGroupId, affinityGroupName, + affinityGroupType); vrs.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, domainId)); } else { for (Long permAcctId : permittedAccounts) { Account permittedAcct = _accountDao.findById(permAcctId); - SearchCriteria scDomain = buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, - affinityGroupId, affinityGroupName, affinityGroupType); + SearchCriteria scDomain = + buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, affinityGroupId, affinityGroupName, + affinityGroupType); vrs.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, permittedAcct.getDomainId())); } } } else if (((permittedAccounts.isEmpty()) && (domainId != null) && isRecursive)) { // list all domain level affinity groups for the domain admin case - SearchCriteria scDomain = buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, - affinityGroupId, affinityGroupName, affinityGroupType); + SearchCriteria scDomain = + buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), listProjectResourcesCriteria, affinityGroupId, affinityGroupName, + affinityGroupType); vrs.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, domainId)); } diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java index 6cbe814e325..5a953dea25b 100644 --- a/server/src/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/com/cloud/api/query/ViewResponseHelper.java @@ -16,27 +16,12 @@ // under the License. package com.cloud.api.query; -import com.cloud.api.ApiDBUtils; -import com.cloud.api.query.vo.AccountJoinVO; -import com.cloud.api.query.vo.AffinityGroupJoinVO; -import com.cloud.api.query.vo.AsyncJobJoinVO; -import com.cloud.api.query.vo.DataCenterJoinVO; -import com.cloud.api.query.vo.DiskOfferingJoinVO; -import com.cloud.api.query.vo.DomainRouterJoinVO; -import com.cloud.api.query.vo.EventJoinVO; -import com.cloud.api.query.vo.HostJoinVO; -import com.cloud.api.query.vo.InstanceGroupJoinVO; -import com.cloud.api.query.vo.ProjectAccountJoinVO; -import com.cloud.api.query.vo.ProjectInvitationJoinVO; -import com.cloud.api.query.vo.ProjectJoinVO; -import com.cloud.api.query.vo.ResourceTagJoinVO; -import com.cloud.api.query.vo.SecurityGroupJoinVO; -import com.cloud.api.query.vo.ServiceOfferingJoinVO; -import com.cloud.api.query.vo.StoragePoolJoinVO; -import com.cloud.api.query.vo.UserAccountJoinVO; -import com.cloud.api.query.vo.UserVmJoinVO; -import com.cloud.api.query.vo.VolumeJoinVO; -import com.cloud.user.Account; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.Hashtable; +import java.util.List; + +import org.apache.log4j.Logger; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.HostDetails; @@ -48,8 +33,8 @@ import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; import org.apache.cloudstack.api.response.ProjectInvitationResponse; import org.apache.cloudstack.api.response.ProjectResponse; @@ -58,22 +43,35 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.cloudstack.api.response.UpgradeRouterTemplateResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - +import com.cloud.api.ApiDBUtils; +import com.cloud.api.query.vo.AccountJoinVO; +import com.cloud.api.query.vo.AffinityGroupJoinVO; +import com.cloud.api.query.vo.AsyncJobJoinVO; +import com.cloud.api.query.vo.DataCenterJoinVO; +import com.cloud.api.query.vo.DiskOfferingJoinVO; +import com.cloud.api.query.vo.DomainRouterJoinVO; +import com.cloud.api.query.vo.EventJoinVO; +import com.cloud.api.query.vo.HostJoinVO; import com.cloud.api.query.vo.ImageStoreJoinVO; +import com.cloud.api.query.vo.InstanceGroupJoinVO; +import com.cloud.api.query.vo.ProjectAccountJoinVO; +import com.cloud.api.query.vo.ProjectInvitationJoinVO; +import com.cloud.api.query.vo.ProjectJoinVO; +import com.cloud.api.query.vo.ResourceTagJoinVO; +import com.cloud.api.query.vo.SecurityGroupJoinVO; +import com.cloud.api.query.vo.ServiceOfferingJoinVO; +import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.api.query.vo.TemplateJoinVO; - -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.Hashtable; -import java.util.List; +import com.cloud.api.query.vo.UserAccountJoinVO; +import com.cloud.api.query.vo.UserVmJoinVO; +import com.cloud.api.query.vo.VolumeJoinVO; +import com.cloud.user.Account; /** * Helper class to generate response from DB view VO objects. diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java index ad0b71dc2b7..5e087fd11fe 100644 --- a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java @@ -20,11 +20,12 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.ResourceLimitAndCountResponse; import org.apache.cloudstack.api.response.UserResponse; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.query.ViewResponseHelper; @@ -198,18 +199,19 @@ public class AccountJoinDaoImpl extends GenericDaoBase impl long primaryStorageLimit = ApiDBUtils.findCorrectResourceLimit(account.getPrimaryStorageLimit(), account.getType(), ResourceType.primary_storage); String primaryStorageLimitDisplay = (accountIsAdmin || primaryStorageLimit == -1) ? "Unlimited" : String.valueOf(primaryStorageLimit / ResourceType.bytesToGiB); long primaryStorageTotal = (account.getPrimaryStorageTotal() == null) ? 0 : (account.getPrimaryStorageTotal() / ResourceType.bytesToGiB); - String primaryStorageAvail = (accountIsAdmin || primaryStorageLimit == -1) ? "Unlimited" : String.valueOf((primaryStorageLimit / ResourceType.bytesToGiB) - - primaryStorageTotal); + String primaryStorageAvail = + (accountIsAdmin || primaryStorageLimit == -1) ? "Unlimited" : String.valueOf((primaryStorageLimit / ResourceType.bytesToGiB) - primaryStorageTotal); response.setPrimaryStorageLimit(primaryStorageLimitDisplay); response.setPrimaryStorageTotal(primaryStorageTotal); response.setPrimaryStorageAvailable(primaryStorageAvail); //get resource limits for secondary storage space and convert it from Bytes to GiB long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimit(account.getSecondaryStorageLimit(), account.getType(), ResourceType.secondary_storage); - String secondaryStorageLimitDisplay = (accountIsAdmin || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB); + String secondaryStorageLimitDisplay = + (accountIsAdmin || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB); long secondaryStorageTotal = (account.getSecondaryStorageTotal() == null) ? 0 : (account.getSecondaryStorageTotal() / ResourceType.bytesToGiB); - String secondaryStorageAvail = (accountIsAdmin || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB) - - secondaryStorageTotal); + String secondaryStorageAvail = + (accountIsAdmin || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB) - secondaryStorageTotal); response.setSecondaryStorageLimit(secondaryStorageLimitDisplay); response.setSecondaryStorageTotal(secondaryStorageTotal); response.setSecondaryStorageAvailable(secondaryStorageAvail); diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java index 32f457a21aa..3156a851acc 100644 --- a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java @@ -20,8 +20,8 @@ import java.util.List; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupResponse; + import com.cloud.api.query.vo.AffinityGroupJoinVO; -import com.cloud.user.Account; import com.cloud.utils.db.GenericDao; public interface AffinityGroupJoinDao extends GenericDao { diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java index b31ed69e6dc..cdd389ca72b 100644 --- a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java @@ -22,12 +22,12 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; - import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.AffinityGroupJoinVO; import com.cloud.utils.db.GenericDaoBase; diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java index ba957cd0b4d..e3331d92519 100644 --- a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java @@ -20,11 +20,12 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.ResourceTagResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; diff --git a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java index 30758d12268..3d8247e3f04 100644 --- a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java +++ b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDao.java @@ -17,6 +17,7 @@ package com.cloud.api.query.dao; import org.apache.cloudstack.api.response.DiskOfferingResponse; + import com.cloud.api.query.vo.DiskOfferingJoinVO; import com.cloud.offering.DiskOffering; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index 0d93dd2ed1b..c1fd4d8e1d9 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -22,18 +22,18 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; -import com.cloud.maint.Version; -import com.cloud.network.VirtualNetworkApplianceService; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.NicResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.DomainRouterJoinVO; +import com.cloud.maint.Version; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.VirtualNetworkApplianceService; import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.Role; import com.cloud.user.Account; diff --git a/server/src/com/cloud/api/query/dao/HostJoinDao.java b/server/src/com/cloud/api/query/dao/HostJoinDao.java index f526ca32615..f0ac1831d45 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDao.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDao.java @@ -20,8 +20,9 @@ import java.util.EnumSet; import java.util.List; import org.apache.cloudstack.api.ApiConstants.HostDetails; -import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.HostForMigrationResponse; +import org.apache.cloudstack.api.response.HostResponse; + import com.cloud.api.query.vo.HostJoinVO; import com.cloud.host.Host; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index 1087e7dd20c..3112702c645 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -27,14 +27,14 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.api.ApiConstants.HostDetails; -import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.HostForMigrationResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.ApiConstants.HostDetails; +import org.apache.cloudstack.api.response.HostForMigrationResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.HostJoinVO; import com.cloud.host.Host; diff --git a/server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java b/server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java index c1f6325c19b..d28b3d33ac8 100644 --- a/server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java +++ b/server/src/com/cloud/api/query/dao/ImageStoreJoinDao.java @@ -19,6 +19,7 @@ package com.cloud.api.query.dao; import java.util.List; import org.apache.cloudstack.api.response.ImageStoreResponse; + import com.cloud.api.query.vo.ImageStoreJoinVO; import com.cloud.storage.ImageStore; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java index 26f9ddbbcef..90c155fc773 100644 --- a/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java @@ -22,13 +22,13 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.ImageStoreDetailResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.query.vo.ImageStoreJoinVO; import com.cloud.storage.ImageStore; import com.cloud.utils.db.GenericDaoBase; diff --git a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java index 3031eba86f4..3a580a46cd2 100644 --- a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java @@ -21,13 +21,12 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.api.response.InstanceGroupResponse; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.InstanceGroupJoinVO; - -import org.apache.cloudstack.api.response.InstanceGroupResponse; -import org.springframework.stereotype.Component; - import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java index 985f3d58694..676a995fdb2 100644 --- a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java @@ -21,9 +21,9 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import org.apache.cloudstack.api.response.ProjectAccountResponse; -import org.springframework.stereotype.Component; import com.cloud.api.query.vo.ProjectAccountJoinVO; import com.cloud.projects.ProjectAccount; diff --git a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java index 2b712e00908..864fcf8ed4f 100644 --- a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java @@ -21,9 +21,9 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import org.apache.cloudstack.api.response.ProjectInvitationResponse; -import org.springframework.stereotype.Component; import com.cloud.api.query.vo.ProjectInvitationJoinVO; import com.cloud.projects.ProjectInvitation; diff --git a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java index d23bd14ca3d..696487792b7 100644 --- a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java @@ -22,12 +22,12 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.AccountJoinVO; import com.cloud.api.query.vo.ProjectJoinVO; diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java index 265d716bcad..27d3787ce0f 100644 --- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java @@ -22,11 +22,12 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.api.response.ResourceTagResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag; diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java index eccffbd6d2c..093709d0c7b 100644 --- a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java @@ -22,13 +22,13 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.ResourceTagJoinVO; diff --git a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java index afa81642126..4f351ebaeaa 100644 --- a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java @@ -20,10 +20,11 @@ import java.util.List; import javax.ejb.Local; -import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; + import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.ServiceOfferingJoinVO; import com.cloud.offering.ServiceOffering; diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java index 7d7d2844c87..55c028044f7 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java @@ -16,12 +16,13 @@ // under the License. package com.cloud.api.query.dao; +import java.util.List; + +import org.apache.cloudstack.api.response.StoragePoolResponse; + import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.storage.StoragePool; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.response.StoragePoolResponse; - -import java.util.List; public interface StoragePoolJoinDao extends GenericDao { diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java index b03634786a7..0a5fb5eb66e 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java @@ -22,12 +22,12 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.api.response.StoragePoolResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.capacity.Capacity; diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 31fedc51a5d..792ac0998d7 100644 --- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -24,6 +24,9 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.context.CallContext; @@ -31,9 +34,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.ResourceTagJoinVO; diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java index 0fff89a2650..42a1b0f1c4a 100644 --- a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java @@ -21,12 +21,11 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; - -import com.cloud.api.query.vo.UserAccountJoinVO; - -import org.apache.cloudstack.api.response.UserResponse; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.response.UserResponse; + +import com.cloud.api.query.vo.UserAccountJoinVO; import com.cloud.user.User; import com.cloud.user.UserAccount; import com.cloud.utils.db.GenericDaoBase; diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index e973bdbd03e..3e218ecad48 100644 --- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@ -28,6 +28,9 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.response.NicResponse; @@ -35,9 +38,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.ResourceTagJoinVO; import com.cloud.api.query.vo.UserVmJoinVO; @@ -175,7 +175,8 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem userVmResponse.setNetworkKbsWrite((long)vmStats.getNetworkWriteKBs()); - if ((userVm.getHypervisorType() != null) && (userVm.getHypervisorType().equals(HypervisorType.KVM) || userVm.getHypervisorType().equals(HypervisorType.XenServer))) { // support KVM and XenServer only util 2013.06.25 + if ((userVm.getHypervisorType() != null) && + (userVm.getHypervisorType().equals(HypervisorType.KVM) || userVm.getHypervisorType().equals(HypervisorType.XenServer))) { // support KVM and XenServer only util 2013.06.25 userVmResponse.setDiskKbsRead((long)vmStats.getDiskReadKBs()); userVmResponse.setDiskKbsWrite((long)vmStats.getDiskWriteKBs()); diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index f085b707d33..36f67409ac6 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -22,13 +22,13 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.ResourceTagJoinVO; diff --git a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java index 014abfaa3c0..d297763d04b 100644 --- a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java +++ b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java @@ -17,7 +17,6 @@ package com.cloud.api.query.vo; import org.apache.cloudstack.acl.ControlledEntity; - import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; diff --git a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java index 73d97405ecb..2260e1e06c3 100644 --- a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java @@ -23,11 +23,11 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.GenericDao; - import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name = "service_offering_view") public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentity, Identity { diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java index 59607c262a3..f288c2fd649 100644 --- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java +++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java @@ -17,6 +17,7 @@ package com.cloud.api.query.vo; import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; @@ -25,11 +26,12 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; + import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.storage.Storage; -import com.cloud.storage.Volume; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; +import com.cloud.storage.Volume; import com.cloud.utils.db.GenericDao; import com.cloud.vm.VirtualMachine; diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java index e12f09356b0..6cdf6c6b45b 100644 --- a/server/src/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -16,26 +16,36 @@ // under the License. package com.cloud.api.response; -import com.cloud.api.ApiDBUtils; -import com.cloud.api.ApiResponseGsonHelper; -import com.cloud.api.ApiServer; -import com.cloud.utils.encoding.URLEncoder; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.exception.ExceptionProxyObject; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.log4j.Logger; + import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ResponseObject; -import org.apache.cloudstack.api.response.*; -import org.apache.log4j.Logger; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.CreateCmdResponse; +import org.apache.cloudstack.api.response.ExceptionResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SuccessResponse; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.cloud.api.ApiDBUtils; +import com.cloud.api.ApiResponseGsonHelper; +import com.cloud.api.ApiServer; +import com.cloud.utils.encoding.URLEncoder; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.exception.ExceptionProxyObject; public class ApiResponseSerializer { private static final Logger s_logger = Logger.getLogger(ApiResponseSerializer.class.getName()); @@ -99,7 +109,7 @@ public class ApiResponseSerializer { } else if (result instanceof SuccessResponse) { sb.append("{ \"success\" : \"").append(((SuccessResponse)result).getSuccess()).append("\"} "); } else if (result instanceof ExceptionResponse) { - String jsonErrorText = gson.toJson((ExceptionResponse)result); + String jsonErrorText = gson.toJson(result); jsonErrorText = unescape(jsonErrorText); sb.append(jsonErrorText); } else { diff --git a/server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java b/server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java index ddde7345e5c..678b4d4fe25 100644 --- a/server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java +++ b/server/src/com/cloud/api/response/EmptyFieldExclusionStrategy.java @@ -19,10 +19,11 @@ package com.cloud.api.response; -import com.cloud.serializer.Param; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; +import com.cloud.serializer.Param; + public class EmptyFieldExclusionStrategy implements ExclusionStrategy { @Override diff --git a/server/src/com/cloud/api/response/SecurityGroupResultObject.java b/server/src/com/cloud/api/response/SecurityGroupResultObject.java index cd3dfa84bbc..96974951abb 100644 --- a/server/src/com/cloud/api/response/SecurityGroupResultObject.java +++ b/server/src/com/cloud/api/response/SecurityGroupResultObject.java @@ -22,12 +22,13 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.api.ApiDBUtils; import com.cloud.network.security.SecurityGroup; import com.cloud.network.security.SecurityGroupRules; import com.cloud.serializer.Param; import com.cloud.user.Account; -import org.apache.cloudstack.api.InternalIdentity; public class SecurityGroupResultObject implements ControlledEntity, InternalIdentity { @Param(name = "id") @@ -54,7 +55,8 @@ public class SecurityGroupResultObject implements ControlledEntity, InternalIden public SecurityGroupResultObject() { } - public SecurityGroupResultObject(Long id, String name, String description, long domainId, long accountId, String accountName, List ingressRules) { + public SecurityGroupResultObject(Long id, String name, String description, long domainId, long accountId, String accountName, + List ingressRules) { this.id = id; this.name = name; this.description = description; @@ -64,6 +66,7 @@ public class SecurityGroupResultObject implements ControlledEntity, InternalIden this.securityGroupRules = ingressRules; } + @Override public long getId() { return id; } @@ -88,6 +91,7 @@ public class SecurityGroupResultObject implements ControlledEntity, InternalIden this.description = description; } + @Override public long getDomainId() { return domainId; } @@ -96,6 +100,7 @@ public class SecurityGroupResultObject implements ControlledEntity, InternalIden this.domainId = domainId; } + @Override public long getAccountId() { return accountId; } diff --git a/server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java b/server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java index 6af644d5525..c8d4b3b6438 100644 --- a/server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java +++ b/server/src/com/cloud/api/response/SecurityGroupRuleResultObject.java @@ -46,7 +46,8 @@ public class SecurityGroupRuleResultObject { public SecurityGroupRuleResultObject() { } - public SecurityGroupRuleResultObject(Long id, int startPort, int endPort, String protocol, String allowedSecurityGroup, String allowedSecGroupAcct, String allowedSourceIpCidr) { + public SecurityGroupRuleResultObject(Long id, int startPort, int endPort, String protocol, String allowedSecurityGroup, String allowedSecGroupAcct, + String allowedSourceIpCidr) { this.id = id; this.startPort = startPort; this.endPort = endPort; diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 298cc8919ec..1ec2e74579a 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -173,8 +173,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public boolean releaseVmCapacity(VirtualMachine vm, final boolean moveFromReserved, final boolean moveToReservered, final Long hostId) { final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId()); - CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_CPU); - CapacityVO capacityMemory = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU); + CapacityVO capacityMemory = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY); Long clusterId = null; if (hostId != null) { HostVO host = _hostDao.findById(hostId); @@ -238,12 +238,12 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } s_logger.debug("release cpu from host: " + hostId + ", old used: " + usedCpu + ",reserved: " + reservedCpu + ", actual total: " + actualTotalCpu + - ", total with overprovisioning: " + totalCpu + "; new used: " + capacityCpu.getUsedCapacity() + ",reserved:" + - capacityCpu.getReservedCapacity() + "; movedfromreserved: " + moveFromReserved + ",moveToReservered" + moveToReservered); + ", total with overprovisioning: " + totalCpu + "; new used: " + capacityCpu.getUsedCapacity() + ",reserved:" + capacityCpu.getReservedCapacity() + + "; movedfromreserved: " + moveFromReserved + ",moveToReservered" + moveToReservered); s_logger.debug("release mem from host: " + hostId + ", old used: " + usedMem + ",reserved: " + reservedMem + ", total: " + totalMem + "; new used: " + - capacityMemory.getUsedCapacity() + ",reserved:" + capacityMemory.getReservedCapacity() + "; movedfromreserved: " + moveFromReserved + - ",moveToReservered" + moveToReservered); + capacityMemory.getUsedCapacity() + ",reserved:" + capacityMemory.getReservedCapacity() + "; movedfromreserved: " + moveFromReserved + + ",moveToReservered" + moveToReservered); _capacityDao.update(capacityCpu.getId(), capacityCpu); _capacityDao.update(capacityMemory.getId(), capacityMemory); @@ -269,8 +269,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId()); - CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_CPU); - CapacityVO capacityMem = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU); + CapacityVO capacityMem = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY); if (capacityCpu == null || capacityMem == null || svo == null) { return; @@ -333,12 +333,12 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } s_logger.debug("CPU STATS after allocation: for host: " + hostId + ", old used: " + usedCpu + ", old reserved: " + reservedCpu + ", actual total: " + - actualTotalCpu + ", total with overprovisioning: " + totalCpu + "; new used:" + capacityCpu.getUsedCapacity() + ", reserved:" + - capacityCpu.getReservedCapacity() + "; requested cpu:" + cpu + ",alloc_from_last:" + fromLastHost); + actualTotalCpu + ", total with overprovisioning: " + totalCpu + "; new used:" + capacityCpu.getUsedCapacity() + ", reserved:" + + capacityCpu.getReservedCapacity() + "; requested cpu:" + cpu + ",alloc_from_last:" + fromLastHost); - s_logger.debug("RAM STATS after allocation: for host: " + hostId + ", old used: " + usedMem + ", old reserved: " + reservedMem + ", total: " + totalMem + - "; new used: " + capacityMem.getUsedCapacity() + ", reserved: " + capacityMem.getReservedCapacity() + "; requested mem: " + ram + - ",alloc_from_last:" + fromLastHost); + s_logger.debug("RAM STATS after allocation: for host: " + hostId + ", old used: " + usedMem + ", old reserved: " + reservedMem + ", total: " + + totalMem + "; new used: " + capacityMem.getUsedCapacity() + ", reserved: " + capacityMem.getReservedCapacity() + "; requested mem: " + ram + + ",alloc_from_last:" + fromLastHost); _capacityDao.update(capacityCpu.getId(), capacityCpu); _capacityDao.update(capacityMem.getId(), capacityMem); @@ -356,12 +356,12 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, boolean hasCapacity = false; if (s_logger.isDebugEnabled()) { - s_logger.debug("Checking if host: " + hostId + " has enough capacity for requested CPU: " + cpu + " and requested RAM: " + ram + " , cpuOverprovisioningFactor: " + - cpuOvercommitRatio); + s_logger.debug("Checking if host: " + hostId + " has enough capacity for requested CPU: " + cpu + " and requested RAM: " + ram + + " , cpuOverprovisioningFactor: " + cpuOvercommitRatio); } - CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_CPU); - CapacityVO capacityMem = _capacityDao.findByHostIdType(hostId, CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU); + CapacityVO capacityMem = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY); if (capacityCpu == null || capacityMem == null) { if (capacityCpu == null) { @@ -447,20 +447,20 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } s_logger.debug("STATS: Can alloc CPU from host: " + hostId + ", used: " + usedCpu + ", reserved: " + reservedCpu + ", actual total: " + actualTotalCpu + - ", total with overprovisioning: " + totalCpu + "; requested cpu:" + cpu + ",alloc_from_last_host?:" + checkFromReservedCapacity + - " ,considerReservedCapacity?: " + considerReservedCapacity); + ", total with overprovisioning: " + totalCpu + "; requested cpu:" + cpu + ",alloc_from_last_host?:" + checkFromReservedCapacity + + " ,considerReservedCapacity?: " + considerReservedCapacity); - s_logger.debug("STATS: Can alloc MEM from host: " + hostId + ", used: " + usedMem + ", reserved: " + reservedMem + ", total: " + totalMem + "; requested mem: " + ram + - ",alloc_from_last_host?:" + checkFromReservedCapacity + " ,considerReservedCapacity?: " + considerReservedCapacity); + s_logger.debug("STATS: Can alloc MEM from host: " + hostId + ", used: " + usedMem + ", reserved: " + reservedMem + ", total: " + totalMem + + "; requested mem: " + ram + ",alloc_from_last_host?:" + checkFromReservedCapacity + " ,considerReservedCapacity?: " + considerReservedCapacity); } else { if (checkFromReservedCapacity) { s_logger.debug("STATS: Failed to alloc resource from host: " + hostId + " reservedCpu: " + reservedCpu + ", requested cpu: " + cpu + ", reservedMem: " + - reservedMem + ", requested mem: " + ram); + reservedMem + ", requested mem: " + ram); } else { - s_logger.debug("STATS: Failed to alloc resource from host: " + hostId + " reservedCpu: " + reservedCpu + ", used cpu: " + usedCpu + ", requested cpu: " + cpu + - ", actual total cpu: " + actualTotalCpu + ", total cpu with overprovisioning: " + totalCpu + ", reservedMem: " + reservedMem + ", used Mem: " + - usedMem + ", requested mem: " + ram + ", total Mem:" + totalMem + " ,considerReservedCapacity?: " + considerReservedCapacity); + s_logger.debug("STATS: Failed to alloc resource from host: " + hostId + " reservedCpu: " + reservedCpu + ", used cpu: " + usedCpu + ", requested cpu: " + + cpu + ", actual total cpu: " + actualTotalCpu + ", total cpu with overprovisioning: " + totalCpu + ", reservedMem: " + reservedMem + ", used Mem: " + + usedMem + ", requested mem: " + ram + ", total Mem:" + totalMem + " ,considerReservedCapacity?: " + considerReservedCapacity); } if (s_logger.isDebugEnabled()) { @@ -541,10 +541,12 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } ServiceOffering so = offeringsMap.get(vm.getServiceOfferingId()); if (so.isDynamic()) { - usedMemory += ((Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.memory.name())) * 1024L * 1024L) / ramOvercommitRatio) * - clusterRamOvercommitRatio; - usedCpu += ((Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.cpuSpeed.name()))) / cpuOvercommitRatio) * - clusterCpuOvercommitRatio; + usedMemory += + ((Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.memory.name())) * 1024L * 1024L) / ramOvercommitRatio) * + clusterRamOvercommitRatio; + usedCpu += + ((Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(ServiceOfferingVO.DynamicParameters.cpuSpeed.name()))) / cpuOvercommitRatio) * + clusterCpuOvercommitRatio; } else { usedMemory += ((so.getRamSize() * 1024L * 1024L) / ramOvercommitRatio) * clusterRamOvercommitRatio; usedCpu += ((so.getCpu() * so.getSpeed()) / cpuOvercommitRatio) * clusterCpuOvercommitRatio; @@ -585,8 +587,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } } - CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU); - CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), Capacity.CAPACITY_TYPE_CPU); + CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), Capacity.CAPACITY_TYPE_MEMORY); if (cpuCap != null && memCap != null) { if (host.getTotalMemory() != null) { memCap.setTotalCapacity(host.getTotalMemory()); @@ -601,10 +603,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, if (cpuCap.getUsedCapacity() == usedCpu && cpuCap.getReservedCapacity() == reservedCpu) { s_logger.debug("No need to calibrate cpu capacity, host:" + host.getId() + " usedCpu: " + cpuCap.getUsedCapacity() + " reservedCpu: " + - cpuCap.getReservedCapacity()); + cpuCap.getReservedCapacity()); } else { if (cpuCap.getReservedCapacity() != reservedCpu) { - s_logger.debug("Calibrate reserved cpu for host: " + host.getId() + " old reservedCpu:" + cpuCap.getReservedCapacity() + " new reservedCpu:" + reservedCpu); + s_logger.debug("Calibrate reserved cpu for host: " + host.getId() + " old reservedCpu:" + cpuCap.getReservedCapacity() + " new reservedCpu:" + + reservedCpu); cpuCap.setReservedCapacity(reservedCpu); } if (cpuCap.getUsedCapacity() != usedCpu) { @@ -614,18 +617,19 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } if (memCap.getTotalCapacity() != host.getTotalMemory()) { - s_logger.debug("Calibrate total memory for host: " + host.getId() + " old total memory:" + memCap.getTotalCapacity() + " new total memory:" + host.getTotalMemory()); + s_logger.debug("Calibrate total memory for host: " + host.getId() + " old total memory:" + memCap.getTotalCapacity() + " new total memory:" + + host.getTotalMemory()); memCap.setTotalCapacity(host.getTotalMemory()); } if (memCap.getUsedCapacity() == usedMemory && memCap.getReservedCapacity() == reservedMemory) { s_logger.debug("No need to calibrate memory capacity, host:" + host.getId() + " usedMem: " + memCap.getUsedCapacity() + " reservedMem: " + - memCap.getReservedCapacity()); + memCap.getReservedCapacity()); } else { if (memCap.getReservedCapacity() != reservedMemory) { s_logger.debug("Calibrate reserved memory for host: " + host.getId() + " old reservedMem:" + memCap.getReservedCapacity() + " new reservedMem:" + - reservedMemory); + reservedMemory); memCap.setReservedCapacity(reservedMemory); } if (memCap.getUsedCapacity() != usedMemory) { @@ -653,8 +657,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { - CapacityVO capacity = new CapacityVO(host.getId(), host.getDataCenterId(), host.getPodId(), host.getClusterId(), usedMemoryFinal, host.getTotalMemory(), - CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO capacity = + new CapacityVO(host.getId(), host.getDataCenterId(), host.getPodId(), host.getClusterId(), usedMemoryFinal, host.getTotalMemory(), + Capacity.CAPACITY_TYPE_MEMORY); capacity.setReservedCapacity(reservedMemoryFinal); CapacityState capacityState = CapacityState.Enabled; if (host.getClusterId() != null) { @@ -666,9 +671,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } _capacityDao.persist(capacity); - capacity = new CapacityVO(host.getId(), host.getDataCenterId(), host.getPodId(), host.getClusterId(), usedCpuFinal, host.getCpus().longValue() * - host.getSpeed().longValue(), - CapacityVO.CAPACITY_TYPE_CPU); + capacity = + new CapacityVO(host.getId(), host.getDataCenterId(), host.getPodId(), host.getClusterId(), usedCpuFinal, host.getCpus().longValue() * + host.getSpeed().longValue(), Capacity.CAPACITY_TYPE_CPU); capacity.setReservedCapacity(reservedCpuFinal); capacity.setCapacityState(capacityState); _capacityDao.persist(capacity); @@ -693,8 +698,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, Pair hosts = (Pair)opaque; Long oldHostId = hosts.first(); - s_logger.debug("VM state transitted from :" + oldState + " to " + newState + " with event: " + event + "vm's original host id: " + vm.getLastHostId() + " new host id: " + - vm.getHostId() + " host id before state transition: " + oldHostId); + s_logger.debug("VM state transitted from :" + oldState + " to " + newState + " with event: " + event + "vm's original host id: " + vm.getLastHostId() + + " new host id: " + vm.getHostId() + " host id before state transition: " + oldHostId); if (oldState == State.Starting) { if (newState != State.Running) { @@ -770,7 +775,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, capacityCPU.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, server.getId()); capacityCPU.addAnd("dataCenterId", SearchCriteria.Op.EQ, server.getDataCenterId()); capacityCPU.addAnd("podId", SearchCriteria.Op.EQ, server.getPodId()); - capacityCPU.addAnd("capacityType", SearchCriteria.Op.EQ, CapacityVO.CAPACITY_TYPE_CPU); + capacityCPU.addAnd("capacityType", SearchCriteria.Op.EQ, Capacity.CAPACITY_TYPE_CPU); List capacityVOCpus = _capacityDao.search(capacitySC, null); Float cpuovercommitratio = Float.parseFloat(_clusterDetailsDao.findDetail(server.getClusterId(), "cpuOvercommitRatio").getValue()); Float memoryOvercommitRatio = Float.parseFloat(_clusterDetailsDao.findDetail(server.getClusterId(), "memoryOvercommitRatio").getValue()); @@ -784,14 +789,14 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, CapacityVOCpu.setReservedCapacity(0); CapacityVOCpu.setTotalCapacity(newTotalCpu); } else { - s_logger.debug("What? new cpu is :" + newTotalCpu + ", old one is " + CapacityVOCpu.getUsedCapacity() + "," + CapacityVOCpu.getReservedCapacity() + "," + - CapacityVOCpu.getTotalCapacity()); + s_logger.debug("What? new cpu is :" + newTotalCpu + ", old one is " + CapacityVOCpu.getUsedCapacity() + "," + CapacityVOCpu.getReservedCapacity() + + "," + CapacityVOCpu.getTotalCapacity()); } _capacityDao.update(CapacityVOCpu.getId(), CapacityVOCpu); } else { - CapacityVO capacity = new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, server.getCpus().longValue() * - server.getSpeed().longValue(), - CapacityVO.CAPACITY_TYPE_CPU); + CapacityVO capacity = + new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, server.getCpus().longValue() * + server.getSpeed().longValue(), Capacity.CAPACITY_TYPE_CPU); _capacityDao.persist(capacity); } @@ -799,7 +804,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, capacityMem.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, server.getId()); capacityMem.addAnd("dataCenterId", SearchCriteria.Op.EQ, server.getDataCenterId()); capacityMem.addAnd("podId", SearchCriteria.Op.EQ, server.getPodId()); - capacityMem.addAnd("capacityType", SearchCriteria.Op.EQ, CapacityVO.CAPACITY_TYPE_MEMORY); + capacityMem.addAnd("capacityType", SearchCriteria.Op.EQ, Capacity.CAPACITY_TYPE_MEMORY); List capacityVOMems = _capacityDao.search(capacityMem, null); if (capacityVOMems != null && !capacityVOMems.isEmpty()) { @@ -811,13 +816,14 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, CapacityVOMem.setReservedCapacity(0); CapacityVOMem.setTotalCapacity(newTotalMem); } else { - s_logger.debug("What? new cpu is :" + newTotalMem + ", old one is " + CapacityVOMem.getUsedCapacity() + "," + CapacityVOMem.getReservedCapacity() + "," + - CapacityVOMem.getTotalCapacity()); + s_logger.debug("What? new cpu is :" + newTotalMem + ", old one is " + CapacityVOMem.getUsedCapacity() + "," + CapacityVOMem.getReservedCapacity() + + "," + CapacityVOMem.getTotalCapacity()); } _capacityDao.update(CapacityVOMem.getId(), CapacityVOMem); } else { - CapacityVO capacity = new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, server.getTotalMemory(), - CapacityVO.CAPACITY_TYPE_MEMORY); + CapacityVO capacity = + new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, server.getTotalMemory(), + Capacity.CAPACITY_TYPE_MEMORY); _capacityDao.persist(capacity); } } @@ -928,7 +934,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, if (vmCount.longValue() >= maxGuestLimit.longValue()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Host name: " + host.getName() + ", hostId: " + host.getId() + " already reached max Running VMs(count includes system VMs), limit is: " + - maxGuestLimit + ",Running VM counts is: " + vmCount.longValue()); + maxGuestLimit + ",Running VM counts is: " + vmCount.longValue()); } return true; } @@ -943,6 +949,6 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public ConfigKey[] getConfigKeys() { return new ConfigKey[] {CpuOverprovisioningFactor, MemOverprovisioningFactor, StorageCapacityDisableThreshold, StorageOverprovisioningFactor, - StorageAllocatedCapacityDisableThreshold}; + StorageAllocatedCapacityDisableThreshold}; } } diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/com/cloud/capacity/ComputeCapacityListener.java index 475d49a6b12..75bfe65bcf2 100755 --- a/server/src/com/cloud/capacity/ComputeCapacityListener.java +++ b/server/src/com/cloud/capacity/ComputeCapacityListener.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.capacity; -import java.util.List; - import org.apache.log4j.Logger; import com.cloud.agent.Listener; @@ -31,7 +29,6 @@ import com.cloud.capacity.dao.CapacityDao; import com.cloud.exception.ConnectionException; import com.cloud.host.Host; import com.cloud.host.Status; -import com.cloud.utils.db.SearchCriteria; public class ComputeCapacityListener implements Listener { private static final Logger s_logger = Logger.getLogger(ComputeCapacityListener.class); diff --git a/server/src/com/cloud/capacity/StorageCapacityListener.java b/server/src/com/cloud/capacity/StorageCapacityListener.java index f1ccb84a86e..4322ecf5d3b 100755 --- a/server/src/com/cloud/capacity/StorageCapacityListener.java +++ b/server/src/com/cloud/capacity/StorageCapacityListener.java @@ -17,10 +17,6 @@ package com.cloud.capacity; import java.math.BigDecimal; -import java.util.List; - -import com.cloud.storage.StorageManager; -import org.apache.log4j.Logger; import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; @@ -30,12 +26,11 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupStorageCommand; import com.cloud.capacity.dao.CapacityDao; -import com.cloud.capacity.dao.CapacityDaoImpl; import com.cloud.exception.ConnectionException; import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.storage.Storage; -import com.cloud.utils.db.SearchCriteria; +import com.cloud.storage.StorageManager; public class StorageCapacityListener implements Listener { @@ -73,8 +68,9 @@ public class StorageCapacityListener implements Listener { StartupStorageCommand ssCmd = (StartupStorageCommand)startup; if (ssCmd.getResourceType() == Storage.StorageResourceType.STORAGE_HOST) { BigDecimal overProvFactor = _storageMgr.getStorageOverProvisioningFactor(server.getDataCenterId()); - CapacityVO capacity = new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, (overProvFactor.multiply(new BigDecimal( - server.getTotalSize()))).longValue(), CapacityVO.CAPACITY_TYPE_STORAGE_ALLOCATED); + CapacityVO capacity = + new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, (overProvFactor.multiply(new BigDecimal( + server.getTotalSize()))).longValue(), Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED); _capacityDao.persist(capacity); } diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 458159f0b01..499b0839455 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -43,7 +43,14 @@ public enum Config { // Alert - AlertEmailAddresses("Alert", ManagementServer.class, String.class, "alert.email.addresses", null, "Comma separated list of email addresses used for sending alerts.", null), + AlertEmailAddresses( + "Alert", + ManagementServer.class, + String.class, + "alert.email.addresses", + null, + "Comma separated list of email addresses used for sending alerts.", + null), AlertEmailSender("Alert", ManagementServer.class, String.class, "alert.email.sender", null, "Sender of alert email (will be in the From header of the email).", null), AlertSMTPHost("Alert", ManagementServer.class, String.class, "alert.smtp.host", null, "SMTP hostname used for sending out email alerts.", null), AlertSMTPPassword( @@ -55,14 +62,7 @@ public enum Config { "Password for SMTP authentication (applies only if alert.smtp.useAuth is true).", null), AlertSMTPPort("Alert", ManagementServer.class, Integer.class, "alert.smtp.port", "465", "Port the SMTP server is listening on.", null), - AlertSMTPUseAuth( - "Alert", - ManagementServer.class, - String.class, - "alert.smtp.useAuth", - null, - "If true, use SMTP authentication when sending emails.", - null), + AlertSMTPUseAuth("Alert", ManagementServer.class, String.class, "alert.smtp.useAuth", null, "If true, use SMTP authentication when sending emails.", null), AlertSMTPUsername( "Alert", ManagementServer.class, @@ -71,14 +71,7 @@ public enum Config { null, "Username for SMTP authentication (applies only if alert.smtp.useAuth is true).", null), - CapacityCheckPeriod( - "Alert", - ManagementServer.class, - Integer.class, - "capacity.check.period", - "300000", - "The interval in milliseconds between capacity checks", - null), + CapacityCheckPeriod("Alert", ManagementServer.class, Integer.class, "capacity.check.period", "300000", "The interval in milliseconds between capacity checks", null), PublicIpCapacityThreshold( "Alert", ManagementServer.class, @@ -164,7 +157,14 @@ public enum Config { "time interval between cache replacement threads (in seconds).", null), MaxUploadVolumeSize("Storage", ManagementServer.class, Integer.class, "storage.max.volume.upload.size", "500", "The maximum size for a uploaded volume(in GB).", null), - TotalRetries("Storage", AgentManager.class, Integer.class, "total.retries", "4", "The number of times each command sent to a host should be retried in case of failure.", null), + TotalRetries( + "Storage", + AgentManager.class, + Integer.class, + "total.retries", + "4", + "The number of times each command sent to a host should be retried in case of failure.", + null), StoragePoolMaxWaitSeconds( "Storage", ManagementServer.class, @@ -233,7 +233,14 @@ public enum Config { "global", "Load Balancer(haproxy) stats visibilty, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default", null), - NetworkLBHaproxyStatsUri("Network", ManagementServer.class, String.class, "network.loadbalancer.haproxy.stats.uri", "/admin?stats", "Load Balancer(haproxy) uri.", null), + NetworkLBHaproxyStatsUri( + "Network", + ManagementServer.class, + String.class, + "network.loadbalancer.haproxy.stats.uri", + "/admin?stats", + "Load Balancer(haproxy) uri.", + null), NetworkLBHaproxyStatsAuth( "Secure", ManagementServer.class, @@ -242,7 +249,14 @@ public enum Config { "admin1:AdMiN123", "Load Balancer(haproxy) authetication string in the format username:password", null), - NetworkLBHaproxyStatsPort("Network", ManagementServer.class, String.class, "network.loadbalancer.haproxy.stats.port", "8081", "Load Balancer(haproxy) stats port number.", null), + NetworkLBHaproxyStatsPort( + "Network", + ManagementServer.class, + String.class, + "network.loadbalancer.haproxy.stats.port", + "8081", + "Load Balancer(haproxy) stats port number.", + null), NetworkLBHaproxyMaxConn( "Network", ManagementServer.class, @@ -251,9 +265,23 @@ public enum Config { "4096", "Load Balancer(haproxy) maximum number of concurrent connections(global max)", null), - NetworkRouterRpFilter("Network", ManagementServer.class, Integer.class, "network.disable.rpfilter", "true", "disable rp_filter on Domain Router VM public interfaces.", null), + NetworkRouterRpFilter( + "Network", + ManagementServer.class, + Integer.class, + "network.disable.rpfilter", + "true", + "disable rp_filter on Domain Router VM public interfaces.", + null), - GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null), + GuestVlanBits( + "Network", + ManagementServer.class, + Integer.class, + "guest.vlan.bits", + "12", + "The number of bits to reserve for the VLAN identifier in the guest subnet.", + null), //MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null), DirectNetworkNoDefaultRoute( "Network", @@ -516,7 +544,14 @@ public enum Config { "86400", "Determines how long (in seconds) to wait before actually expunging destroyed vm. The default value = the default value of expunge.interval", null), - ExpungeInterval("Advanced", UserVmManager.class, Integer.class, "expunge.interval", "86400", "The interval (in seconds) to wait before running the expunge thread.", null), + ExpungeInterval( + "Advanced", + UserVmManager.class, + Integer.class, + "expunge.interval", + "86400", + "The interval (in seconds) to wait before running the expunge thread.", + null), ExpungeWorkers("Advanced", UserVmManager.class, Integer.class, "expunge.workers", "1", "Number of workers performing expunge ", null), ExtractURLCleanUpInterval( "Advanced", @@ -526,7 +561,14 @@ public enum Config { "7200", "The interval (in seconds) to wait before cleaning up the extract URL's ", null), - DisableExtraction("Advanced", ManagementServer.class, Boolean.class, "disable.extraction", "false", "Flag for disabling extraction of template, isos and volumes", null), + DisableExtraction( + "Advanced", + ManagementServer.class, + Boolean.class, + "disable.extraction", + "false", + "Flag for disabling extraction of template, isos and volumes", + null), ExtractURLExpirationInterval( "Advanced", ManagementServer.class, @@ -562,8 +604,22 @@ public enum Config { String.valueOf(VpcVirtualNetworkApplianceManager.DEFAULT_ROUTER_CPU_MHZ), "Default CPU speed (MHz) for router VM.", null), - RestartRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "restart.retry.interval", "600", "Time (in seconds) between retries to restart a vm", null), - RouterStatsInterval("Advanced", NetworkOrchestrationService.class, Integer.class, "router.stats.interval", "300", "Interval (in seconds) to report router statistics.", null), + RestartRetryInterval( + "Advanced", + HighAvailabilityManager.class, + Integer.class, + "restart.retry.interval", + "600", + "Time (in seconds) between retries to restart a vm", + null), + RouterStatsInterval( + "Advanced", + NetworkOrchestrationService.class, + Integer.class, + "router.stats.interval", + "300", + "Interval (in seconds) to report router statistics.", + null), ExternalNetworkStatsInterval( "Advanced", NetworkOrchestrationService.class, @@ -597,7 +653,14 @@ public enum Config { "specify extra public nics used for virtual router(up to 5)", "0-5"), ScaleRetry("Advanced", ManagementServer.class, Integer.class, "scale.retry", "2", "Number of times to retry scaling up the vm", null), - StopRetryInterval("Advanced", HighAvailabilityManager.class, Integer.class, "stop.retry.interval", "600", "Time in seconds between retries to stop or destroy a vm", null), + StopRetryInterval( + "Advanced", + HighAvailabilityManager.class, + Integer.class, + "stop.retry.interval", + "600", + "Time in seconds between retries to stop or destroy a vm", + null), StorageCleanupInterval( "Advanced", StorageManager.class, @@ -611,7 +674,14 @@ public enum Config { XapiWait("Advanced", AgentManager.class, Integer.class, "xapiwait", "600", "Time (in seconds) to wait for XAPI to return", null), MigrateWait("Advanced", AgentManager.class, Integer.class, "migratewait", "3600", "Time (in seconds) to wait for VM migrate finish", null), HAWorkers("Advanced", AgentManager.class, Integer.class, "ha.workers", "5", "Number of ha worker threads.", null), - MountParent("Advanced", ManagementServer.class, String.class, "mount.parent", "/var/cloudstack/mnt", "The mount point on the Management Server for Secondary Storage.", null), + MountParent( + "Advanced", + ManagementServer.class, + String.class, + "mount.parent", + "/var/cloudstack/mnt", + "The mount point on the Management Server for Secondary Storage.", + null), // UpgradeURL("Advanced", ManagementServer.class, String.class, "upgrade.url", "http://example.com:8080/client/agent/update.zip", "The upgrade URL is the URL of the management server that agents will connect to in order to automatically upgrade.", null), SystemVMUseLocalStorage( "Advanced", @@ -645,7 +715,7 @@ public enum Config { String.class, "hypervisor.list", HypervisorType.Hyperv + "," + HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," + - HypervisorType.Ovm + "," + HypervisorType.LXC, + HypervisorType.Ovm + "," + HypervisorType.LXC, "The list of hypervisors that this deployment will use.", "hypervisorList"), ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr", null, "The cidr of management server network", null), @@ -665,7 +735,14 @@ public enum Config { String.valueOf(SecondaryStorageVmManager.DEFAULT_SS_VM_MTUSIZE), "MTU size (in Byte) of storage network in secondary storage vms", null), - MaxTemplateAndIsoSize("Advanced", ManagementServer.class, Long.class, "max.template.iso.size", "50", "The maximum size for a downloaded template or ISO (in GB).", null), + MaxTemplateAndIsoSize( + "Advanced", + ManagementServer.class, + Long.class, + "max.template.iso.size", + "50", + "The maximum size for a downloaded template or ISO (in GB).", + null), SecStorageAllowedInternalDownloadSites( "Advanced", ManagementServer.class, @@ -698,9 +775,30 @@ public enum Config { "10", "The minimal number of command execution sessions that system is able to serve immediately(standby capacity)", null), - SecStorageSessionMax("Advanced", AgentManager.class, Integer.class, "secstorage.session.max", "50", "The max number of command execution sessions that a SSVM can handle", null), - SecStorageCmdExecutionTimeMax("Advanced", AgentManager.class, Integer.class, "secstorage.cmd.execution.time.max", "30", "The max command execution time in minute", null), - SecStorageProxy("Advanced", AgentManager.class, String.class, "secstorage.proxy", null, "http proxy used by ssvm, in http://username:password@proxyserver:port format", null), + SecStorageSessionMax( + "Advanced", + AgentManager.class, + Integer.class, + "secstorage.session.max", + "50", + "The max number of command execution sessions that a SSVM can handle", + null), + SecStorageCmdExecutionTimeMax( + "Advanced", + AgentManager.class, + Integer.class, + "secstorage.cmd.execution.time.max", + "30", + "The max command execution time in minute", + null), + SecStorageProxy( + "Advanced", + AgentManager.class, + String.class, + "secstorage.proxy", + null, + "http proxy used by ssvm, in http://username:password@proxyserver:port format", + null), AlertPurgeInterval( "Advanced", ManagementServer.class, @@ -726,7 +824,14 @@ public enum Config { "The interval in milliseconds between host reservation release checks", null), // LB HealthCheck Interval. - LBHealthCheck("Advanced", ManagementServer.class, String.class, "healthcheck.update.interval", "600", "Time Interval to fetch the LB health check states (in sec)", null), + LBHealthCheck( + "Advanced", + ManagementServer.class, + String.class, + "healthcheck.update.interval", + "600", + "Time Interval to fetch the LB health check states (in sec)", + null), DirectAttachNetworkEnabled( "Advanced", @@ -744,8 +849,22 @@ public enum Config { null, "Direct-attach VMs using external DHCP server (API url)", null), - CheckPodCIDRs("Advanced", ManagementServer.class, String.class, "check.pod.cidrs", "true", "If true, different pods must belong to different CIDR subnets.", "true,false"), - NetworkGcWait("Advanced", ManagementServer.class, Integer.class, "network.gc.wait", "600", "Time (in seconds) to wait before shutting down a network that's not in used", null), + CheckPodCIDRs( + "Advanced", + ManagementServer.class, + String.class, + "check.pod.cidrs", + "true", + "If true, different pods must belong to different CIDR subnets.", + "true,false"), + NetworkGcWait( + "Advanced", + ManagementServer.class, + Integer.class, + "network.gc.wait", + "600", + "Time (in seconds) to wait before shutting down a network that's not in used", + null), NetworkGcInterval("Advanced", ManagementServer.class, Integer.class, "network.gc.interval", "600", "Seconds to wait before checking for networks to shutdown", null), CapacitySkipcountingHours( "Advanced", @@ -964,7 +1083,14 @@ public enum Config { null), XenSetupMultipath("Advanced", ManagementServer.class, String.class, "xen.setup.multipath", "false", "Setup the host to do multipath", null), XenBondStorageNic("Advanced", ManagementServer.class, String.class, "xen.bond.storage.nics", null, "Attempt to bond the two networks if found", null), - XenHeartBeatInterval("Advanced", ManagementServer.class, Integer.class, "xen.heartbeat.interval", "60", "heartbeat to use when implementing XenServer Self Fencing", null), + XenHeartBeatInterval( + "Advanced", + ManagementServer.class, + Integer.class, + "xen.heartbeat.interval", + "60", + "heartbeat to use when implementing XenServer Self Fencing", + null), XenGuestNetwork("Hidden", ManagementServer.class, String.class, "xen.guest.network.device", null, "Specify for guest network name label", null), XenMaxNics("Advanced", AgentManager.class, Integer.class, "xen.nics.max", "7", "Maximum allowed nics for Vms created on Xen", null), XenPVdriverVersion( @@ -985,7 +1111,14 @@ public enum Config { "false", "Enable/Disable Cisco Nexus 1000v vSwitch in VMware environment", null), - VmwareUseDVSwitch("Network", ManagementServer.class, Boolean.class, "vmware.use.dvswitch", "false", "Enable/Disable Nexus/Vmware dvSwitch in VMware environment", null), + VmwareUseDVSwitch( + "Network", + ManagementServer.class, + Boolean.class, + "vmware.use.dvswitch", + "false", + "Enable/Disable Nexus/Vmware dvSwitch in VMware environment", + null), VmwarePortsPerDVPortGroup( "Network", ManagementServer.class, @@ -994,7 +1127,14 @@ public enum Config { "256", "Default number of ports per Vmware dvPortGroup in VMware environment", null), - VmwareCreateFullClone("Advanced", ManagementServer.class, Boolean.class, "vmware.create.full.clone", "true", "If set to true, creates guest VMs as full clones on ESX", null), + VmwareCreateFullClone( + "Advanced", + ManagementServer.class, + Boolean.class, + "vmware.create.full.clone", + "true", + "If set to true, creates guest VMs as full clones on ESX", + null), VmwareServiceConsole( "Advanced", ManagementServer.class, @@ -1060,7 +1200,14 @@ public enum Config { "E1000", "Specify the default network device type for system VMs, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null), - VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null), + VmwareRecycleHungWorker( + "Advanced", + ManagementServer.class, + Boolean.class, + "vmware.recycle.hung.wokervm", + "false", + "Specify whether or not to recycle hung worker VMs", + null), VmwareHungWorkerTimeout("Advanced", ManagementServer.class, Long.class, "vmware.hung.wokervm.timeout", "7200", "Worker VM timeout in seconds", null), VmwareEnableNestedVirtualization( "Advanced", @@ -1104,9 +1251,30 @@ public enum Config { null), // Hyperv - HypervPublicNetwork("Hidden", ManagementServer.class, String.class, "hyperv.public.network.device", null, "Specify the public virtual switch on host for public network", null), - HypervPrivateNetwork("Hidden", ManagementServer.class, String.class, "hyperv.private.network.device", null, "Specify the virtual switch on host for private network", null), - HypervGuestNetwork("Hidden", ManagementServer.class, String.class, "hyperv.guest.network.device", null, "Specify the virtual switch on host for private network", null), + HypervPublicNetwork( + "Hidden", + ManagementServer.class, + String.class, + "hyperv.public.network.device", + null, + "Specify the public virtual switch on host for public network", + null), + HypervPrivateNetwork( + "Hidden", + ManagementServer.class, + String.class, + "hyperv.private.network.device", + null, + "Specify the virtual switch on host for private network", + null), + HypervGuestNetwork( + "Hidden", + ManagementServer.class, + String.class, + "hyperv.guest.network.device", + null, + "Specify the virtual switch on host for private network", + null), // Usage UsageExecutionTimezone("Usage", ManagementServer.class, String.class, "usage.execution.timezone", null, "The timezone to use for usage job execution time", null), @@ -1135,7 +1303,14 @@ public enum Config { "86400", "Interval (in seconds) to collect stats from Traffic Monitor", null), - UsageSanityCheckInterval("Usage", ManagementServer.class, Integer.class, "usage.sanity.check.interval", null, "Interval (in days) to check sanity of usage data", null), + UsageSanityCheckInterval( + "Usage", + ManagementServer.class, + Integer.class, + "usage.sanity.check.interval", + null, + "Interval (in days) to check sanity of usage data", + null), UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "GMT", "The timezone to use for usage stats aggregation", null), TrafficSentinelIncludeZones( "Usage", @@ -1464,7 +1639,14 @@ public enum Config { null, "Sender of project invitation email (will be in the From header of the email)", null), - ProjectSMTPHost("Project Defaults", ManagementServer.class, String.class, "project.smtp.host", null, "SMTP hostname used for sending out email project invitations", null), + ProjectSMTPHost( + "Project Defaults", + ManagementServer.class, + String.class, + "project.smtp.host", + null, + "SMTP hostname used for sending out email project invitations", + null), ProjectSMTPPassword( "Secure", ManagementServer.class, @@ -1474,7 +1656,14 @@ public enum Config { "Password for SMTP authentication (applies only if project.smtp.useAuth is true)", null), ProjectSMTPPort("Project Defaults", ManagementServer.class, Integer.class, "project.smtp.port", "465", "Port the SMTP server is listening on", null), - ProjectSMTPUseAuth("Project Defaults", ManagementServer.class, String.class, "project.smtp.useAuth", null, "If true, use SMTP authentication when sending emails", null), + ProjectSMTPUseAuth( + "Project Defaults", + ManagementServer.class, + String.class, + "project.smtp.useAuth", + null, + "If true, use SMTP authentication when sending emails", + null), ProjectSMTPUsername( "Project Defaults", ManagementServer.class, @@ -1527,7 +1716,14 @@ public enum Config { "Service offering used by secondary storage; if NULL - system offering will be used", null), HaTag("Advanced", ManagementServer.class, String.class, "ha.tag", null, "HA tag defining that the host marked with this tag can be used for HA purposes only", null), - VpcCleanupInterval("Advanced", ManagementServer.class, Integer.class, "vpc.cleanup.interval", "3600", "The interval (in seconds) between cleanup for Inactive VPCs", null), + VpcCleanupInterval( + "Advanced", + ManagementServer.class, + Integer.class, + "vpc.cleanup.interval", + "3600", + "The interval (in seconds) between cleanup for Inactive VPCs", + null), VpcMaxNetworks("Advanced", ManagementServer.class, Integer.class, "vpc.max.networks", "3", "Maximum number of networks per vpc", null), DetailBatchQuerySize("Advanced", ManagementServer.class, Integer.class, "detail.batch.query.size", "2000", "Default entity detail batch query size for listing", null), ConcurrentSnapshotsThresholdPerHost( @@ -1602,7 +1798,7 @@ public enum Config { "s3.singleupload.max.size", "5", "The maximum size limit for S3 single part upload API(in GB). If it is set to 0, then it means always use multi-part upload to upload object to S3. " - + "If it is set to -1, then it means always use single-part upload to upload object to S3. ", + + "If it is set to -1, then it means always use single-part upload to upload object to S3. ", null), // Ldap @@ -1610,7 +1806,14 @@ public enum Config { LdapBindPassword("Advanced", ManagementServer.class, String.class, "ldap.bind.password", null, "Sets the bind password for LDAP", null), LdapBindPrincipal("Advanced", ManagementServer.class, String.class, "ldap.bind.principal", null, "Sets the bind principal for LDAP", null), LdapEmailAttribute("Advanced", ManagementServer.class, String.class, "ldap.email.attribute", "mail", "Sets the email attribute used within LDAP", null), - LdapFirstnameAttribute("Advanced", ManagementServer.class, String.class, "ldap.firstname.attribute", "givenname", "Sets the firstname attribute used within LDAP", null), + LdapFirstnameAttribute( + "Advanced", + ManagementServer.class, + String.class, + "ldap.firstname.attribute", + "givenname", + "Sets the firstname attribute used within LDAP", + null), LdapLastnameAttribute("Advanced", ManagementServer.class, String.class, "ldap.lastname.attribute", "sn", "Sets the lastname attribute used within LDAP", null), LdapUsernameAttribute("Advanced", ManagementServer.class, String.class, "ldap.username.attribute", "uid", "Sets the username attribute used within LDAP", null), LdapUserObject("Advanced", ManagementServer.class, String.class, "ldap.user.object", "inetOrgPerson", "Sets the object type of users within LDAP", null), @@ -1664,7 +1867,7 @@ public enum Config { "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." - + " If set to false, these commands become asynchronous. Default value is false.", + + " If set to false, these commands become asynchronous. Default value is false.", null), UCSSyncBladeInterval( diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index dda6d3ae7a4..3770eb80893 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -36,8 +36,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.deploy.DeploymentClusterPlanner; -import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.log4j.Logger; import org.apache.cloudstack.acl.SecurityChecker; @@ -71,6 +69,7 @@ import org.apache.cloudstack.config.Configuration; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; @@ -119,7 +118,7 @@ import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.PodVlanMapDao; import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DataCenterDeployment; -import com.cloud.deploy.DeploymentPlanner; +import com.cloud.deploy.DeploymentClusterPlanner; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; @@ -405,7 +404,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati s_logger.warn("Management network CIDR is not configured originally. Set it default to " + localCidrs[0]); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management network CIDR is not configured originally. Set it default to " + - localCidrs[0], ""); + localCidrs[0], ""); _configDao.update(Config.ManagementNetwork.key(), Config.ManagementNetwork.getCategory(), localCidrs[0]); } else { s_logger.warn("Management network CIDR is not properly configured and we are not able to find a default setting"); @@ -599,7 +598,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati Long clusterId = cmd.getClusterId(); Long storagepoolId = cmd.getStoragepoolId(); Long accountId = cmd.getAccountId(); - CallContext.current().setEventDetails(" Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" : (((value == null) ? "" : value)))); + CallContext.current().setEventDetails( + " Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" : (((value == null) ? "" : value)))); // check if config value exists ConfigurationVO config = _configDao.findByName(name); String catergory = null; @@ -781,7 +781,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati String routeToVerify = route.trim(); if (!NetUtils.isValidCIDR(routeToVerify)) { throw new InvalidParameterValueException("Invalid value for blacklisted route: " + route + ". Valid format is list" + - " of cidrs separated by coma. Example: 10.1.1.0/24,192.168.0.0/24"); + " of cidrs separated by coma. Example: 10.1.1.0/24,192.168.0.0/24"); } } } @@ -1190,8 +1190,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati @Override @DB - public HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp, String allocationStateStr, - boolean skipGatewayOverlapCheck) { + public HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp, + String allocationStateStr, boolean skipGatewayOverlapCheck) { // Check if the zone is valid if (!validZone(zoneId)) { @@ -1558,7 +1558,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!NetUtils.verifyDomainName(dom)) { throw new InvalidParameterValueException( "Invalid network domain suffixes. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } newDetails.put(ZoneConfig.DnsSearchOrder.getName(), StringUtils.join(dnsSearchOrder, ",")); @@ -1621,7 +1621,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -1684,8 +1684,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati _networkSvc.addTrafficTypeToPhysicalNetwork(mgmtPhyNetwork.getId(), TrafficType.Storage.toString(), mgmtTraffic.getXenNetworkLabel(), mgmtTraffic.getKvmNetworkLabel(), mgmtTraffic.getVmwareNetworkLabel(), mgmtTraffic.getSimulatorNetworkLabel(), mgmtTraffic.getVlan(), mgmtTraffic.getHypervNetworkLabel()); - s_logger.info("No storage traffic type was specified by admin, create default storage traffic on physical network " + mgmtPhyNetwork.getId() + - " with same configure of management traffic type"); + s_logger.info("No storage traffic type was specified by admin, create default storage traffic on physical network " + + mgmtPhyNetwork.getId() + " with same configure of management traffic type"); } } catch (InvalidParameterValueException ex) { throw new InvalidParameterValueException("Cannot enable this Zone since: " + ex.getMessage()); @@ -1734,8 +1734,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati @Override @DB public DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, - final Long domainId, NetworkType zoneType, String allocationStateStr, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1, - String ip6Dns2) { + final Long domainId, NetworkType zoneType, String allocationStateStr, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, + String ip6Dns1, String ip6Dns2) { // checking the following params outside checkzoneparams method as we do // not use these params for updatezone @@ -1749,7 +1749,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -1759,8 +1759,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati String zoneToken = UUID.nameUUIDFromBytes(bytes).toString(); // Create the new zone in the database - final DataCenterVO zoneFinal = new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, guestCidr, domain, domainId, zoneType, zoneToken, networkDomain, - isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2); + final DataCenterVO zoneFinal = + new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, guestCidr, domain, domainId, zoneType, zoneToken, networkDomain, + isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2); if (allocationStateStr != null && !allocationStateStr.isEmpty()) { Grouping.AllocationState allocationState = Grouping.AllocationState.valueOf(allocationStateStr); zoneFinal.setAllocationState(allocationState); @@ -1910,8 +1911,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati isSecurityGroupEnabled = true; } - return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, guestCidr, domainVO != null ? domainVO.getName() : null, domainId, zoneType, allocationState, - networkDomain, isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2); + return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, guestCidr, domainVO != null ? domainVO.getName() : null, domainId, zoneType, + allocationState, networkDomain, isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2); } @Override @@ -1977,7 +1978,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati vmType = VirtualMachine.Type.InternalLoadBalancerVm; } else { throw new InvalidParameterValueException("Invalid systemVmType. Supported types are: " + VirtualMachine.Type.DomainRouter + ", " + - VirtualMachine.Type.ConsoleProxy + ", " + VirtualMachine.Type.SecondaryStorageVm); + VirtualMachine.Type.ConsoleProxy + ", " + VirtualMachine.Type.SecondaryStorageVm); } } else { allowNetworkRate = true; @@ -1985,7 +1986,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } if (cmd.getNetworkRate() != null && !allowNetworkRate) { - throw new InvalidParameterValueException("Network rate can be specified only for non-System offering and system offerings having \"domainrouter\" systemvmtype"); + throw new InvalidParameterValueException( + "Network rate can be specified only for non-System offering and system offerings having \"domainrouter\" systemvmtype"); } if (cmd.getDeploymentPlanner() != null) { @@ -1999,17 +2001,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } - return createServiceOffering(userId, cmd.getIsSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(), localStorageRequired, - offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainId(), cmd.getHostTag(), cmd.getNetworkRate(), cmd.getDeploymentPlanner(), cmd.getDetails(), - cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate()); + return createServiceOffering(userId, cmd.getIsSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(), + localStorageRequired, offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainId(), cmd.getHostTag(), cmd.getNetworkRate(), cmd.getDeploymentPlanner(), + cmd.getDetails(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate()); } - protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vm_type, String name, Integer cpu, Integer ramSize, Integer speed, - String displayText, boolean localStorageRequired, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String tags, Long domainId, String hostTag, - Integer networkRate, String deploymentPlanner, Map details, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate, Long iopsWriteRate) { + protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vm_type, String name, Integer cpu, Integer ramSize, + Integer speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String tags, Long domainId, + String hostTag, Integer networkRate, String deploymentPlanner, Map details, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate, + Long iopsWriteRate) { tags = StringUtils.cleanupTags(tags); - ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, null, offerHA, limitResourceUse, volatileVm, displayText, localStorageRequired, - false, tags, isSystem, vm_type, domainId, hostTag, deploymentPlanner); + ServiceOfferingVO offering = + new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, null, offerHA, limitResourceUse, volatileVm, displayText, localStorageRequired, false, tags, + isSystem, vm_type, domainId, hostTag, deploymentPlanner); if ((bytesReadRate != null) && (bytesReadRate > 0)) offering.setBytesReadRate(bytesReadRate); if ((bytesWriteRate != null) && (bytesWriteRate > 0)) @@ -2107,9 +2111,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } - protected DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized, boolean localStorageRequired, - boolean isDisplayOfferingEnabled, Boolean isCustomizedIops, Long minIops, Long maxIops, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate, Long iopsWriteRate, - Integer hypervisorSnapshotReserve) { + protected DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized, + boolean localStorageRequired, boolean isDisplayOfferingEnabled, Boolean isCustomizedIops, Long minIops, Long maxIops, Long bytesReadRate, Long bytesWriteRate, + Long iopsReadRate, Long iopsWriteRate, Integer hypervisorSnapshotReserve) { long diskSize = 0;// special case for custom disk offerings if (numGibibytes != null && (numGibibytes <= 0)) { throw new InvalidParameterValueException("Please specify a disk size of at least 1 Gb."); @@ -2227,8 +2231,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati Long iopsWriteRate = cmd.getIopsWriteRate(); Integer hypervisorSnapshotReserve = cmd.getHypervisorSnapshotReserve(); - return createDiskOffering(domainId, name, description, numGibibytes, tags, isCustomized, localStorageRequired, isDisplayOfferingEnabled, isCustomizedIops, minIops, - maxIops, bytesReadRate, bytesWriteRate, iopsReadRate, iopsWriteRate, hypervisorSnapshotReserve); + return createDiskOffering(domainId, name, description, numGibibytes, tags, isCustomized, localStorageRequired, isDisplayOfferingEnabled, isCustomizedIops, + minIops, maxIops, bytesReadRate, bytesWriteRate, iopsReadRate, iopsWriteRate, hypervisorSnapshotReserve); } @Override @@ -2533,8 +2537,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (zone.getNetworkType() == DataCenter.NetworkType.Advanced) { if (network.getTrafficType() == TrafficType.Guest) { if (network.getGuestType() != GuestType.Shared) { - throw new InvalidParameterValueException("Can execute createVLANIpRanges on shared guest network, but type of this guest network " + network.getId() + " is " + - network.getGuestType()); + throw new InvalidParameterValueException("Can execute createVLANIpRanges on shared guest network, but type of this guest network " + network.getId() + + " is " + network.getGuestType()); } List vlans = _vlanDao.listVlansByNetworkId(network.getId()); @@ -2544,7 +2548,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati vlanId = vlan.getVlanTag(); } else if (!vlan.getVlanTag().equals(vlanId)) { throw new InvalidParameterValueException("there is already one vlan " + vlan.getVlanTag() + " on network :" + +network.getId() + - ", only one vlan is allowed on guest network"); + ", only one vlan is allowed on guest network"); } } sameSubnet = validateIpRange(startIP, endIP, newVlanGateway, newVlanNetmask, vlans, ipv4, ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network); @@ -2576,23 +2580,24 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati checkOverlapPrivateIpRange(zoneId, startIP, endIP); } - return commitVlan(zoneId, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, forVirtualNetwork, networkId, physicalNetworkId, startIPv6, endIPv6, ip6Gateway, - ip6Cidr, vlanOwner, network, sameSubnet); + return commitVlan(zoneId, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, forVirtualNetwork, networkId, physicalNetworkId, startIPv6, endIPv6, + ip6Gateway, ip6Cidr, vlanOwner, network, sameSubnet); } - private Vlan commitVlan(final Long zoneId, final Long podId, final String startIP, final String endIP, final String newVlanGatewayFinal, final String newVlanNetmaskFinal, - final String vlanId, final Boolean forVirtualNetwork, final Long networkId, final Long physicalNetworkId, final String startIPv6, final String endIPv6, - final String ip6Gateway, final String ip6Cidr, final Account vlanOwner, final Network network, final Pair> sameSubnet) { + private Vlan commitVlan(final Long zoneId, final Long podId, final String startIP, final String endIP, final String newVlanGatewayFinal, + final String newVlanNetmaskFinal, final String vlanId, final Boolean forVirtualNetwork, final Long networkId, final Long physicalNetworkId, + final String startIPv6, final String endIPv6, final String ip6Gateway, final String ip6Cidr, final Account vlanOwner, final Network network, + final Pair> sameSubnet) { return Transaction.execute(new TransactionCallback() { @Override public Vlan doInTransaction(TransactionStatus status) { String newVlanNetmask = newVlanNetmaskFinal; String newVlanGateway = newVlanGatewayFinal; - if ((sameSubnet == null || sameSubnet.first() == false) && (network.getTrafficType() == TrafficType.Guest) && (network.getGuestType() == GuestType.Shared) && - (_vlanDao.listVlansByNetworkId(networkId) != null)) { - Map dhcpCapabilities = _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()), - Service.Dhcp); + if ((sameSubnet == null || sameSubnet.first() == false) && (network.getTrafficType() == TrafficType.Guest) && + (network.getGuestType() == GuestType.Shared) && (_vlanDao.listVlansByNetworkId(networkId) != null)) { + Map dhcpCapabilities = + _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()), Service.Dhcp); String supportsMultipleSubnets = dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets); if (supportsMultipleSubnets == null || !Boolean.valueOf(supportsMultipleSubnets)) { throw new InvalidParameterValueException("The Dhcp serivice provider for this network dose not support the dhcp across multiple subnets"); @@ -2605,8 +2610,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati newVlanGateway = sameSubnet.second().first(); newVlanNetmask = sameSubnet.second().second(); } - Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, - vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr); + Vlan vlan = + createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, + vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr); // create an entry in the nic_secondary table. This will be the new // gateway that will be configured on the corresponding routervm. return vlan; @@ -2641,8 +2647,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati return (NetUtils.isNetowrkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr)); } - public Pair> validateIpRange(String startIP, String endIP, String newVlanGateway, String newVlanNetmask, List vlans, boolean ipv4, - boolean ipv6, String ip6Gateway, String ip6Cidr, String startIPv6, String endIPv6, Network network) { + public Pair> validateIpRange(String startIP, String endIP, String newVlanGateway, String newVlanNetmask, List vlans, + boolean ipv4, boolean ipv6, String ip6Gateway, String ip6Cidr, String startIPv6, String endIPv6, Network network) { String vlanGateway = null; String vlanNetmask = null; boolean sameSubnet = false; @@ -2656,8 +2662,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (val == NetUtils.supersetOrSubset.isSuperset) { // this means that new cidr is a superset of the // existing subnet. - throw new InvalidParameterValueException("The subnet you are trying to add is a superset of the existing subnet having gateway" + vlan.getVlanGateway() + - " and netmask " + vlan.getVlanNetmask()); + throw new InvalidParameterValueException("The subnet you are trying to add is a superset of the existing subnet having gateway" + + vlan.getVlanGateway() + " and netmask " + vlan.getVlanNetmask()); } else if (val == NetUtils.supersetOrSubset.neitherSubetNorSuperset) { // this implies the user is trying to add a new subnet // which is not a superset or subset of this subnet. @@ -2665,8 +2671,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati continue; } else if (val == NetUtils.supersetOrSubset.isSubset) { // this means he is trying to add to the same subnet. - throw new InvalidParameterValueException("The subnet you are trying to add is a subset of the existing subnet having gateway" + vlan.getVlanGateway() + - " and netmask " + vlan.getVlanNetmask()); + throw new InvalidParameterValueException("The subnet you are trying to add is a subset of the existing subnet having gateway" + + vlan.getVlanGateway() + " and netmask " + vlan.getVlanNetmask()); } else if (val == NetUtils.supersetOrSubset.sameSubnet) { sameSubnet = true; //check if the gateway provided by the user is same as that of the subnet. @@ -2691,7 +2697,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } if (newVlanGateway == null && newVlanNetmask == null && sameSubnet == false) { - throw new InvalidParameterValueException("The ip range dose not belong to any of the existing subnets, Provide the netmask and gateway if you want to add new subnet"); + throw new InvalidParameterValueException( + "The ip range dose not belong to any of the existing subnets, Provide the netmask and gateway if you want to add new subnet"); } Pair vlanDetails = null; @@ -2754,7 +2761,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } // pod vlans can be created in basic zone only if (zone.getNetworkType() != NetworkType.Basic || network.getTrafficType() != TrafficType.Guest) { - throw new InvalidParameterValueException("Pod id can be specified only for the networks of type " + TrafficType.Guest + " in zone of type " + NetworkType.Basic); + throw new InvalidParameterValueException("Pod id can be specified only for the networks of type " + TrafficType.Guest + " in zone of type " + + NetworkType.Basic); } } @@ -2820,7 +2828,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati String newCidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask); //Make sure start and end ips are with in the range of cidr calculated for this gateway and netmask { - if (!NetUtils.isIpWithtInCidrRange(vlanGateway, newCidr) || !NetUtils.isIpWithtInCidrRange(startIP, newCidr) || !NetUtils.isIpWithtInCidrRange(endIP, newCidr)) { + if (!NetUtils.isIpWithtInCidrRange(vlanGateway, newCidr) || !NetUtils.isIpWithtInCidrRange(startIP, newCidr) || + !NetUtils.isIpWithtInCidrRange(endIP, newCidr)) { throw new InvalidParameterValueException("Please specify a valid IP range or valid netmask or valid gateway"); } @@ -2831,7 +2840,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (guestNetworkCidr != null) { if (NetUtils.isNetworksOverlap(newCidr, guestNetworkCidr)) { throw new InvalidParameterValueException("The new IP range you have specified has overlapped with the guest network in zone: " + zone.getName() + - ". Please specify a different gateway/netmask."); + ". Please specify a different gateway/netmask."); } } @@ -2861,11 +2870,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // from here, subnet overlaps if (!vlanId.equals(vlan.getVlanTag())) { throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " in zone " + zone.getName() + - " has overlapped with the subnet. Please specify a different gateway/netmask."); + " has overlapped with the subnet. Please specify a different gateway/netmask."); } if (vlan.getNetworkId() != networkId) { - throw new InvalidParameterValueException("This subnet is overlapped with subnet in other network " + vlan.getNetworkId() + " in zone " + zone.getName() + - " . Please specify a different gateway/netmask."); + throw new InvalidParameterValueException("This subnet is overlapped with subnet in other network " + vlan.getNetworkId() + " in zone " + + zone.getName() + " . Please specify a different gateway/netmask."); } String[] otherVlanIpRange = vlan.getIpRange().split("\\-"); @@ -2877,11 +2886,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati //extend IP range if (!vlanGateway.equals(otherVlanGateway) || !vlanNetmask.equals(vlan.getVlanNetmask())) { - throw new InvalidParameterValueException("The IP range has already been added with gateway " + otherVlanGateway + " ,and netmask " + otherVlanNetmask + - ", Please specify the gateway/netmask if you want to extend ip range"); + throw new InvalidParameterValueException("The IP range has already been added with gateway " + otherVlanGateway + " ,and netmask " + + otherVlanNetmask + ", Please specify the gateway/netmask if you want to extend ip range"); } if (NetUtils.ipRangesOverlap(startIP, endIP, otherVlanStartIP, otherVlanEndIP)) { - throw new InvalidParameterValueException("The IP range already has IPs that overlap with the new range." + " Please specify a different start IP/end IP."); + throw new InvalidParameterValueException("The IP range already has IPs that overlap with the new range." + + " Please specify a different start IP/end IP."); } } } @@ -2901,12 +2911,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (vlanId.equals(vlan.getVlanTag())) { if (NetUtils.isIp6RangeOverlap(ipv6Range, vlan.getIp6Range())) { throw new InvalidParameterValueException("The IPv6 range with tag: " + vlan.getVlanTag() + - " already has IPs that overlap with the new range. Please specify a different start IP/end IP."); + " already has IPs that overlap with the new range. Please specify a different start IP/end IP."); } if (!vlanIp6Gateway.equals(vlan.getIp6Gateway())) { - throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " has already been added with gateway " + vlan.getIp6Gateway() + - ". Please specify a different tag."); + throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " has already been added with gateway " + + vlan.getIp6Gateway() + ". Please specify a different tag."); } } } @@ -2915,7 +2925,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // Check if the vlan is being used if (_zoneDao.findVnet(zoneId, physicalNetworkId, vlanId).size() > 0) { throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " + - zone.getName()); + zone.getName()); } String ipRange = null; @@ -2928,19 +2938,21 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } // Everything was fine, so persist the VLAN - VlanVO vlan = commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, vlanIp6Gateway, vlanIp6Cidr, - ipv4, zone, vlanType, ipv6Range, ipRange); + VlanVO vlan = + commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, vlanIp6Gateway, vlanIp6Cidr, + ipv4, zone, vlanType, ipv6Range, ipRange); return vlan; } - private VlanVO commitVlanAndIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final Long podId, final String startIP, final String endIP, - final String vlanGateway, final String vlanNetmask, final String vlanId, final Account vlanOwner, final String vlanIp6Gateway, final String vlanIp6Cidr, - final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange) { + private VlanVO commitVlanAndIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final Long podId, final String startIP, + final String endIP, final String vlanGateway, final String vlanNetmask, final String vlanId, final Account vlanOwner, final String vlanIp6Gateway, + final String vlanIp6Cidr, final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange) { return Transaction.execute(new TransactionCallback() { @Override public VlanVO doInTransaction(TransactionStatus status) { - VlanVO vlan = new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId, physicalNetworkId, vlanIp6Gateway, vlanIp6Cidr, ipv6Range); + VlanVO vlan = + new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId, physicalNetworkId, vlanIp6Gateway, vlanIp6Cidr, ipv6Range); s_logger.debug("Saving vlan range " + vlan); vlan = _vlanDao.persist(vlan); @@ -2962,8 +2974,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // range List ips = _publicIpAddressDao.listByVlanId(vlan.getId()); for (IPAddressVO ip : ips) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), - ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), + ip.getAddress().toString(), ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); } // increment resource count for dedicated public ip's _resourceLimitMgr.incrementResourceCount(vlanOwner.getId(), ResourceType.public_ip, new Long(ips.size())); @@ -3012,18 +3024,18 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati for (IPAddressVO ip : ips) { if (ip.isOneToOneNat()) { throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip + - " belonging to the range is used for static nat purposes. Cleanup the rules first"); + " belonging to the range is used for static nat purposes. Cleanup the rules first"); } if (ip.isSourceNat()) { throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip + - " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId() + - ". IP range with the source nat ip address can be removed either as a part of Network, or account removal"); + " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId() + + ". IP range with the source nat ip address can be removed either as a part of Network, or account removal"); } if (_firewallDao.countRulesByIpId(ip.getId()) > 0) { throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip + - " belonging to the range has firewall rules applied. Cleanup the rules first"); + " belonging to the range has firewall rules applied. Cleanup the rules first"); } // release public ip address here success = success && _ipAddrMgr.disassociatePublicIpAddress(ip.getId(), userId, caller); @@ -3032,8 +3044,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati s_logger.warn("Some ip addresses failed to be released as a part of vlan " + vlanDbId + " removal"); } else { for (IPAddressVO ip : ips) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getId(), ip.getDataCenterId(), ip.getId(), - ip.getAddress().toString(), ip.isSourceNat(), vlanRange.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress() + .toString(), ip.isSourceNat(), vlanRange.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); } } } finally { @@ -3044,7 +3056,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati //check if the ipalias belongs to the vlan range being deleted. if (ipAlias != null && vlanDbId == _publicIpAddressDao.findByIpAndSourceNetworkId(vlanRange.getNetworkId(), ipAlias.getIp4Address()).getVlanId()) { throw new InvalidParameterValueException("Cannot delete vlan range " + vlanDbId + " as " + ipAlias.getIp4Address() + - "is being used for providing dhcp service in this subnet. Delete all VMs in this subnet and try again"); + "is being used for providing dhcp service in this subnet. Delete all VMs in this subnet and try again"); } allocIpCount = _publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true); if (allocIpCount > 0) { @@ -3139,8 +3151,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // generate usage event for dedication of every ip address in the range for (IPAddressVO ip : ips) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), ip.isSourceNat(), - vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), + ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); } // increment resource count for dedicated public ip's @@ -3210,8 +3222,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // generate usage events to remove dedication for every ip in the range that has been disassociated for (IPAddressVO ip : ips) { if (!ipsInUse.contains(ip)) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getAccountId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), - ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getAccountId(), ip.getDataCenterId(), ip.getId(), ip.getAddress() + .toString(), ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid()); } } // decrement resource count for dedicated public ip's @@ -3275,7 +3287,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // check and throw exception if there is portable IP range that overlaps with public ip range being configured if (checkOverlapPortableIpRange(_regionDao.getRegionId(), startIP, endIP)) { throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " + - _regionDao.getRegionId()); + _regionDao.getRegionId()); } // verify and throw exception if the VLAN Id is used by any portable IP range @@ -3360,7 +3372,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati "The subnet of the pod you are adding conflicts with the subnet of the Guest IP Network. Please specify a different CIDR."); } else { throw new InvalidParameterValueException("Warning: The subnet of pod " + podName + " in zone " + zoneName + - " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management."); + " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management."); } } } @@ -3388,11 +3400,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (cidrSubnet.equals(otherCidrSubnet)) { String otherPodName = getPodName(otherPodId.longValue()); if (podName.equals("newPod")) { - throw new InvalidParameterValueException("The subnet of the pod you are adding conflicts with the subnet of pod " + otherPodName + " in zone " + zoneName + - ". Please specify a different CIDR."); + throw new InvalidParameterValueException("The subnet of the pod you are adding conflicts with the subnet of pod " + otherPodName + " in zone " + + zoneName + ". Please specify a different CIDR."); } else { throw new InvalidParameterValueException("Warning: The pods " + podName + " and " + otherPodName + " in zone " + zoneName + - " have conflicting CIDR subnets. Please change the CIDR of one of these pods."); + " have conflicting CIDR subnets. Please change the CIDR of one of these pods."); } } } @@ -3609,7 +3621,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // Allow to specify more than 1 provider per service only if // the service is LB if (!serviceStr.equalsIgnoreCase(Service.Lb.getName()) && svcPrv.get(serviceStr) != null && svcPrv.get(serviceStr).size() > 1) { - throw new InvalidParameterValueException("In the current release only one provider can be " + "specified for the service if the service is not LB"); + throw new InvalidParameterValueException("In the current release only one provider can be " + + "specified for the service if the service is not LB"); } for (String prvNameStr : svcPrv.get(serviceStr)) { // check if provider is supported @@ -3701,7 +3714,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!(firewallProvider.getName().equals(Provider.JuniperSRX.getName()) || firewallProvider.getName().equals(Provider.VirtualRouter.getName())) && egressDefaultPolicy == false) { throw new InvalidParameterValueException("Firewall egress with default policy " + egressDefaultPolicy + "is not supported by the provider " + - firewallProvider.getName()); + firewallProvider.getName()); } } @@ -3722,8 +3735,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } - NetworkOffering offering = createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false, - serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive); + NetworkOffering offering = + createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false, + serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive); CallContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name); return offering; } @@ -3732,7 +3746,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) { if (lbServiceCapabilityMap.keySet().size() > 3 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation)) { throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", " + - Capability.InlineMode.getName() + " capabilities can be sepcified for LB service"); + Capability.InlineMode.getName() + " capabilities can be sepcified for LB service"); } for (Capability cap : lbServiceCapabilityMap.keySet()) { @@ -3763,8 +3777,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } else { throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", " + - Capability.InlineMode.getName() + ", " + Capability.LbSchemes.getName() + - " capabilities can be sepcified for LB service"); + Capability.InlineMode.getName() + ", " + Capability.LbSchemes.getName() + " capabilities can be sepcified for LB service"); } } } @@ -3774,7 +3787,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (sourceNatServiceCapabilityMap != null && !sourceNatServiceCapabilityMap.isEmpty()) { if (sourceNatServiceCapabilityMap.keySet().size() > 2) { throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter + - " capabilities can be sepcified for source nat service"); + " capabilities can be sepcified for source nat service"); } for (Capability capability : sourceNatServiceCapabilityMap.keySet()) { @@ -3784,7 +3797,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati boolean perZone = value.contains("perzone"); if ((perAccount && perZone) || (!perAccount && !perZone)) { throw new InvalidParameterValueException("Either peraccount or perzone source NAT type can be specified for " + - Capability.SupportedSourceNatTypes.getName()); + Capability.SupportedSourceNatTypes.getName()); } } else if (capability == Capability.RedundantRouter) { boolean enabled = value.contains("true"); @@ -3794,7 +3807,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } else { throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter + - " capabilities can be sepcified for source nat service"); + " capabilities can be sepcified for source nat service"); } } } @@ -3815,12 +3828,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati associatePublicIP = value.contains("true"); } else { throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName() + - " capabilitiy can be sepcified for static nat service"); + " capabilitiy can be sepcified for static nat service"); } } if ((!eipEnabled) && associatePublicIP) { throw new InvalidParameterValueException("Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + - Capability.ElasticIp.getName() + " is true"); + Capability.ElasticIp.getName() + " is true"); } } } @@ -3866,13 +3879,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati boolean canOffBeRequired = (type == GuestType.Isolated && serviceProviderMap.containsKey(Service.SourceNat)); if (!canOffBeRequired) { throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type " + - GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled"); + GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled"); } // only one network offering in the system can be Required List offerings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (!offerings.isEmpty()) { - throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + Availability.Required); + throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + + Availability.Required); } } @@ -3930,7 +3944,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if ((sourceNatServiceCapabilityMap != null) && (!sourceNatServiceCapabilityMap.isEmpty())) { String sourceNatType = sourceNatServiceCapabilityMap.get(Capability.SupportedSourceNatTypes); if (sourceNatType != null) { - _networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.SourceNat), Service.SourceNat, Capability.SupportedSourceNatTypes, sourceNatType); + _networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.SourceNat), Service.SourceNat, Capability.SupportedSourceNatTypes, + sourceNatType); sharedSourceNat = sourceNatType.contains("perzone"); } @@ -3959,9 +3974,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati publicLb = true; } - final NetworkOfferingVO offeringFinal = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, networkRate, multicastRate, isDefault, availability, - tags, type, conserveMode, dedicatedLb, sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp, publicLb, - internalLb, egressDefaultPolicy); + final NetworkOfferingVO offeringFinal = + new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, networkRate, multicastRate, isDefault, availability, tags, type, conserveMode, + dedicatedLb, sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp, publicLb, internalLb, + egressDefaultPolicy); if (serviceOfferingId != null) { offeringFinal.setServiceOfferingId(serviceOfferingId); @@ -4037,7 +4053,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (lbProvider == null) { throw new InvalidParameterValueException("Invalid value " + details.get(detail) + " for the detail " + detail + - ". The provider is not supported by the network offering"); + ". The provider is not supported by the network offering"); } // 2) validate if the provider supports the scheme @@ -4304,7 +4320,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati int networkCount = _networkDao.getNetworkCountByNetworkOffId(offeringId); if (networkCount > 0) { throw new InvalidParameterValueException("Can't delete network offering " + offeringId + " as its used by " + networkCount + " networks. " + - "To make the network offering unavaiable, disable it"); + "To make the network offering unavaiable, disable it"); } if (_networkOfferingDao.remove(offeringId)) { @@ -4376,18 +4392,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati throw new InvalidParameterValueException("Invalid value for Availability. Supported types: " + Availability.Required + ", " + Availability.Optional); } else { if (availability == NetworkOffering.Availability.Required) { - boolean canOffBeRequired = (offeringToUpdate.getGuestType() == GuestType.Isolated && _networkModel.areServicesSupportedByNetworkOffering( - offeringToUpdate.getId(), Service.SourceNat)); + boolean canOffBeRequired = + (offeringToUpdate.getGuestType() == GuestType.Isolated && _networkModel.areServicesSupportedByNetworkOffering(offeringToUpdate.getId(), + Service.SourceNat)); if (!canOffBeRequired) { throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type " + - GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled"); + GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled"); } // only one network offering in the system can be Required List offerings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (!offerings.isEmpty() && offerings.get(0).getId() != offeringToUpdate.getId()) { throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + - Availability.Required); + Availability.Required); } } offering.setAvailability(availability); @@ -4627,16 +4644,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!NetUtils.sameSubnet(startIP, gateway, netmask)) { throw new InvalidParameterValueException("Please ensure that your start IP is in the same subnet as " - + "your portable IP range's gateway and as per the IP range's netmask."); + + "your portable IP range's gateway and as per the IP range's netmask."); } if (!NetUtils.sameSubnet(endIP, gateway, netmask)) { throw new InvalidParameterValueException("Please ensure that your end IP is in the same subnet as " - + "your portable IP range's gateway and as per the IP range's netmask."); + + "your portable IP range's gateway and as per the IP range's netmask."); } if (checkOverlapPortableIpRange(regionId, startIP, endIP)) { - throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " + regionId); + throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " + + regionId); } if (vlanId == null) { @@ -4652,7 +4670,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // check if there is zone vlan with same id if (_vlanDao.findByZoneAndVlanId(zone.getId(), vlanId) != null) throw new InvalidParameterValueException("Found a VLAN id " + vlanId + " already existing in" + " zone " + zone.getUuid() + - " that conflicts with VLAN id of the portable ip range being configured"); + " that conflicts with VLAN id of the portable ip range being configured"); //check if there is a public ip range that overlaps with portable ip range being created checkOverlapPublicIpRange(zone.getId(), startIP, endIP); } diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index 5de74901955..0f4b27a40b6 100755 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java @@ -155,7 +155,8 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol String publicIp = host.getPublicIpAddress(); if (publicIp == null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Host " + host.getName() + "/" + host.getPrivateIpAddress() + " does not have public interface, we will return its private IP for cosole proxy."); + s_logger.debug("Host " + host.getName() + "/" + host.getPrivateIpAddress() + + " does not have public interface, we will return its private IP for cosole proxy."); } publicIp = host.getPrivateIpAddress(); } diff --git a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java index 1dc74de41e7..869af13aced 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java @@ -21,7 +21,6 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.host.Host; import com.cloud.host.HostVO; @@ -67,14 +66,14 @@ public class AgentBasedStandaloneConsoleProxyManager extends AgentBasedConsolePr } if (s_logger.isDebugEnabled()) s_logger.debug("Assign standalone console proxy running at " + allocatedHost.getName() + " to user vm " + userVmId + " with public IP " + - allocatedHost.getPublicIpAddress()); + allocatedHost.getPublicIpAddress()); // only private IP, public IP, host id have meaningful values, rest of all are place-holder values String publicIp = allocatedHost.getPublicIpAddress(); if (publicIp == null) { if (s_logger.isDebugEnabled()) s_logger.debug("Host " + allocatedHost.getName() + "/" + allocatedHost.getPrivateIpAddress() + - " does not have public interface, we will return its private IP for cosole proxy."); + " does not have public interface, we will return its private IP for cosole proxy."); publicIp = allocatedHost.getPrivateIpAddress(); } diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java index 56b4f616135..62777f5b405 100644 --- a/server/src/com/cloud/consoleproxy/AgentHookBase.java +++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java @@ -22,6 +22,11 @@ import java.util.Random; import org.apache.log4j.Logger; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.Answer; @@ -47,11 +52,6 @@ import com.cloud.utils.Ternary; import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.VMInstanceDao; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - /** * Utility class to manage interactions with agent-based console access * Extracted from ConsoleProxyManagerImpl so that other console proxy managers @@ -101,16 +101,17 @@ public abstract class AgentHookBase implements AgentHook { if (!ticket.equals(ticketInUrl)) { Date now = new Date(); // considering of minute round-up - String minuteEarlyTicket = ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId(), new Date(now.getTime() - 60 * 1000)); + String minuteEarlyTicket = + ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId(), new Date(now.getTime() - 60 * 1000)); if (s_logger.isDebugEnabled()) { s_logger.debug("Console authentication. Ticket in 2-minute boundary for " + cmd.getHost() + ":" + cmd.getPort() + "-" + cmd.getVmId() + " is " + - minuteEarlyTicket); + minuteEarlyTicket); } if (!minuteEarlyTicket.equals(ticketInUrl)) { - s_logger.error("Access ticket expired or has been modified. vmId: " + cmd.getVmId() + "ticket in URL: " + ticketInUrl + ", tickets to check against: " + - ticket + "," + minuteEarlyTicket); + s_logger.error("Access ticket expired or has been modified. vmId: " + cmd.getVmId() + "ticket in URL: " + ticketInUrl + + ", tickets to check against: " + ticket + "," + minuteEarlyTicket); return new ConsoleAccessAuthenticationAnswer(cmd, false); } } @@ -161,7 +162,8 @@ public abstract class AgentHookBase implements AgentHook { if (parsedHostInfo.second() != null && parsedHostInfo.third() != null) { - s_logger.info("Re-authentication result. vm: " + vm.getId() + ", tunnel url: " + parsedHostInfo.second() + ", tunnel session: " + parsedHostInfo.third()); + s_logger.info("Re-authentication result. vm: " + vm.getId() + ", tunnel url: " + parsedHostInfo.second() + ", tunnel session: " + + parsedHostInfo.third()); authenticationAnswer.setTunnelUrl(parsedHostInfo.second()); authenticationAnswer.setTunnelSession(parsedHostInfo.third()); @@ -216,7 +218,8 @@ public abstract class AgentHookBase implements AgentHook { s_logger.error("Unrecoverable OutOfMemory Error, exit and let it be re-launched"); System.exit(1); } catch (Exception e) { - s_logger.error("Unexpected exception when sending http handling startup command(time out) to the console proxy resource for proxy:" + startupCmd.getProxyVmId(), e); + s_logger.error( + "Unexpected exception when sending http handling startup command(time out) to the console proxy resource for proxy:" + startupCmd.getProxyVmId(), e); } } diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 1c41890a0a7..f6e742f8eb1 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -118,10 +118,10 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.QueryBuilder; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.events.SubscriptionMgr; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @@ -455,7 +455,8 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy _allocProxyLock.unlock(); } } else { - s_logger.error("Unable to acquire synchronization lock to get/allocate proxy resource for vm :" + vmId + ". Previous console proxy allocation is taking too long"); + s_logger.error("Unable to acquire synchronization lock to get/allocate proxy resource for vm :" + vmId + + ". Previous console proxy allocation is taking too long"); } if (proxy == null) { @@ -716,20 +717,23 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy defaultNetwork = defaultNetworks.get(0); } - List offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork); + List offerings = + _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork); LinkedHashMap networks = new LinkedHashMap(offerings.size() + 1); NicProfile defaultNic = new NicProfile(); defaultNic.setDefaultNic(true); defaultNic.setDeviceId(2); - networks.put(_networkMgr.setupNetwork(systemAcct, _networkOfferingDao.findById(defaultNetwork.getNetworkOfferingId()), plan, null, null, false).get(0), defaultNic); + networks.put(_networkMgr.setupNetwork(systemAcct, _networkOfferingDao.findById(defaultNetwork.getNetworkOfferingId()), plan, null, null, false).get(0), + defaultNic); for (NetworkOffering offering : offerings) { networks.put(_networkMgr.setupNetwork(systemAcct, offering, plan, null, null, false).get(0), null); } - ConsoleProxyVO proxy = new ConsoleProxyVO(id, _serviceOffering.getId(), name, template.getId(), template.getHypervisorType(), template.getGuestOSId(), dataCenterId, - systemAcct.getDomainId(), systemAcct.getId(), 0, _serviceOffering.getOfferHA()); + ConsoleProxyVO proxy = + new ConsoleProxyVO(id, _serviceOffering.getId(), name, template.getId(), template.getHypervisorType(), template.getGuestOSId(), dataCenterId, + systemAcct.getDomainId(), systemAcct.getId(), 0, _serviceOffering.getOfferHA()); proxy.setDynamicallyScalable(template.isDynamicallyScalable()); proxy = _consoleProxyDao.persist(proxy); try { @@ -871,8 +875,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy } return false; } - List l = _consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping, - VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown); + List l = + _consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping, + VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown); String value = _configDao.getValue(Config.ConsoleProxyLaunchMax.key()); int launchLimit = NumbersUtil.parseInt(value, 10); @@ -880,8 +885,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy } private HypervisorType currentHypervisorType(long dcId) { - List l = _consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping, - VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown); + List l = + _consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping, + VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown); return l.size() > 0 ? l.get(0).getHypervisorType() : HypervisorType.Any; } @@ -1280,8 +1286,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy if (_serviceOffering == null || !_serviceOffering.getSystemUse()) { int ramSize = NumbersUtil.parseInt(_configDao.getValue("console.ram.size"), DEFAULT_PROXY_VM_RAMSIZE); int cpuFreq = NumbersUtil.parseInt(_configDao.getValue("console.cpu.mhz"), DEFAULT_PROXY_VM_CPUMHZ); - _serviceOffering = new ServiceOfferingVO("System Offering For Console Proxy", 1, ramSize, cpuFreq, 0, 0, false, null, useLocalStorage, true, null, true, - VirtualMachine.Type.ConsoleProxy, true); + _serviceOffering = + new ServiceOfferingVO("System Offering For Console Proxy", 1, ramSize, cpuFreq, 0, 0, false, null, useLocalStorage, true, null, true, + VirtualMachine.Type.ConsoleProxy, true); _serviceOffering.setUniqueName(ServiceOffering.consoleProxyDefaultOffUniqueName); _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); @@ -1489,7 +1496,8 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy try { _rulesMgr.disableStaticNat(ip.getId(), ctx.getCallingAccount(), ctx.getCallingUserId(), true); } catch (Exception ex) { - s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", ex); + s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", + ex); } } } diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java index 217ace50983..9948f504158 100644 --- a/server/src/com/cloud/dc/DedicatedResourceVO.java +++ b/server/src/com/cloud/dc/DedicatedResourceVO.java @@ -20,7 +20,6 @@ import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; - import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -74,10 +73,12 @@ public class DedicatedResourceVO implements DedicatedResources { this.affinityGroupId = affinityGroupId; } + @Override public long getId() { return id; } + @Override public Long getDataCenterId() { return dataCenterId; } @@ -86,6 +87,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.dataCenterId = dataCenterId; } + @Override public Long getPodId() { return podId; } @@ -94,6 +96,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.podId = podId; } + @Override public Long getClusterId() { return clusterId; } @@ -102,6 +105,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.clusterId = clusterId; } + @Override public Long getHostId() { return hostId; } @@ -114,6 +118,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.id = dedicatedResourceId; } + @Override public Long getDomainId() { return domainId; } @@ -122,6 +127,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.domainId = domainId; } + @Override public Long getAccountId() { return accountId; } @@ -130,6 +136,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.accountId = accountId; } + @Override public String getUuid() { return this.uuid; } @@ -138,6 +145,7 @@ public class DedicatedResourceVO implements DedicatedResources { this.uuid = uuid; } + @Override public long getAffinityGroupId() { return affinityGroupId; } diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java index 62ffb3f5d6e..e7ef2e8cbb1 100644 --- a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java @@ -29,10 +29,9 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {DedicatedResourceDao.class}) diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java index 526eec74ff5..8fad78c219d 100644 --- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -28,6 +28,8 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.affinity.AffinityGroupProcessor; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; @@ -46,8 +48,16 @@ import org.apache.cloudstack.managed.context.ManagedContextTimerTask; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; +import com.cloud.agent.Listener; +import com.cloud.agent.api.AgentControlAnswer; +import com.cloud.agent.api.AgentControlCommand; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.StartupRoutingCommand; +import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.capacity.CapacityManager; import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Config; @@ -68,7 +78,6 @@ import com.cloud.deploy.dao.PlannerHostReservationDao; import com.cloud.exception.AffinityConflictException; import com.cloud.exception.ConnectionException; import com.cloud.exception.InsufficientServerCapacityException; -import com.cloud.exception.PermissionDeniedException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; @@ -100,7 +109,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.StateListener; @@ -109,22 +117,14 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Event; -import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.agent.AgentManager; -import com.cloud.agent.Listener; -import com.cloud.agent.api.AgentControlAnswer; -import com.cloud.agent.api.AgentControlCommand; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.Command; -import com.cloud.agent.api.StartupCommand; -import com.cloud.agent.api.StartupRoutingCommand; -import com.cloud.agent.manager.allocator.HostAllocator; @Local(value = {DeploymentPlanningManager.class}) -public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager, Listener, StateListener { +public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager, Listener, + StateListener { private static final Logger s_logger = Logger.getLogger(DeploymentPlanningManagerImpl.class); @Inject @@ -285,8 +285,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (s_logger.isDebugEnabled()) { s_logger.debug("DeploymentPlanner allocation algorithm: " + planner); - s_logger.debug("Trying to allocate a host and storage pools from dc:" + plan.getDataCenterId() + ", pod:" + plan.getPodId() + ",cluster:" + plan.getClusterId() + - ", requested cpu: " + cpu_requested + ", requested ram: " + ram_requested); + s_logger.debug("Trying to allocate a host and storage pools from dc:" + plan.getDataCenterId() + ", pod:" + plan.getPodId() + ",cluster:" + + plan.getClusterId() + ", requested cpu: " + cpu_requested + ", requested ram: " + ram_requested); s_logger.debug("Is ROOT volume READY (pool already allocated)?: " + (plan.getPoolId() != null ? "Yes" : "No")); } @@ -306,12 +306,13 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } else { if (s_logger.isDebugEnabled()) { s_logger.debug("Looking for suitable pools for this host under zone: " + host.getDataCenterId() + ", pod: " + host.getPodId() + ", cluster: " + - host.getClusterId()); + host.getClusterId()); } // search for storage under the zone, pod, cluster of the host. - DataCenterDeployment lastPlan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), hostIdSpecified, plan.getPoolId(), null, - plan.getReservationContext()); + DataCenterDeployment lastPlan = + new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), hostIdSpecified, plan.getPoolId(), null, + plan.getReservationContext()); Pair>, List> result = findSuitablePoolsForVolumes(vmProfile, lastPlan, avoids, HostAllocator.RETURN_UPTO_ALL); Map> suitableVolumeStoragePools = result.first(); @@ -321,8 +322,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (!suitableVolumeStoragePools.isEmpty()) { List suitableHosts = new ArrayList(); suitableHosts.add(host); - Pair> potentialResources = findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoids, - getPlannerUsage(planner, vmProfile, plan, avoids)); + Pair> potentialResources = + findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoids, getPlannerUsage(planner, vmProfile, plan, avoids)); if (potentialResources != null) { Pod pod = _podDao.findById(host.getPodId()); Cluster cluster = _clusterDao.findById(host.getClusterId()); @@ -351,7 +352,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } else if (avoids.shouldAvoid(host)) { s_logger.debug("The last host of this VM is in avoid set"); } else if (_capacityMgr.checkIfHostReachMaxGuestLimit(host)) { - s_logger.debug("The last Host, hostId: " + host.getId() + " already has max Running VMs(count includes system VMs), skipping this and trying other available hosts"); + s_logger.debug("The last Host, hostId: " + host.getId() + + " already has max Running VMs(count includes system VMs), skipping this and trying other available hosts"); } else { if (host.getStatus() == Status.Up && host.getResourceState() == ResourceState.Enabled) { long cluster_id = host.getClusterId(); @@ -361,11 +363,14 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy Float memoryOvercommitRatio = Float.parseFloat(cluster_detail_ram.getValue()); if (_capacityMgr.checkIfHostHasCapacity(host.getId(), cpu_requested, ram_requested, true, cpuOvercommitRatio, memoryOvercommitRatio, true)) { s_logger.debug("The last host of this VM is UP and has enough capacity"); - s_logger.debug("Now checking for suitable pools under zone: " + host.getDataCenterId() + ", pod: " + host.getPodId() + ", cluster: " + host.getClusterId()); + s_logger.debug("Now checking for suitable pools under zone: " + host.getDataCenterId() + ", pod: " + host.getPodId() + ", cluster: " + + host.getClusterId()); // search for storage under the zone, pod, cluster of // the last host. - DataCenterDeployment lastPlan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), host.getId(), plan.getPoolId(), null); - Pair>, List> result = findSuitablePoolsForVolumes(vmProfile, lastPlan, avoids, HostAllocator.RETURN_UPTO_ALL); + DataCenterDeployment lastPlan = + new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), host.getId(), plan.getPoolId(), null); + Pair>, List> result = + findSuitablePoolsForVolumes(vmProfile, lastPlan, avoids, HostAllocator.RETURN_UPTO_ALL); Map> suitableVolumeStoragePools = result.first(); List readyAndReusedVolumes = result.second(); @@ -373,8 +378,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (!suitableVolumeStoragePools.isEmpty()) { List suitableHosts = new ArrayList(); suitableHosts.add(host); - Pair> potentialResources = findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoids, - getPlannerUsage(planner, vmProfile, plan, avoids)); + Pair> potentialResources = + findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoids, getPlannerUsage(planner, vmProfile, plan, avoids)); if (potentialResources != null) { Pod pod = _podDao.findById(host.getPodId()); Cluster cluster = _clusterDao.findById(host.getClusterId()); @@ -395,7 +400,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } } else { s_logger.debug("The last host of this VM is not UP or is not enabled, host status is: " + host.getStatus().name() + ", host resource state is: " + - host.getResourceState()); + host.getResourceState()); } } s_logger.debug("Cannot choose the last host to deploy this VM "); @@ -409,19 +414,22 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (planner instanceof DeploymentClusterPlanner) { - ExcludeList plannerAvoidInput = new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), - avoids.getPoolsToAvoid()); + ExcludeList plannerAvoidInput = + new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), + avoids.getPoolsToAvoid()); clusterList = ((DeploymentClusterPlanner)planner).orderClusters(vmProfile, plan, avoids); if (clusterList != null && !clusterList.isEmpty()) { // planner refactoring. call allocators to list hosts - ExcludeList plannerAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), - avoids.getHostsToAvoid(), avoids.getPoolsToAvoid()); + ExcludeList plannerAvoidOutput = + new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), + avoids.getPoolsToAvoid()); resetAvoidSet(plannerAvoidOutput, plannerAvoidInput); - dest = checkClustersforDestination(clusterList, vmProfile, plan, avoids, dc, getPlannerUsage(planner, vmProfile, plan, avoids), plannerAvoidOutput); + dest = + checkClustersforDestination(clusterList, vmProfile, plan, avoids, dc, getPlannerUsage(planner, vmProfile, plan, avoids), plannerAvoidOutput); if (dest != null) { return dest; } @@ -560,7 +568,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (hostResourceType == resourceUsageRequired) { return true; } else { - s_logger.debug("Cannot use this host for usage: " + resourceUsageRequired + ", since this host has been reserved for planner usage : " + hostResourceType); + s_logger.debug("Cannot use this host for usage: " + resourceUsageRequired + ", since this host has been reserved for planner usage : " + + hostResourceType); return false; } } else { @@ -586,7 +595,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy return true; } else { s_logger.debug("Cannot use this host for usage: " + resourceUsageRequired + ", since this host has been reserved for planner usage : " + - hostResourceTypeFinal); + hostResourceTypeFinal); return false; } } @@ -773,8 +782,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy @Override public void onPublishMessage(String senderAddress, String subject, Object obj) { VMInstanceVO vm = ((VMInstanceVO)obj); - s_logger.debug("MessageBus message: host reserved capacity released for VM: " + vm.getLastHostId() + ", checking if host reservation can be released for host:" + - vm.getLastHostId()); + s_logger.debug("MessageBus message: host reserved capacity released for VM: " + vm.getLastHostId() + + ", checking if host reservation can be released for host:" + vm.getLastHostId()); Long hostId = vm.getLastHostId(); checkHostReservationRelease(hostId); } @@ -849,8 +858,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy s_logger.debug("Checking resources in Cluster: " + clusterId + " under Pod: " + clusterVO.getPodId()); // search for resources(hosts and storage) under this zone, pod, // cluster. - DataCenterDeployment potentialPlan = new DataCenterDeployment(plan.getDataCenterId(), clusterVO.getPodId(), clusterVO.getId(), null, plan.getPoolId(), null, - plan.getReservationContext()); + DataCenterDeployment potentialPlan = + new DataCenterDeployment(plan.getDataCenterId(), clusterVO.getPodId(), clusterVO.getId(), null, plan.getPoolId(), null, plan.getReservationContext()); // find suitable hosts under this cluster, need as many hosts as we // get. @@ -864,14 +873,15 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy return dest; } - Pair>, List> result = findSuitablePoolsForVolumes(vmProfile, potentialPlan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); + Pair>, List> result = + findSuitablePoolsForVolumes(vmProfile, potentialPlan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL); Map> suitableVolumeStoragePools = result.first(); List readyAndReusedVolumes = result.second(); // choose the potential host and pool for the VM if (!suitableVolumeStoragePools.isEmpty()) { - Pair> potentialResources = findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoid, - resourceUsageRequired); + Pair> potentialResources = + findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools, avoid, resourceUsageRequired); if (potentialResources != null) { Pod pod = _podDao.findById(clusterVO.getPodId()); @@ -903,8 +913,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy private boolean canAvoidCluster(Cluster clusterVO, ExcludeList avoids, ExcludeList plannerAvoidOutput, VirtualMachineProfile vmProfile) { - ExcludeList allocatorAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), - avoids.getPoolsToAvoid()); + ExcludeList allocatorAvoidOutput = + new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), avoids.getPoolsToAvoid()); // remove any hosts/pools that the planners might have added // to get the list of hosts/pools that Allocators flagged as 'avoid' @@ -915,7 +925,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy // pass, then put the cluster in avoid set. boolean avoidAllHosts = true, avoidAllPools = true; - List allhostsInCluster = _hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, clusterVO.getId(), clusterVO.getPodId(), clusterVO.getDataCenterId(), null); + List allhostsInCluster = + _hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, clusterVO.getId(), clusterVO.getPodId(), clusterVO.getDataCenterId(), null); for (HostVO host : allhostsInCluster) { if (!allocatorAvoidOutput.shouldAvoid(host)) { // there's some host in the cluster that is not yet in avoid set @@ -954,7 +965,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (vmRequiresLocalStorege) { // check local pools - List allLocalPoolsInCluster = _storagePoolDao.findLocalStoragePoolsByTags(clusterVO.getDataCenterId(), clusterVO.getPodId(), clusterVO.getId(), null); + List allLocalPoolsInCluster = + _storagePoolDao.findLocalStoragePoolsByTags(clusterVO.getDataCenterId(), clusterVO.getPodId(), clusterVO.getId(), null); for (StoragePoolVO pool : allLocalPoolsInCluster) { if (!allocatorAvoidOutput.shouldAvoid(pool)) { // there's some pool in the cluster that is not yet @@ -1048,7 +1060,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } } if (hostCanAccessPool && haveEnoughSpace && checkIfHostFitsPlannerUsage(potentialHost.getId(), resourceUsageRequired)) { - s_logger.debug("Found a potential host " + "id: " + potentialHost.getId() + " name: " + potentialHost.getName() + " and associated storage pools for this VM"); + s_logger.debug("Found a potential host " + "id: " + potentialHost.getId() + " name: " + potentialHost.getName() + + " and associated storage pools for this VM"); return new Pair>(potentialHost, storage); } else { avoid.addHost(potentialHost.getId()); @@ -1085,8 +1098,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy return suitableHosts; } - protected Pair>, List> - findSuitablePoolsForVolumes(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { + protected Pair>, List> findSuitablePoolsForVolumes(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, + int returnUpTo) { List volumesTobeCreated = _volsDao.findUsableVolumesForInstance(vmProfile.getId()); Map> suitableVolumeStoragePools = new HashMap>(); List readyAndReusedVolumes = new ArrayList(); @@ -1287,8 +1300,9 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } if (saveReservation) { - VMReservationVO vmReservation = new VMReservationVO(vm.getId(), plannedDestination.getDataCenter().getId(), plannedDestination.getPod().getId(), - plannedDestination.getCluster().getId(), plannedDestination.getHost().getId()); + VMReservationVO vmReservation = + new VMReservationVO(vm.getId(), plannedDestination.getDataCenter().getId(), plannedDestination.getPod().getId(), plannedDestination.getCluster() + .getId(), plannedDestination.getHost().getId()); Map volumeReservationMap = new HashMap(); if (vm.getHypervisorType() != HypervisorType.BareMetal) { diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 8080423f140..ec817c1871a 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -17,58 +17,39 @@ package com.cloud.deploy; import java.util.ArrayList; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeSet; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.log4j.Logger; - -import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityManager; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Config; import com.cloud.dc.ClusterDetailsDao; -import com.cloud.dc.ClusterDetailsVO; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; -import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; -import com.cloud.dc.Pod; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; -import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.exception.InsufficientServerCapacityException; -import com.cloud.host.Host; -import com.cloud.host.HostVO; -import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.offering.ServiceOffering; -import com.cloud.org.Cluster; -import com.cloud.org.Grouping; -import com.cloud.resource.ResourceState; -import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.StorageManager; -import com.cloud.storage.StoragePool; -import com.cloud.storage.StoragePoolHostVO; -import com.cloud.storage.Volume; -import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.GuestOSCategoryDao; import com.cloud.storage.dao.GuestOSDao; @@ -77,7 +58,6 @@ import com.cloud.storage.dao.VolumeDao; import com.cloud.user.AccountManager; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.vm.DiskProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @@ -297,9 +277,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla return; } if (capacity == Capacity.CAPACITY_TYPE_CPU) { - clustersCrossingThreshold = _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterCPUCapacityDisableThreshold.key(), cpu_requested); + clustersCrossingThreshold = + _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterCPUCapacityDisableThreshold.key(), cpu_requested); } else if (capacity == Capacity.CAPACITY_TYPE_MEMORY) { - clustersCrossingThreshold = _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterMemoryCapacityDisableThreshold.key(), ram_requested); + clustersCrossingThreshold = + _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterMemoryCapacityDisableThreshold.key(), ram_requested); } if (clustersCrossingThreshold != null && clustersCrossingThreshold.size() != 0) { @@ -309,7 +291,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla clusterListForVmAllocation.removeAll(clustersCrossingThreshold); s_logger.debug("Cannot allocate cluster list " + clustersCrossingThreshold.toString() + " for vm creation since their allocated percentage" + - " crosses the disable capacity threshold defined at each cluster/ at global value for capacity Type : " + capacity + ", skipping these clusters"); + " crosses the disable capacity threshold defined at each cluster/ at global value for capacity Type : " + capacity + ", skipping these clusters"); } } @@ -375,7 +357,8 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla * other than the capacity based ordering which is done by default. * @return List ordered list of Cluster Ids */ - protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, DeploymentPlan plan) { + protected List reorderClusters(long id, boolean isZone, Pair, Map> clusterCapacityInfo, VirtualMachineProfile vmProfile, + DeploymentPlan plan) { List reordersClusterIds = clusterCapacityInfo.first(); return reordersClusterIds; } @@ -414,12 +397,12 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla //we need clusters having enough cpu AND RAM to host this particular VM and order them by aggregate cluster capacity if (s_logger.isDebugEnabled()) { s_logger.debug("Listing clusters in order of aggregate capacity, that have (atleast one host with) enough CPU and RAM capacity under this " + - (isZone ? "Zone: " : "Pod: ") + id); + (isZone ? "Zone: " : "Pod: ") + id); } String capacityTypeToOrder = _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()); - short capacityType = CapacityVO.CAPACITY_TYPE_CPU; + short capacityType = Capacity.CAPACITY_TYPE_CPU; if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) { - capacityType = CapacityVO.CAPACITY_TYPE_MEMORY; + capacityType = Capacity.CAPACITY_TYPE_MEMORY; } List clusterIdswithEnoughCapacity = _capacityDao.listClustersInZoneOrPodByHostCapacities(id, requiredCpu, requiredRam, capacityType, isZone); @@ -451,9 +434,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla s_logger.debug("Listing pods in order of aggregate capacity, that have (atleast one host with) enough CPU and RAM capacity under this Zone: " + zoneId); } String capacityTypeToOrder = _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()); - short capacityType = CapacityVO.CAPACITY_TYPE_CPU; + short capacityType = Capacity.CAPACITY_TYPE_CPU; if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) { - capacityType = CapacityVO.CAPACITY_TYPE_MEMORY; + capacityType = Capacity.CAPACITY_TYPE_MEMORY; } List podIdswithEnoughCapacity = _capacityDao.listPodsByHostCapacities(zoneId, requiredCpu, requiredRam, capacityType); diff --git a/server/src/com/cloud/deploy/PlannerHostReservationVO.java b/server/src/com/cloud/deploy/PlannerHostReservationVO.java index 481863472a0..9210d528aea 100644 --- a/server/src/com/cloud/deploy/PlannerHostReservationVO.java +++ b/server/src/com/cloud/deploy/PlannerHostReservationVO.java @@ -24,6 +24,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; + import org.apache.cloudstack.api.InternalIdentity; import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage; diff --git a/server/src/com/cloud/event/ActionEventInterceptor.java b/server/src/com/cloud/event/ActionEventInterceptor.java index ebfb79d5d0e..275c2d07dac 100644 --- a/server/src/com/cloud/event/ActionEventInterceptor.java +++ b/server/src/com/cloud/event/ActionEventInterceptor.java @@ -22,6 +22,7 @@ import java.util.List; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; + import org.apache.cloudstack.context.CallContext; import com.cloud.utils.component.ComponentMethodInterceptor; @@ -92,7 +93,8 @@ public class ActionEventInterceptor implements ComponentMethodInterceptor, Metho if (actionEvent.create()) { //This start event has to be used for subsequent events of this action - startEventId = ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_INFO, eventType, "Successfully created entity for " + eventDescription); + startEventId = + ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_INFO, eventType, "Successfully created entity for " + eventDescription); ctx.setStartEventId(startEventId); } else { ActionEventUtils.onCompletedActionEvent(userId, accountId, EventVO.LEVEL_INFO, eventType, "Successfully completed " + eventDescription, startEventId); @@ -114,7 +116,8 @@ public class ActionEventInterceptor implements ComponentMethodInterceptor, Metho return; if (actionEvent.create()) { - long eventId = ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_ERROR, eventType, "Error while creating entity for " + eventDescription); + long eventId = + ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_ERROR, eventType, "Error while creating entity for " + eventDescription); ctx.setStartEventId(eventId); } else { ActionEventUtils.onCompletedActionEvent(userId, accountId, EventVO.LEVEL_ERROR, eventType, "Error while " + eventDescription, startEventId); diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java index e905c4b0684..eba68746832 100755 --- a/server/src/com/cloud/event/ActionEventUtils.java +++ b/server/src/com/cloud/event/ActionEventUtils.java @@ -27,12 +27,14 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.beans.factory.NoSuchBeanDefinitionException; + import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.events.EventBus; import org.apache.cloudstack.framework.events.EventBusException; import com.cloud.event.dao.EventDao; import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; import com.cloud.user.Account; import com.cloud.user.AccountVO; import com.cloud.user.User; @@ -136,7 +138,8 @@ public class ActionEventUtils { return event.getId(); } - private static Event persistActionEvent(Long userId, Long accountId, Long domainId, String level, String type, Event.State state, String description, Long startEventId) { + private static Event persistActionEvent(Long userId, Long accountId, Long domainId, String level, String type, Event.State state, String description, + Long startEventId) { EventVO event = new EventVO(); event.setUserId(userId); event.setAccountId(accountId); @@ -174,8 +177,8 @@ public class ActionEventUtils { entityUuid = (String)context.getContextParameter(EntityUuid); } - org.apache.cloudstack.framework.events.Event event = new org.apache.cloudstack.framework.events.Event(ManagementServer.Name, eventCategory, eventType, - EventTypes.getEntityForEvent(eventType), null); + org.apache.cloudstack.framework.events.Event event = + new org.apache.cloudstack.framework.events.Event(ManagementService.Name, eventCategory, eventType, EventTypes.getEntityForEvent(eventType), null); Map eventDescription = new HashMap(); Account account = _accountDao.findById(accountId); diff --git a/server/src/com/cloud/event/AlertGenerator.java b/server/src/com/cloud/event/AlertGenerator.java index d2cf9381f54..2103a1488ba 100644 --- a/server/src/com/cloud/event/AlertGenerator.java +++ b/server/src/com/cloud/event/AlertGenerator.java @@ -17,24 +17,28 @@ package com.cloud.event; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.PostConstruct; +import javax.inject.Inject; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.framework.events.EventBus; +import org.apache.cloudstack.framework.events.EventBusException; + import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; import com.cloud.utils.component.ComponentContext; -import org.apache.cloudstack.framework.events.EventBus; -import org.apache.cloudstack.framework.events.EventBusException; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.text.SimpleDateFormat; @Component public class AlertGenerator { @@ -65,8 +69,8 @@ public class AlertGenerator { return; // no provider is configured to provide events bus, so just return } - org.apache.cloudstack.framework.events.Event event = new org.apache.cloudstack.framework.events.Event(ManagementServer.Name, EventCategory.ALERT_EVENT.getName(), - alertType, null, null); + org.apache.cloudstack.framework.events.Event event = + new org.apache.cloudstack.framework.events.Event(ManagementService.Name, EventCategory.ALERT_EVENT.getName(), alertType, null, null); Map eventDescription = new HashMap(); DataCenterVO dc = _dcDao.findById(dataCenterId); diff --git a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java index b48783e35d5..313c3725148 100644 --- a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java +++ b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java @@ -16,19 +16,17 @@ // under the License. package com.cloud.event.dao; -import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.api.response.EventResponse; import com.cloud.api.ApiResponseHelper; import com.cloud.api.query.vo.EventJoinVO; - -import org.apache.cloudstack.api.response.EventResponse; -import org.springframework.stereotype.Component; - import com.cloud.event.Event; import com.cloud.event.Event.State; import com.cloud.utils.db.Filter; diff --git a/server/src/com/cloud/ha/HaWorkVO.java b/server/src/com/cloud/ha/HaWorkVO.java index 7b0bce34acb..f5a36e3bb1a 100644 --- a/server/src/com/cloud/ha/HaWorkVO.java +++ b/server/src/com/cloud/ha/HaWorkVO.java @@ -29,12 +29,13 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.ha.HighAvailabilityManager.Step; import com.cloud.ha.HighAvailabilityManager.WorkType; import com.cloud.utils.db.GenericDao; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "op_ha_work") @@ -88,6 +89,7 @@ public class HaWorkVO implements InternalIdentity { protected HaWorkVO() { } + @Override public long getId() { return id; } diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java index b0f1b0bed81..5d975fe0feb 100644 --- a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable; import com.cloud.alert.AlertManager; import com.cloud.usage.dao.UsageJobDao; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Local(value = {HighAvailabilityManager.class}) diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index 2e686fa2f05..fc65a215c97 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -31,6 +31,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.apache.log4j.NDC; + import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContext; @@ -243,7 +244,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName(); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Host is down, " + hostDesc, "Host [" + hostDesc + "] is down." + - ((sb != null) ? sb.toString() : "")); + ((sb != null) ? sb.toString() : "")); for (final VMInstanceVO vm : vms) { if (s_logger.isDebugEnabled()) { @@ -328,10 +329,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai if (!(_forceHA || vm.isHaEnabled())) { String hostDesc = "id:" + vm.getHostId() + ", availability zone id:" + vm.getDataCenterId() + ", pod id:" + vm.getPodIdToDeployIn(); _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "VM (name: " + vm.getHostName() + ", id: " + vm.getId() + - ") stopped unexpectedly on host " + hostDesc, "Virtual Machine " + vm.getHostName() + - " (id: " + vm.getId() + - ") running on host [" + vm.getHostId() + - "] stopped unexpectedly."); + ") stopped unexpectedly on host " + hostDesc, "Virtual Machine " + vm.getHostName() + " (id: " + vm.getId() + ") running on host [" + vm.getHostId() + + "] stopped unexpectedly."); if (s_logger.isDebugEnabled()) { s_logger.debug("VM is not HA enabled so we're done."); @@ -366,8 +365,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai } } - HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled, hostId, vm.getState(), maxRetries + 1, - vm.getUpdated()); + HaWorkVO work = + new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled, hostId, vm.getState(), maxRetries + 1, vm.getUpdated()); _haDao.persist(work); if (s_logger.isInfoEnabled()) { @@ -412,7 +411,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai s_logger.info("HA on " + vm); if (vm.getState() != work.getPreviousState() || vm.getUpdated() != work.getUpdateTime()) { s_logger.info("VM " + vm + " has been changed. Current State = " + vm.getState() + " Previous State = " + work.getPreviousState() + " last updated = " + - vm.getUpdated() + " previous updated = " + work.getUpdateTime()); + vm.getUpdated() + " previous updated = " + work.getUpdateTime()); return null; } @@ -484,9 +483,9 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai if (!fenced) { s_logger.debug("We were unable to fence off the VM " + vm); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + - hostDesc, "Insufficient capacity to restart VM, name: " + vm.getHostName() + - ", id: " + vmId + " which was running on host " + hostDesc); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + + " which was running on host " + hostDesc, "Insufficient capacity to restart VM, name: " + vm.getHostName() + ", id: " + vmId + + " which was running on host " + hostDesc); return (System.currentTimeMillis() >> 10) + _restartRetryInterval; } @@ -561,20 +560,20 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai } } catch (final InsufficientCapacityException e) { s_logger.warn("Unable to restart " + vm.toString() + " due to " + e.getMessage()); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + hostDesc, - "Insufficient capacity to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + + hostDesc, "Insufficient capacity to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); } catch (final ResourceUnavailableException e) { s_logger.warn("Unable to restart " + vm.toString() + " due to " + e.getMessage()); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + hostDesc, - "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + + hostDesc, "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); } catch (ConcurrentOperationException e) { s_logger.warn("Unable to restart " + vm.toString() + " due to " + e.getMessage()); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + hostDesc, - "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + + hostDesc, "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); } catch (OperationTimedoutException e) { s_logger.warn("Unable to restart " + vm.toString() + " due to " + e.getMessage()); - _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + hostDesc, - "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), "Unable to restart " + vm.getHostName() + " which was running on host " + + hostDesc, "The Storage is unavailable for trying to restart VM, name: " + vm.getHostName() + ", id: " + vmId + " which was running on host " + hostDesc); } vm = _itMgr.findById(vm.getId()); work.setUpdateTime(vm.getUpdated()); @@ -663,8 +662,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai } else if (work.getWorkType() == WorkType.CheckStop) { if ((vm.getState() != work.getPreviousState()) || vm.getUpdated() != work.getUpdateTime() || vm.getHostId() == null || vm.getHostId().longValue() != work.getHostId()) { - s_logger.info(vm + " is different now. Scheduled Host: " + work.getHostId() + " Current Host: " + (vm.getHostId() != null ? vm.getHostId() : "none") + - " State: " + vm.getState()); + s_logger.info(vm + " is different now. Scheduled Host: " + work.getHostId() + " Current Host: " + + (vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState()); return null; } _itMgr.advanceStop(vm.getUuid(), false); @@ -673,8 +672,8 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai } else if (work.getWorkType() == WorkType.ForceStop) { if ((vm.getState() != work.getPreviousState()) || vm.getUpdated() != work.getUpdateTime() || vm.getHostId() == null || vm.getHostId().longValue() != work.getHostId()) { - s_logger.info(vm + " is different now. Scheduled Host: " + work.getHostId() + " Current Host: " + (vm.getHostId() != null ? vm.getHostId() : "none") + - " State: " + vm.getState()); + s_logger.info(vm + " is different now. Scheduled Host: " + work.getHostId() + " Current Host: " + + (vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState()); return null; } _itMgr.advanceStop(vm.getUuid(), true); diff --git a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java index 5a873d9d70f..95e803f54ac 100644 --- a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java +++ b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java @@ -93,7 +93,8 @@ public class ManagementIPSystemVMInvestigator extends AbstractInvestigatorImpl { Status vmHostState = testIpAddress(otherHost, vmHost.getPrivateIpAddress()); if ((vmHostState != null) && (vmHostState == Status.Up)) { if (s_logger.isDebugEnabled()) { - s_logger.debug("successfully pinged vm's host IP (" + vmHost.getPrivateIpAddress() + "), but could not ping VM, returning that the VM is down"); + s_logger.debug("successfully pinged vm's host IP (" + vmHost.getPrivateIpAddress() + + "), but could not ping VM, returning that the VM is down"); } return Boolean.FALSE; } diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index 08d2b20193d..d6f72790f93 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -126,7 +126,8 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl { } if (hostState == Status.Up) { if (s_logger.isDebugEnabled()) { - s_logger.debug("ping from (" + hostId + ") to agent's host ip address (" + agent.getPrivateIpAddress() + ") successful, returning that agent is disconnected"); + s_logger.debug("ping from (" + hostId + ") to agent's host ip address (" + agent.getPrivateIpAddress() + + ") successful, returning that agent is disconnected"); } return Status.Disconnected; // the computing host ip is ping-able, but the computing agent is down, report that the agent is disconnected } else if (hostState == Status.Down) { @@ -170,7 +171,7 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl { if (pingTestAnswer != null && pingTestAnswer.getResult()) { if (s_logger.isDebugEnabled()) { s_logger.debug("user vm's " + vm.getHostName() + " ip address " + privateIp + " has been successfully pinged from the Virtual Router " + - router.getHostName() + ", returning that vm is alive"); + router.getHostName() + ", returning that vm is alive"); } return Boolean.TRUE; } diff --git a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java index 25383a61ea8..c0da88396c9 100644 --- a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java +++ b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java @@ -32,7 +32,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java index 54eb41fb705..e7c38c911d0 100755 --- a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java +++ b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java @@ -23,11 +23,12 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.ResourceDetail; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.ResourceDetail; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.agent.AgentManager; import com.cloud.agent.StartupCommandProcessor; import com.cloud.agent.api.StartupCommand; @@ -184,7 +185,7 @@ public class CloudZonesStartupProcessor extends AdapterBase implements StartupCo } if (currentCountOfHosts >= maxHosts) { throw new AgentAuthnException("Number of running Routing hosts in the Zone:" + zone.getName() + " is already at the max limit:" + maxHosts + - ", cannot start one more host"); + ", cannot start one more host"); } } diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java index 38244a3508b..aa0fa590a47 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java @@ -38,8 +38,8 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicSecondaryIpDao; -import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.dao.UserVmDetailsDao; +import com.cloud.vm.dao.VMInstanceDao; public abstract class HypervisorGuruBase extends AdapterBase implements HypervisorGuru { @@ -100,8 +100,9 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis Long minMemory = (long)(offering.getRamSize() / vmProfile.getMemoryOvercommitRatio()); int minspeed = (int)(offering.getSpeed() / vmProfile.getCpuOvercommitRatio()); int maxspeed = (offering.getSpeed()); - VirtualMachineTO to = new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), minspeed, maxspeed, minMemory * 1024l * 1024l, - offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.limitCpuUse(), vm.getVncPassword()); + VirtualMachineTO to = + new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), minspeed, maxspeed, minMemory * 1024l * 1024l, + offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.limitCpuUse(), vm.getVncPassword()); to.setBootArgs(vmProfile.getBootArgs()); List nicProfiles = vmProfile.getNics(); diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java index 2c7a7611e2e..ade1b9677ac 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.hypervisor; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -24,18 +23,14 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import com.cloud.utils.Pair; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.agent.api.Command; -import com.cloud.host.Host; -import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; @Component diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java index 296b5683e4c..33548c8ba0a 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java @@ -48,8 +48,9 @@ public class KvmDummyResourceBase extends ServerResourceBase implements ServerRe @Override public StartupCommand[] initialize() { - StartupRoutingCommand cmd = new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.KVM, new HashMap(), new HashMap(), - new HashMap()); + StartupRoutingCommand cmd = + new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.KVM, new HashMap(), new HashMap(), + new HashMap()); cmd.setDataCenter(_zoneId); cmd.setPod(_podId); cmd.setCluster(_clusterId); diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 97a7e31d115..cf552044396 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -16,20 +16,23 @@ // under the License. package com.cloud.hypervisor.kvm.discoverer; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.resource.Discoverer; +import javax.ejb.Local; + import org.apache.log4j.Logger; -import javax.ejb.Local; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.resource.Discoverer; @Local(value = Discoverer.class) public class KvmServerDiscoverer extends LibvirtServerDiscoverer { private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class); + @Override public Hypervisor.HypervisorType getHypervisorType() { return Hypervisor.HypervisorType.KVM; } + @Override protected String getPatchPath() { return "scripts/vm/hypervisor/kvm/"; } diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java index 570ab448a98..da1bb88bbba 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java @@ -82,6 +82,7 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements @Inject NetworkModel _networkMgr; + @Override public abstract Hypervisor.HypervisorType getHypervisorType(); @Override @@ -131,8 +132,8 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements } @Override - public Map> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) - throws DiscoveryException { + public Map> + find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) throws DiscoveryException { ClusterVO cluster = _clusterDao.findById(clusterId); if (cluster == null || cluster.getHypervisorType() != getHypervisorType()) { @@ -360,8 +361,8 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements String hostOsInCluster = oneHost.getDetail("Host.OS"); String hostOs = ssCmd.getHostDetails().get("Host.OS"); if (!hostOsInCluster.equalsIgnoreCase(hostOs)) { - throw new IllegalArgumentException("Can't add host: " + firstCmd.getPrivateIpAddress() + " with hostOS: " + hostOs + " into a cluster," + "in which there are " + - hostOsInCluster + " hosts added"); + throw new IllegalArgumentException("Can't add host: " + firstCmd.getPrivateIpAddress() + " with hostOS: " + hostOs + " into a cluster," + + "in which there are " + hostOsInCluster + " hosts added"); } } diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java index ba33c52a1e9..dff89c8932a 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java @@ -16,16 +16,18 @@ // under the License. package com.cloud.hypervisor.kvm.discoverer; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.resource.Discoverer; +import javax.ejb.Local; + import org.apache.log4j.Logger; -import javax.ejb.Local; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.resource.Discoverer; @Local(value = Discoverer.class) public class LxcServerDiscoverer extends LibvirtServerDiscoverer { private static final Logger s_logger = Logger.getLogger(LxcServerDiscoverer.class); + @Override public Hypervisor.HypervisorType getHypervisorType() { return Hypervisor.HypervisorType.LXC; } diff --git a/server/src/com/cloud/keystore/KeystoreManagerImpl.java b/server/src/com/cloud/keystore/KeystoreManagerImpl.java index 60badc16629..2b798fe094c 100644 --- a/server/src/com/cloud/keystore/KeystoreManagerImpl.java +++ b/server/src/com/cloud/keystore/KeystoreManagerImpl.java @@ -24,13 +24,11 @@ import java.security.cert.CertificateException; import java.security.spec.InvalidKeySpecException; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.ejb.Local; import javax.inject.Inject; -import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -72,7 +70,8 @@ public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager @Override public void saveCertificate(String name, String certificate, String key, String domainSuffix) { - if (name == null || name.isEmpty() || certificate == null || certificate.isEmpty() || key == null || key.isEmpty() || domainSuffix == null || domainSuffix.isEmpty()) + if (name == null || name.isEmpty() || certificate == null || certificate.isEmpty() || key == null || key.isEmpty() || domainSuffix == null || + domainSuffix.isEmpty()) throw new CloudRuntimeException("invalid parameter in saveCerticate"); _ksDao.save(name, certificate, key, domainSuffix); diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java index f85665ee78e..68597840c53 100644 --- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java +++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java @@ -24,14 +24,15 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.ResourceDetail; import org.apache.cloudstack.resourcedetail.ResourceDetailsDao; import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao; import org.apache.cloudstack.resourcedetail.dao.RemoteAccessVpnDetailsDao; import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.dao.DataCenterDetailsDao; import com.cloud.event.ActionEvent; @@ -81,7 +82,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource @Inject RemoteAccessVpnDetailsDao _vpnDetailsDao; - private static Map> _daoMap = new HashMap>(); + private static Map> _daoMap = + new HashMap>(); @Override public boolean configure(String name, Map params) throws ConfigurationException { diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java index e9d8d0f5071..67ff77388bf 100644 --- a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java +++ b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java @@ -31,6 +31,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; @@ -255,8 +256,8 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter String publicIp = _networkModel.getIp(lb.getSourceIpAddressId()).getAddress().addr(); DataCenterVO zone = _dcDao.findById(network.getDataCenterId()); - String statsEntryIdentifier = "account " + account.getAccountName() + ", zone " + zone.getName() + ", network ID " + networkId + ", host ID " + - externalLoadBalancer.getName(); + String statsEntryIdentifier = + "account " + account.getAccountName() + ", zone " + zone.getName() + ", network ID " + networkId + ", host ID " + externalLoadBalancer.getName(); long newCurrentBytesSent = 0; long newCurrentBytesReceived = 0; @@ -306,8 +307,9 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter long oldNetBytesReceived = userStats.getNetBytesReceived(); long oldCurrentBytesSent = userStats.getCurrentBytesSent(); long oldCurrentBytesReceived = userStats.getCurrentBytesReceived(); - String warning = "Received an external network stats byte count that was less than the stored value. Zone ID: " + userStats.getDataCenterId() + - ", account ID: " + userStats.getAccountId() + "."; + String warning = + "Received an external network stats byte count that was less than the stored value. Zone ID: " + userStats.getDataCenterId() + ", account ID: " + + userStats.getAccountId() + "."; userStats.setCurrentBytesSent(newCurrentBytesSent); if (oldCurrentBytesSent > newCurrentBytesSent) { @@ -487,8 +489,9 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter long oldNetBytesReceived = userStats.getNetBytesReceived(); long oldCurrentBytesSent = userStats.getCurrentBytesSent(); long oldCurrentBytesReceived = userStats.getCurrentBytesReceived(); - String warning = "Received an external network stats byte count that was less than the stored value. Zone ID: " + userStats.getDataCenterId() + ", account ID: " + - userStats.getAccountId() + "."; + String warning = + "Received an external network stats byte count that was less than the stored value. Zone ID: " + userStats.getDataCenterId() + ", account ID: " + + userStats.getAccountId() + "."; userStats.setCurrentBytesSent(newCurrentBytesSent); if (oldCurrentBytesSent > newCurrentBytesSent) { @@ -517,12 +520,14 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter } // Updates an existing stats entry with new data from the specified usage answer. - private boolean updateStatsEntry(long accountId, long zoneId, long networkId, String publicIp, long hostId, ExternalNetworkResourceUsageAnswer answer, boolean inline) { + private boolean updateStatsEntry(long accountId, long zoneId, long networkId, String publicIp, long hostId, ExternalNetworkResourceUsageAnswer answer, + boolean inline) { AccountVO account = _accountDao.findById(accountId); DataCenterVO zone = _dcDao.findById(zoneId); NetworkVO network = _networkDao.findById(networkId); HostVO host = _hostDao.findById(hostId); - String statsEntryIdentifier = "account " + account.getAccountName() + ", zone " + zone.getName() + ", network ID " + networkId + ", host ID " + host.getName(); + String statsEntryIdentifier = + "account " + account.getAccountName() + ", zone " + zone.getName() + ", network ID " + networkId + ", host ID " + host.getName(); long newCurrentBytesSent = 0; long newCurrentBytesReceived = 0; diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java index 38d6ac51d86..15974311c7a 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java @@ -26,6 +26,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.response.ExternalFirewallResponse; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -187,7 +188,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl @Override @DB - public ExternalFirewallDeviceVO addExternalFirewall(long physicalNetworkId, String url, String username, String password, final String deviceName, ServerResource resource) { + public ExternalFirewallDeviceVO addExternalFirewall(long physicalNetworkId, String url, String username, String password, final String deviceName, + ServerResource resource) { String guid; PhysicalNetworkVO pNetwork = null; NetworkDevice ntwkDevice = NetworkDevice.getNetworkDevice(deviceName); @@ -195,7 +197,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if ((ntwkDevice == null) || (url == null) || (username == null) || (resource == null) || (password == null)) { throw new InvalidParameterValueException("Atleast one of the required parameters (url, username, password," - + " server resource, zone id/physical network id) is not specified or a valid parameter."); + + " server resource, zone id/physical network id) is not specified or a valid parameter."); } pNetwork = _physicalNetworkDao.findById(physicalNetworkId); @@ -204,13 +206,14 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl } zoneId = pNetwork.getDataCenterId(); - final PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder()); + final PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { - throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + physicalNetworkId + - "to add this device"); + throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + + physicalNetworkId + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { - throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is not added or in shutdown state in the physical network: " + - physicalNetworkId + "to add this device"); + throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + + " is not added or in shutdown state in the physical network: " + physicalNetworkId + "to add this device"); } URI uri; @@ -249,15 +252,17 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl return Transaction.execute(new TransactionCallback() { @Override public ExternalFirewallDeviceVO doInTransaction(TransactionStatus status) { - boolean dedicatedUse = (configParams.get(ApiConstants.FIREWALL_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.FIREWALL_DEVICE_DEDICATED)) + boolean dedicatedUse = + (configParams.get(ApiConstants.FIREWALL_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.FIREWALL_DEVICE_DEDICATED)) : false; long capacity = NumbersUtil.parseLong(configParams.get(ApiConstants.FIREWALL_DEVICE_CAPACITY), 0); if (capacity == 0) { capacity = _defaultFwCapacity; } - ExternalFirewallDeviceVO fwDevice = new ExternalFirewallDeviceVO(externalFirewall.getId(), pNetworkFinal.getId(), ntwkSvcProvider.getProviderName(), - deviceName, capacity, dedicatedUse); + ExternalFirewallDeviceVO fwDevice = + new ExternalFirewallDeviceVO(externalFirewall.getId(), pNetworkFinal.getId(), ntwkSvcProvider.getProviderName(), deviceName, capacity, + dedicatedUse); _externalFirewallDeviceDao.persist(fwDevice); @@ -318,7 +323,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl throw new InvalidParameterValueException("Atleast one of ther required parameter physical networkId, device name is missing or invalid."); } - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), fwNetworkDevice.getNetworkServiceProvder()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), fwNetworkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { return null; } @@ -449,7 +455,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl ExternalFirewallDeviceVO fwDeviceVO = getExternalFirewallForNetwork(network); if (fwDeviceVO == null) { s_logger.warn("Network shutdown requested on external firewall element, which did not implement the network." - + " Either network implement failed half way through or already network shutdown is completed."); + + " Either network implement failed half way through or already network shutdown is completed."); return true; } externalFirewall = _hostDao.findById(fwDeviceVO.getHostId()); @@ -508,7 +514,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (answer == null || !answer.getResult()) { String action = add ? "implement" : "shutdown"; String answerDetails = (answer != null) ? answer.getDetails() : "answer was null"; - String msg = "External firewall was unable to " + action + " the guest network on the external firewall in zone " + zone.getName() + " due to " + answerDetails; + String msg = + "External firewall was unable to " + action + " the guest network on the external firewall in zone " + zone.getName() + " due to " + answerDetails; s_logger.error(msg); if (!add && (!reservedIpAddressesForGuestNetwork.contains(network.getGateway()))) { // If we failed the implementation as well, then just return, no complain @@ -547,8 +554,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl } String action = add ? "implemented" : "shut down"; - s_logger.debug("External firewall has " + action + " the guest network for account " + account.getAccountName() + "(id = " + account.getAccountId() + ") with VLAN tag " + - guestVlanTag); + s_logger.debug("External firewall has " + action + " the guest network for account " + account.getAccountName() + "(id = " + account.getAccountId() + + ") with VLAN tag " + guestVlanTag); return true; } @@ -569,7 +576,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply firewall rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -612,7 +619,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply firewall rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -622,8 +629,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); Vlan vlan = _vlanDao.findById(sourceIp.getVlanId()); - StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, vlan.getVlanTag(), sourceIp.getAddress().addr(), -1, -1, rule.getDestIpAddress(), -1, -1, "any", rule.isForRevoke(), - false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(0, vlan.getVlanTag(), sourceIp.getAddress().addr(), -1, -1, rule.getDestIpAddress(), -1, -1, "any", rule.isForRevoke(), false); staticNatRules.add(ruleTO); } @@ -699,7 +706,8 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl String maskedIpRange = ipRange[0] + "-" + ipRange[1]; - RemoteAccessVpnCfgCommand createVpnCmd = new RemoteAccessVpnCfgCommand(create, ip.getAddress().addr(), vpn.getLocalIp(), maskedIpRange, vpn.getIpsecPresharedKey(), false); + RemoteAccessVpnCfgCommand createVpnCmd = + new RemoteAccessVpnCfgCommand(create, ip.getAddress().addr(), vpn.getLocalIp(), maskedIpRange, vpn.getIpsecPresharedKey(), false); createVpnCmd.setAccessDetail(NetworkElementCommand.ACCOUNT_ID, String.valueOf(network.getAccountId())); createVpnCmd.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR, network.getCidr()); Answer answer = _agentMgr.easySend(externalFirewall.getId(), createVpnCmd); @@ -816,7 +824,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (network.getState() == Network.State.Allocated) { s_logger.debug("External firewall was asked to apply firewall rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java index c1b48d9eeb3..9f13c2a8f9f 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java @@ -46,8 +46,8 @@ public interface ExternalLoadBalancerDeviceManager extends Manager { * @param server resource that will handle the commands specific to this device * @return Host object for the device added */ - public ExternalLoadBalancerDeviceVO addExternalLoadBalancer(long physicalNetworkId, String url, String username, String password, String deviceName, ServerResource resource, - boolean gslbProvider, String gslbSitePublicIp, String gslbSitePrivateIp); + public ExternalLoadBalancerDeviceVO addExternalLoadBalancer(long physicalNetworkId, String url, String username, String password, String deviceName, + ServerResource resource, boolean gslbProvider, String gslbSitePublicIp, String gslbSitePrivateIp); /** * deletes load balancer device added in to a physical network diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index d2126030b11..ea23b8a9de2 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -27,6 +27,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -105,7 +106,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceState; import com.cloud.resource.ResourceStateAdapter; -import com.cloud.resource.ResourceStateAdapter.DeleteHostAnswer; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; import com.cloud.user.Account; @@ -206,7 +206,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if ((ntwkDevice == null) || (url == null) || (username == null) || (resource == null) || (password == null)) { throw new InvalidParameterValueException("Atleast one of the required parameters (url, username, password," - + " server resource, zone id/physical network id) is not specified or a valid parameter."); + + " server resource, zone id/physical network id) is not specified or a valid parameter."); } pNetwork = _physicalNetworkDao.findById(physicalNetworkId); @@ -215,19 +215,21 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase } zoneId = pNetwork.getDataCenterId(); - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder()); ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), ntwkDevice.getNetworkServiceProvder()); if (ntwkSvcProvider == null) { - throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + physicalNetworkId + - "to add this device"); + throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() + " is not enabled in the physical network: " + + physicalNetworkId + "to add this device"); } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + " is in shutdown state in the physical network: " + - physicalNetworkId + "to add this device"); + physicalNetworkId + "to add this device"); } if (gslbProvider) { - ExternalLoadBalancerDeviceVO zoneGslbProvider = _externalLoadBalancerDeviceDao.findGslbServiceProvider(physicalNetworkId, ntwkDevice.getNetworkServiceProvder()); + ExternalLoadBalancerDeviceVO zoneGslbProvider = + _externalLoadBalancerDeviceDao.findGslbServiceProvider(physicalNetworkId, ntwkDevice.getNetworkServiceProvder()); if (zoneGslbProvider != null) { throw new CloudRuntimeException("There is a GSLB service provider configured in the zone alredy."); } @@ -264,7 +266,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase final Host host = _resourceMgr.addHost(zoneId, resource, Host.Type.ExternalLoadBalancer, hostDetails); if (host != null) { - final boolean dedicatedUse = (configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED)) + final boolean dedicatedUse = + (configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) != null) ? Boolean.parseBoolean(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED)) : false; long capacity = NumbersUtil.parseLong(configParams.get(ApiConstants.LOAD_BALANCER_DEVICE_CAPACITY), 0); if (capacity == 0) { @@ -276,8 +279,9 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase return Transaction.execute(new TransactionCallback() { @Override public ExternalLoadBalancerDeviceVO doInTransaction(TransactionStatus status) { - ExternalLoadBalancerDeviceVO lbDeviceVO = new ExternalLoadBalancerDeviceVO(host.getId(), pNetworkFinal.getId(), ntwkDevice.getNetworkServiceProvder(), - deviceName, capacityFinal, dedicatedUse, gslbProvider); + ExternalLoadBalancerDeviceVO lbDeviceVO = + new ExternalLoadBalancerDeviceVO(host.getId(), pNetworkFinal.getId(), ntwkDevice.getNetworkServiceProvder(), deviceName, capacityFinal, + dedicatedUse, gslbProvider); if (gslbProvider) { lbDeviceVO.setGslbSitePublicIP(gslbSitePublicIp); lbDeviceVO.setGslbSitePrivateIP(gslbSitePrivateIp); @@ -355,13 +359,15 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase throw new InvalidParameterValueException("Atleast one of the required parameter physical networkId, device name is invalid."); } - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), lbNetworkDevice.getNetworkServiceProvder()); + PhysicalNetworkServiceProviderVO ntwkSvcProvider = + _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), lbNetworkDevice.getNetworkServiceProvder()); // if provider not configured in to physical network, then there can be no instances if (ntwkSvcProvider == null) { return null; } - List lbDevices = _externalLoadBalancerDeviceDao.listByPhysicalNetworkAndProvider(physicalNetworkId, ntwkSvcProvider.getProviderName()); + List lbDevices = + _externalLoadBalancerDeviceDao.listByPhysicalNetworkAndProvider(physicalNetworkId, ntwkSvcProvider.getProviderName()); for (ExternalLoadBalancerDeviceVO provderInstance : lbDevices) { lbHosts.add(_hostDao.findById(provderInstance.getHostId())); } @@ -465,8 +471,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase // there are no LB devices or there is no free capacity on the devices in the physical network so provision a new LB appliance if (tryLbProvisioning) { // check if LB appliance can be dynamically provisioned - List providerLbDevices = _externalLoadBalancerDeviceDao.listByProviderAndDeviceAllocationState(physicalNetworkId, provider, - LBDeviceAllocationState.Provider); + List providerLbDevices = + _externalLoadBalancerDeviceDao.listByProviderAndDeviceAllocationState(physicalNetworkId, provider, LBDeviceAllocationState.Provider); if ((providerLbDevices != null) && (!providerLbDevices.isEmpty())) { for (ExternalLoadBalancerDeviceVO lbProviderDevice : providerLbDevices) { if (lbProviderDevice.getState() == LBDeviceState.Enabled) { @@ -474,8 +480,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase DataCenterIpAddressVO dcPrivateIp = _dcDao.allocatePrivateIpAddress(guestConfig.getDataCenterId(), lbProviderDevice.getUuid()); if (dcPrivateIp == null) { throw new InsufficientNetworkCapacityException("failed to acquire a priavate IP in the zone " + guestConfig.getDataCenterId() + - " needed for management IP of the load balancer appliance", DataCenter.class, - guestConfig.getDataCenterId()); + " needed for management IP of the load balancer appliance", DataCenter.class, guestConfig.getDataCenterId()); } Pod pod = _podDao.findById(dcPrivateIp.getPodId()); String lbIP = dcPrivateIp.getIpAddress(); @@ -493,7 +498,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase } } catch (Exception agentException) { s_logger.error("Could not provision load balancer instance on the load balancer device " + lbProviderDevice.getId() + " due to " + - agentException.getMessage()); + agentException.getMessage()); continue; } @@ -507,23 +512,26 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase String capacity = Long.toString(lbProviderDevice.getCapacity()); // acquire a public IP to associate with lb appliance (used as subnet IP to make the appliance part of private network) - PublicIp publicIp = _ipAddrMgr.assignPublicIpAddress(guestConfig.getDataCenterId(), null, _accountMgr.getSystemAccount(), VlanType.VirtualNetwork, - null, null, false); + PublicIp publicIp = + _ipAddrMgr.assignPublicIpAddress(guestConfig.getDataCenterId(), null, _accountMgr.getSystemAccount(), VlanType.VirtualNetwork, null, + null, false); String publicIPNetmask = publicIp.getVlanNetmask(); String publicIPgateway = publicIp.getVlanGateway(); String publicIPVlanTag = publicIp.getVlanTag(); String publicIP = publicIp.getAddress().toString(); - String url = "https://" + lbIP + "?publicinterface=" + publicIf + "&privateinterface=" + privateIf + "&lbdevicededicated=" + dedicatedLb + - "&cloudmanaged=true" + "&publicip=" + publicIP + "&publicipnetmask=" + publicIPNetmask + "&lbdevicecapacity=" + capacity + - "&publicipvlan=" + publicIPVlanTag + "&publicipgateway=" + publicIPgateway; + String url = + "https://" + lbIP + "?publicinterface=" + publicIf + "&privateinterface=" + privateIf + "&lbdevicededicated=" + dedicatedLb + + "&cloudmanaged=true" + "&publicip=" + publicIP + "&publicipnetmask=" + publicIPNetmask + "&lbdevicecapacity=" + capacity + + "&publicipvlan=" + publicIPVlanTag + "&publicipgateway=" + publicIPgateway; ExternalLoadBalancerDeviceVO lbAppliance = null; try { - lbAppliance = addExternalLoadBalancer(physicalNetworkId, url, username, password, createLbAnswer.getDeviceName(), - createLbAnswer.getServerResource(), false, null, null); + lbAppliance = + addExternalLoadBalancer(physicalNetworkId, url, username, password, createLbAnswer.getDeviceName(), + createLbAnswer.getServerResource(), false, null, null); } catch (Exception e) { s_logger.error("Failed to add load balancer appliance in to cloudstack due to " + e.getMessage() + - ". So provisioned load balancer appliance will be destroyed."); + ". So provisioned load balancer appliance will be destroyed."); } if (lbAppliance != null) { @@ -720,7 +728,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase return false; } - private void applyStaticNatRuleForInlineLBRule(DataCenterVO zone, Network network, boolean revoked, String publicIp, String privateIp) throws ResourceUnavailableException { + private void applyStaticNatRuleForInlineLBRule(DataCenterVO zone, Network network, boolean revoked, String publicIp, String privateIp) + throws ResourceUnavailableException { List staticNats = new ArrayList(); IPAddressVO ipVO = _ipAddressDao.listByDcIdIpAddress(zone.getId(), publicIp).get(0); StaticNatImpl staticNat = new StaticNatImpl(ipVO.getAllocatedToAccountId(), ipVO.getAllocatedInDomainId(), network.getId(), ipVO.getId(), privateIp, revoked); @@ -754,7 +763,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase } }; - private MappingNic getLoadBalancingIpNic(DataCenterVO zone, Network network, long sourceIpId, boolean revoked, String existedGuestIp) throws ResourceUnavailableException { + private MappingNic getLoadBalancingIpNic(DataCenterVO zone, Network network, long sourceIpId, boolean revoked, String existedGuestIp) + throws ResourceUnavailableException { String srcIp = _networkModel.getIp(sourceIpId).getAddress().addr(); InlineLoadBalancerNicMapVO mapping = _inlineLoadBalancerNicMapDao.findByPublicIpAddress(srcIp); Nic loadBalancingIpNic = null; @@ -770,8 +780,9 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase loadBalancingIpAddress = _ipAddrMgr.acquireGuestIpAddress(network, null); } else if (network.getGuestType() == Network.GuestType.Shared) { try { - PublicIp directIp = _ipAddrMgr.assignPublicIpAddress(network.getDataCenterId(), null, _accountDao.findById(network.getAccountId()), - VlanType.DirectAttached, network.getId(), null, true); + PublicIp directIp = + _ipAddrMgr.assignPublicIpAddress(network.getDataCenterId(), null, _accountDao.findById(network.getAccountId()), VlanType.DirectAttached, + network.getId(), null, true); loadBalancingIpAddress = directIp.getAddress().addr(); } catch (InsufficientCapacityException capException) { String msg = "Ran out of guest IP addresses from the shared network."; @@ -866,7 +877,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if (network.getState() == Network.State.Allocated) { s_logger.debug("External load balancer was asked to apply LB rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return true; } @@ -898,8 +909,9 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if ((destinations != null && !destinations.isEmpty()) || rule.isAutoScaleConfig()) { boolean inline = _networkMgr.isNetworkInlineMode(network); - LoadBalancerTO loadBalancer = new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, rule.getStickinessPolicies(), - rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); + LoadBalancerTO loadBalancer = + new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, rule.getStickinessPolicies(), + rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); if (rule.isAutoScaleConfig()) { loadBalancer.setAutoScaleVmGroup(rule.getAutoScaleVmGroup()); } @@ -979,7 +991,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase ExternalLoadBalancerDeviceVO lbDeviceVO = getExternalLoadBalancerForNetwork(guestConfig); if (lbDeviceVO == null) { s_logger.warn("Network shutdwon requested on external load balancer element, which did not implement the network." - + " Either network implement failed half way through or already network shutdown is completed. So just returning."); + + " Either network implement failed half way through or already network shutdown is completed. So just returning."); return true; } @@ -1012,7 +1024,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase Nic selfipNic = getPlaceholderNic(guestConfig); if (selfipNic == null) { s_logger.warn("Network shutdwon requested on external load balancer element, which did not implement the network." - + " Either network implement failed half way through or already network shutdown is completed. So just returning."); + + " Either network implement failed half way through or already network shutdown is completed. So just returning."); return true; } selfIp = selfipNic.getIp4Address(); @@ -1020,7 +1032,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase // It's a hack, using isOneToOneNat field for indicate if it's inline or not boolean inline = _networkMgr.isNetworkInlineMode(guestConfig); - IpAddressTO ip = new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, networkRate, inline); + IpAddressTO ip = + new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, networkRate, inline); IpAddressTO[] ips = new IpAddressTO[1]; ips[0] = ip; IpAssocCommand cmd = new IpAssocCommand(ips); @@ -1055,7 +1068,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase Account account = _accountDao.findByIdIncludingRemoved(guestConfig.getAccountId()); String action = add ? "implemented" : "shut down"; s_logger.debug("External load balancer has " + action + " the guest network for account " + account.getAccountName() + "(id = " + account.getAccountId() + - ") with VLAN tag " + guestVlanTag); + ") with VLAN tag " + guestVlanTag); } return true; @@ -1148,7 +1161,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if (network.getState() == Network.State.Allocated) { s_logger.debug("External load balancer was asked to apply LB rules for network with ID " + network.getId() + - "; this network is not implemented. Skipping backend commands."); + "; this network is not implemented. Skipping backend commands."); return null; } @@ -1181,8 +1194,9 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if ((destinations != null && !destinations.isEmpty()) || !rule.isAutoScaleConfig()) { boolean inline = _networkMgr.isNetworkInlineMode(network); - LoadBalancerTO loadBalancer = new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, rule.getStickinessPolicies(), - rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); + LoadBalancerTO loadBalancer = + new LoadBalancerTO(uuid, srcIp, srcPort, protocol, algorithm, revoked, false, inline, destinations, rule.getStickinessPolicies(), + rule.getHealthCheckPolicies(), rule.getLbSslCert(), rule.getLbProtocol()); loadBalancersToApply.add(loadBalancer); } } diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index f309fce2fde..bf9327f6993 100755 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -26,6 +26,9 @@ import java.util.concurrent.ScheduledExecutorService; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd; import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd; @@ -34,9 +37,6 @@ import org.apache.cloudstack.api.response.NetworkDeviceResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.agent.AgentManager; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.VlanDao; diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java index 09882a69f65..b350fe07f5d 100644 --- a/server/src/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/com/cloud/network/IpAddressManagerImpl.java @@ -29,6 +29,7 @@ import java.util.UUID; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.context.CallContext; @@ -138,14 +139,14 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GlobalLock; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; @@ -389,7 +390,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage podVlanMapSB.and("podId", podVlanMapSB.entity().getPodId(), Op.EQ); AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); - AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); + AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), + JoinType.INNER); AssignIpAddressFromPodVlanSearch.done(); Network.State.getStateMachine().registerListener(new NetworkStateListener(_usageEventDao, _networksDao)); @@ -643,14 +645,15 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage } @Override - public PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List vlanDbIds, Long networkId, String requestedIp, boolean isSystem) - throws InsufficientAddressCapacityException { + public PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List vlanDbIds, Long networkId, String requestedIp, + boolean isSystem) throws InsufficientAddressCapacityException { return fetchNewPublicIp(dcId, podId, vlanDbIds, owner, type, networkId, false, true, requestedIp, isSystem, null); } @DB - public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List vlanDbIds, final Account owner, final VlanType vlanUse, final Long guestNetworkId, - final boolean sourceNat, final boolean assign, final String requestedIp, final boolean isSystem, final Long vpcId) throws InsufficientAddressCapacityException { + public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List vlanDbIds, final Account owner, final VlanType vlanUse, + final Long guestNetworkId, final boolean sourceNat, final boolean assign, final String requestedIp, final boolean isSystem, final Long vpcId) + throws InsufficientAddressCapacityException { IPAddressVO addr = Transaction.execute(new TransactionCallbackWithException() { @Override public IPAddressVO doInTransaction(TransactionStatus status) throws InsufficientAddressCapacityException { @@ -793,8 +796,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage @Override public void markPublicIpAsAllocated(final IPAddressVO addr) { - assert (addr.getState() == IpAddress.State.Allocating || addr.getState() == IpAddress.State.Free) : "Unable to transition from state " + addr.getState() + " to " + - IpAddress.State.Allocated; + assert (addr.getState() == IpAddress.State.Allocating || addr.getState() == IpAddress.State.Free) : "Unable to transition from state " + addr.getState() + + " to " + IpAddress.State.Allocated; Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { @@ -810,8 +813,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage String guestType = vlan.getVlanType().toString(); if (!isIpDedicated(addr)) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, owner.getId(), addr.getDataCenterId(), addr.getId(), addr.getAddress().toString(), - addr.isSourceNat(), guestType, addr.getSystem(), addr.getClass().getName(), addr.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, owner.getId(), addr.getDataCenterId(), addr.getId(), addr.getAddress() + .toString(), addr.isSourceNat(), guestType, addr.getSystem(), addr.getClass().getName(), addr.getUuid()); } if (updateIpResourceCount(addr)) { @@ -832,7 +835,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage @Override public PublicIp assignSourceNatIpAddressToGuestNetwork(Account owner, Network guestNetwork) throws InsufficientAddressCapacityException, ConcurrentOperationException { assert (guestNetwork.getTrafficType() != null) : "You're asking for a source nat but your network " - + "can't participate in source nat. What do you have to say for yourself?"; + + "can't participate in source nat. What do you have to say for yourself?"; long dcId = guestNetwork.getDataCenterId(); IPAddressVO sourceNatIp = getExistingSourceNatInNetwork(owner.getId(), guestNetwork.getId()); @@ -973,8 +976,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage @DB @Override - public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Account caller, long callerUserId, final DataCenter zone) throws ConcurrentOperationException, - ResourceAllocationException, InsufficientAddressCapacityException { + public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Account caller, long callerUserId, final DataCenter zone) + throws ConcurrentOperationException, ResourceAllocationException, InsufficientAddressCapacityException { final VlanType vlanType = VlanType.VirtualNetwork; final boolean assign = false; @@ -1009,8 +1012,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage PublicIp ip = fetchNewPublicIp(zone.getId(), null, null, ipOwner, vlanType, null, false, assign, null, isSystem, null); if (ip == null) { - InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Unable to find available public IP addresses", DataCenter.class, - zone.getId()); + InsufficientAddressCapacityException ex = + new InsufficientAddressCapacityException("Unable to find available public IP addresses", DataCenter.class, zone.getId()); ex.addProxyObject(ApiDBUtils.findZoneById(zone.getId()).getUuid()); throw ex; } @@ -1037,8 +1040,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage @Override @DB - public IpAddress allocatePortableIp(final Account ipOwner, Account caller, final long dcId, final Long networkId, final Long vpcID) throws ConcurrentOperationException, - ResourceAllocationException, InsufficientAddressCapacityException { + public IpAddress allocatePortableIp(final Account ipOwner, Account caller, final long dcId, final Long networkId, final Long vpcID) + throws ConcurrentOperationException, ResourceAllocationException, InsufficientAddressCapacityException { GlobalLock portableIpLock = GlobalLock.getInternLock("PortablePublicIpRange"); IPAddressVO ipaddr; @@ -1053,8 +1056,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage List portableIpVOs = _portableIpDao.listByRegionIdAndState(1, PortableIp.State.Free); if (portableIpVOs == null || portableIpVOs.isEmpty()) { - InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Unable to find available portable IP addresses", Region.class, - new Long(1)); + InsufficientAddressCapacityException ex = + new InsufficientAddressCapacityException("Unable to find available portable IP addresses", Region.class, new Long(1)); throw ex; } @@ -1074,20 +1077,22 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage long physicalNetworkId = _networkModel.getDefaultPhysicalNetworkByZoneAndTrafficType(dcId, TrafficType.Public).getId(); Network network = _networkModel.getSystemNetworkByZoneAndTrafficType(dcId, TrafficType.Public); String range = allocatedPortableIp.getAddress() + "-" + allocatedPortableIp.getAddress(); - VlanVO vlan = new VlanVO(VlanType.VirtualNetwork, allocatedPortableIp.getVlan(), allocatedPortableIp.getGateway(), allocatedPortableIp.getNetmask(), dcId, - range, network.getId(), physicalNetworkId, null, null, null); + VlanVO vlan = + new VlanVO(VlanType.VirtualNetwork, allocatedPortableIp.getVlan(), allocatedPortableIp.getGateway(), allocatedPortableIp.getNetmask(), dcId, + range, network.getId(), physicalNetworkId, null, null, null); vlan = _vlanDao.persist(vlan); // provision the portable IP in to user_ip_address table - IPAddressVO ipaddr = new IPAddressVO(new Ip(allocatedPortableIp.getAddress()), dcId, networkId, vpcID, physicalNetworkId, network.getId(), vlan.getId(), true); + IPAddressVO ipaddr = + new IPAddressVO(new Ip(allocatedPortableIp.getAddress()), dcId, networkId, vpcID, physicalNetworkId, network.getId(), vlan.getId(), true); ipaddr.setState(State.Allocated); ipaddr.setAllocatedTime(new Date()); ipaddr.setAllocatedInDomainId(ipOwner.getDomainId()); ipaddr.setAllocatedToAccountId(ipOwner.getId()); ipaddr = _ipAddressDao.persist(ipaddr); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_PORTABLE_IP_ASSIGN, ipaddr.getId(), ipaddr.getDataCenterId(), ipaddr.getId(), - ipaddr.getAddress().toString(), ipaddr.isSourceNat(), null, ipaddr.getSystem(), ipaddr.getClass().getName(), ipaddr.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_PORTABLE_IP_ASSIGN, ipaddr.getId(), ipaddr.getDataCenterId(), ipaddr.getId(), ipaddr.getAddress() + .toString(), ipaddr.isSourceNat(), null, ipaddr.getSystem(), ipaddr.getClass().getName(), ipaddr.getUuid()); return ipaddr; } @@ -1142,7 +1147,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage _accountMgr.checkAccess(CallContext.current().getCallingAccount(), AccessType.UseNetwork, false, network); } else { throw new InvalidParameterValueException("IP can be associated with guest network of 'shared' type only if " - + "network services Source Nat, Static Nat, Port Forwarding, Load balancing, firewall are enabled in the network"); + + "network services Source Nat, Static Nat, Port Forwarding, Load balancing, firewall are enabled in the network"); } } } else { @@ -1188,14 +1193,14 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage // In Advance zone allow to do IP assoc only for Isolated networks with source nat service enabled if (network.getGuestType() == GuestType.Isolated && !(_networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat))) { throw new InvalidParameterValueException("In zone of type " + NetworkType.Advanced + " ip address can be associated only to the network of guest type " + - GuestType.Isolated + " with the " + Service.SourceNat.getName() + " enabled"); + GuestType.Isolated + " with the " + Service.SourceNat.getName() + " enabled"); } // In Advance zone allow to do IP assoc only for shared networks with source nat/static nat/lb/pf services enabled if (network.getGuestType() == GuestType.Shared && !isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) { throw new InvalidParameterValueException("In zone of type " + NetworkType.Advanced + " ip address can be associated with network of guest type " + - GuestType.Shared + "only if at " + "least one of the services " + Service.SourceNat.getName() + "/" + - Service.StaticNat.getName() + "/" + Service.Lb.getName() + "/" + Service.PortForwarding.getName() + " is enabled"); + GuestType.Shared + "only if at " + "least one of the services " + Service.SourceNat.getName() + "/" + Service.StaticNat.getName() + "/" + + Service.Lb.getName() + "/" + Service.PortForwarding.getName() + " is enabled"); } } @@ -1250,9 +1255,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); if ((networkOffering.getGuestType() == Network.GuestType.Shared) && (_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.SourceNat) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || - _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) || + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || + _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( networkOfferingId, Service.Lb))) { return true; } @@ -1260,8 +1265,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage } @Override - public IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, ResourceUnavailableException, - InsufficientAddressCapacityException, ConcurrentOperationException { + public IPAddressVO associatePortableIPToGuestNetwork(long ipAddrId, long networkId, boolean releaseOnFailure) throws ResourceAllocationException, + ResourceUnavailableException, InsufficientAddressCapacityException, ConcurrentOperationException { return associateIPToGuestNetwork(ipAddrId, networkId, releaseOnFailure); } @@ -1478,7 +1483,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage guestNetwork = networks.get(0); } else { throw new InvalidParameterValueException("Error, more than 1 Guest Isolated Networks with SourceNAT " - + "service enabled found for this account, cannot assosiate the IP range, please provide the network ID"); + + "service enabled found for this account, cannot assosiate the IP range, please provide the network ID"); } } @@ -1486,30 +1491,33 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage List requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (requiredOfferings.size() < 1) { throw new CloudRuntimeException("Unable to find network offering with availability=" + Availability.Required + - " to automatically create the network as part of createVlanIpRange"); + " to automatically create the network as part of createVlanIpRange"); } if (createNetwork) { if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) { - long physicalNetworkId = _networkModel.findPhysicalNetworkId(zoneId, requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); + long physicalNetworkId = + _networkModel.findPhysicalNetworkId(zoneId, requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); // Validate physical network PhysicalNetwork physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); if (physicalNetwork == null) { throw new InvalidParameterValueException("Unable to find physical network with id: " + physicalNetworkId + " and tag: " + - requiredOfferings.get(0).getTags()); + requiredOfferings.get(0).getTags()); } s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + - " as a part of createVlanIpRange process"); - guestNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + - "-network", null, null, null, - null, owner, null, physicalNetwork, zoneId, ACLType.Account, null, null, null, null, true, null); + " as a part of createVlanIpRange process"); + guestNetwork = + _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", + owner.getAccountName() + "-network", null, null, null, null, owner, null, physicalNetwork, zoneId, ACLType.Account, null, null, null, + null, true, null); if (guestNetwork == null) { s_logger.warn("Failed to create default Virtual network for the account " + accountId + "in zone " + zoneId); throw new CloudRuntimeException("Failed to create a Guest Isolated Networks with SourceNAT " + - "service enabled as a part of createVlanIpRange, for the account " + accountId + "in zone " + zoneId); + "service enabled as a part of createVlanIpRange, for the account " + accountId + "in zone " + zoneId); } } else { - throw new CloudRuntimeException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); + throw new CloudRuntimeException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + + NetworkOffering.State.Enabled); } } @@ -1572,8 +1580,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage guestNetwork = implementedNetwork.second(); } catch (Exception ex) { s_logger.warn("Failed to implement network " + guestNetwork + " elements and resources as a part of" + " network provision due to ", ex); - CloudRuntimeException e = new CloudRuntimeException("Failed to implement network (with specified id)" - + " elements and resources as a part of network provision for persistent network"); + CloudRuntimeException e = + new CloudRuntimeException("Failed to implement network (with specified id)" + + " elements and resources as a part of network provision for persistent network"); e.addProxyObject(guestNetwork.getUuid(), "networkId"); throw e; } @@ -1606,8 +1615,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage String guestType = vlan.getVlanType().toString(); if (!isIpDedicated(ip)) { String eventType = ip.isPortable() ? EventTypes.EVENT_PORTABLE_IP_RELEASE : EventTypes.EVENT_NET_IP_RELEASE; - UsageEventUtils.publishUsageEvent(eventType, ip.getAllocatedToAccountId(), ip.getDataCenterId(), addrId, ip.getAddress().addr(), ip.isSourceNat(), - guestType, ip.getSystem(), ip.getClass().getName(), ip.getUuid()); + UsageEventUtils.publishUsageEvent(eventType, ip.getAllocatedToAccountId(), ip.getDataCenterId(), addrId, ip.getAddress().addr(), + ip.isSourceNat(), guestType, ip.getSystem(), ip.getClass().getName(), ip.getUuid()); } } diff --git a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java index 82c107ae3b1..d8a9d686cd4 100644 --- a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java +++ b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java @@ -39,8 +39,8 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.UserIpv6AddressDao; import com.cloud.user.Account; -import com.cloud.utils.component.ManagerBase; import com.cloud.utils.NumbersUtil; +import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @@ -72,6 +72,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa return true; } + @Override public UserIpv6Address assignDirectIp6Address(long dcId, Account owner, Long networkId, String requestedIp6) throws InsufficientAddressCapacityException { Network network = _networkDao.findById(networkId); if (network == null) { @@ -110,7 +111,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa } if (ip == null) { throw new InsufficientAddressCapacityException("Cannot find a usable IP in the network " + network.getName() + " after " + _ipv6RetryMax + - "(network.ipv6.search.retry.max) times retry!", DataCenter.class, network.getDataCenterId()); + "(network.ipv6.search.retry.max) times retry!", DataCenter.class, network.getDataCenterId()); } } else { for (Vlan vlan : vlans) { diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 69771e4d8bc..450a7e04775 100755 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -387,7 +387,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } if (service != null && !((Service)services.toArray()[0] == service || service.equals(Service.Firewall))) { throw new InvalidParameterException("The IP " + ip.getAddress() + " is already used as " + ((Service)services.toArray()[0]).getName() + " rather than " + - service.getName()); + service.getName()); } return true; } @@ -654,8 +654,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { ; if (elementCapabilities == null || !elementCapabilities.containsKey(service)) { - throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + - provider); + throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + + " implementing Provider=" + provider); } serviceCapabilities = elementCapabilities.get(service); } @@ -693,8 +693,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { if (elementCapabilities == null || !elementCapabilities.containsKey(service)) { // TBD: We should be sending providerId and not the offering object itself. - throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + - provider); + throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + + " implementing Provider=" + provider); } serviceCapabilities = elementCapabilities.get(service); } @@ -941,7 +941,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { Nic nic = _nicDao.findByNtwkIdAndInstanceId(networkId, vmId); if (vm.getType() == Type.User && nic != null && nic.isDefaultNic()) { isUserVmsDefaultNetwork = true; - } else if (vm.getType() == Type.DomainRouter && ntwkOff != null && (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) { + } else if (vm.getType() == Type.DomainRouter && ntwkOff != null && + (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) { isDomRGuestOrPublicNetwork = true; } else if (vm.getType() == Type.ConsoleProxy || vm.getType() == Type.SecondaryStorageVm) { isSystemVmNetwork = true; @@ -1078,7 +1079,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { if (pNtwks.size() > 1) { if (tag == null) { - throw new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + " and no tags are specified in order to make a choice"); + throw new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + + " and no tags are specified in order to make a choice"); } Long pNtwkId = null; @@ -1146,15 +1148,15 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } if (networkList.isEmpty()) { - InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find the default physical network with traffic=" + trafficType + - " in the specified zone id"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Unable to find the default physical network with traffic=" + trafficType + " in the specified zone id"); ex.addProxyObject(dcUuid, "zoneId"); throw ex; } if (networkList.size() > 1) { - InvalidParameterValueException ex = new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + " with traffic type=" + - trafficType); + InvalidParameterValueException ex = + new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + " with traffic type=" + trafficType); ex.addProxyObject(dcUuid, "zoneId"); throw ex; } @@ -1187,7 +1189,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } } catch (Exception ex) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Failed to retrive the default label for management traffic:" + "zone: " + zoneId + " hypervisor: " + hypervisorType + " due to:" + ex.getMessage()); + s_logger.debug("Failed to retrive the default label for management traffic:" + "zone: " + zoneId + " hypervisor: " + hypervisorType + " due to:" + + ex.getMessage()); } } return null; @@ -1218,7 +1221,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } } catch (Exception ex) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Failed to retrive the default label for storage traffic:" + "zone: " + zoneId + " hypervisor: " + hypervisorType + " due to:" + ex.getMessage()); + s_logger.debug("Failed to retrive the default label for storage traffic:" + "zone: " + zoneId + " hypervisor: " + hypervisorType + " due to:" + + ex.getMessage()); } } return null; @@ -1307,12 +1311,13 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { public NetworkVO getExclusiveGuestNetwork(long zoneId) { List networks = _networksDao.listBy(Account.ACCOUNT_ID_SYSTEM, zoneId, GuestType.Shared, TrafficType.Guest); if (networks == null || networks.isEmpty()) { - throw new InvalidParameterValueException("Unable to find network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + zoneId); + throw new InvalidParameterValueException("Unable to find network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + + zoneId); } if (networks.size() > 1) { - throw new InvalidParameterValueException("Found more than 1 network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + - zoneId); + throw new InvalidParameterValueException("Found more than 1 network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + + " in zone " + zoneId); } @@ -1408,8 +1413,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } servicesSet.delete(servicesSet.toString().length() - 2, servicesSet.toString().length()); - throw new InvalidParameterValueException("Cannot enable subset of Services, Please specify the complete list of Services: " + servicesSet.toString() + - " for Service Provider " + provider.getName()); + throw new InvalidParameterValueException("Cannot enable subset of Services, Please specify the complete list of Services: " + + servicesSet.toString() + " for Service Provider " + provider.getName()); } } List serviceList = new ArrayList(); @@ -1491,24 +1496,24 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { if (element != null) { Map> elementCapabilities = element.getCapabilities(); if (elementCapabilities == null || !elementCapabilities.containsKey(service)) { - throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + - provider.getName()); + throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + + " implementing Provider=" + provider.getName()); } Map serviceCapabilities = elementCapabilities.get(service); if (serviceCapabilities == null || serviceCapabilities.isEmpty()) { throw new UnsupportedServiceException("Service " + service.getName() + " doesn't have capabilites for element=" + element.getName() + - " implementing Provider=" + provider.getName()); + " implementing Provider=" + provider.getName()); } String value = serviceCapabilities.get(cap); if (value == null || value.isEmpty()) { - throw new UnsupportedServiceException("Service " + service.getName() + " doesn't have capability " + cap.getName() + " for element=" + element.getName() + - " implementing Provider=" + provider.getName()); + throw new UnsupportedServiceException("Service " + service.getName() + " doesn't have capability " + cap.getName() + " for element=" + + element.getName() + " implementing Provider=" + provider.getName()); } if (!value.toLowerCase().contains(capValue.toLowerCase())) { throw new UnsupportedServiceException("Service " + service.getName() + " doesn't support value " + capValue + " for capability " + cap.getName() + - " for element=" + element.getName() + " implementing Provider=" + provider.getName()); + " for element=" + element.getName() + " implementing Provider=" + provider.getName()); } } else { throw new UnsupportedServiceException("Unable to find network element for provider " + provider.getName()); @@ -1523,22 +1528,24 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { AccountVO networkOwner = _accountDao.findById(network.getAccountId()); if (networkOwner == null) throw new PermissionDeniedException("Unable to use network with id= " + ((network != null) ? ((NetworkVO)network).getUuid() : "") + - ", network does not have an owner"); + ", network does not have an owner"); if (owner.getType() != Account.ACCOUNT_TYPE_PROJECT && networkOwner.getType() == Account.ACCOUNT_TYPE_PROJECT) { if (!_projectAccountDao.canAccessProjectAccount(owner.getAccountId(), network.getAccountId())) { - throw new PermissionDeniedException("Unable to use network with id= " + ((network != null) ? ((NetworkVO)network).getUuid() : "") + ", permission denied"); + throw new PermissionDeniedException("Unable to use network with id= " + ((network != null) ? ((NetworkVO)network).getUuid() : "") + + ", permission denied"); } } else { List networkMap = _networksDao.listBy(owner.getId(), network.getId()); if (networkMap == null || networkMap.isEmpty()) { - throw new PermissionDeniedException("Unable to use network with id= " + ((network != null) ? ((NetworkVO)network).getUuid() : "") + ", permission denied"); + throw new PermissionDeniedException("Unable to use network with id= " + ((network != null) ? ((NetworkVO)network).getUuid() : "") + + ", permission denied"); } } } else { if (!isNetworkAvailableInDomain(network.getId(), owner.getDomainId())) { throw new PermissionDeniedException("Shared network id=" + ((network != null) ? ((NetworkVO)network).getUuid() : "") + " is not available in domain id=" + - owner.getDomainId()); + owner.getDomainId()); } } } @@ -1568,7 +1575,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } } catch (Exception ex) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Failed to retrieve the default label for public traffic." + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to: " + ex.getMessage()); + s_logger.debug("Failed to retrieve the default label for public traffic." + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to: " + + ex.getMessage()); } } return null; @@ -1600,7 +1608,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } } catch (Exception ex) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Failed to retrive the default label for management traffic:" + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to:" + ex.getMessage()); + s_logger.debug("Failed to retrive the default label for management traffic:" + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to:" + + ex.getMessage()); } } return null; @@ -1872,8 +1881,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { Integer networkRate = getNetworkRate(network.getId(), vm.getId()); // NetworkGuru guru = _networkGurus.get(network.getGuruName()); - NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, isSecurityGroupSupportedInNetwork(network), getNetworkTag( - vm.getHypervisorType(), network)); + NicProfile profile = + new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, isSecurityGroupSupportedInNetwork(network), getNetworkTag( + vm.getHypervisorType(), network)); // guru.updateNicProfile(profile, network); return profile; @@ -1908,21 +1918,21 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { _allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(Config.SubDomainNetworkAccess.key())); _executeInSequenceNtwkElmtCmd = Boolean.valueOf(_configs.get(Config.ExecuteInSequenceNetworkElementCommands.key())); - NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemPublicNetwork, TrafficType.Public, true); + NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPublicNetwork, TrafficType.Public, true); publicNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(publicNetworkOffering); - _systemNetworks.put(NetworkOfferingVO.SystemPublicNetwork, publicNetworkOffering); - NetworkOfferingVO managementNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemManagementNetwork, TrafficType.Management, false); + _systemNetworks.put(NetworkOffering.SystemPublicNetwork, publicNetworkOffering); + NetworkOfferingVO managementNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemManagementNetwork, TrafficType.Management, false); managementNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(managementNetworkOffering); - _systemNetworks.put(NetworkOfferingVO.SystemManagementNetwork, managementNetworkOffering); - NetworkOfferingVO controlNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemControlNetwork, TrafficType.Control, false); + _systemNetworks.put(NetworkOffering.SystemManagementNetwork, managementNetworkOffering); + NetworkOfferingVO controlNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemControlNetwork, TrafficType.Control, false); controlNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(controlNetworkOffering); - _systemNetworks.put(NetworkOfferingVO.SystemControlNetwork, controlNetworkOffering); - NetworkOfferingVO storageNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemStorageNetwork, TrafficType.Storage, true); + _systemNetworks.put(NetworkOffering.SystemControlNetwork, controlNetworkOffering); + NetworkOfferingVO storageNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemStorageNetwork, TrafficType.Storage, true); storageNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(storageNetworkOffering); - _systemNetworks.put(NetworkOfferingVO.SystemStorageNetwork, storageNetworkOffering); - NetworkOfferingVO privateGatewayNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemPrivateGatewayNetworkOffering, GuestType.Isolated); + _systemNetworks.put(NetworkOffering.SystemStorageNetwork, storageNetworkOffering); + NetworkOfferingVO privateGatewayNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPrivateGatewayNetworkOffering, GuestType.Isolated); privateGatewayNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(privateGatewayNetworkOffering); - _systemNetworks.put(NetworkOfferingVO.SystemPrivateGatewayNetworkOffering, privateGatewayNetworkOffering); + _systemNetworks.put(NetworkOffering.SystemPrivateGatewayNetworkOffering, privateGatewayNetworkOffering); _privateOfferingId = privateGatewayNetworkOffering.getId(); IpAddressSearch = _ipAddressDao.createSearchBuilder(); @@ -1932,7 +1942,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { IpAddressSearch.and("associatedWithNetworkId", IpAddressSearch.entity().getAssociatedWithNetworkId(), Op.EQ); SearchBuilder virtualNetworkVlanSB = _vlanDao.createSearchBuilder(); virtualNetworkVlanSB.and("vlanType", virtualNetworkVlanSB.entity().getVlanType(), Op.EQ); - IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), JoinBuilder.JoinType.INNER); + IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), + JoinBuilder.JoinType.INNER); IpAddressSearch.done(); NicForTrafficTypeSearch = _nicDao.createSearchBuilder(); @@ -1957,7 +1968,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { if (implementedProvider != null) { if (s_providerToNetworkElementMap.containsKey(implementedProvider.getName())) { s_logger.error("Cannot start NetworkModel: Provider <-> NetworkElement must be a one-to-one map, " + "multiple NetworkElements found for Provider: " + - implementedProvider.getName()); + implementedProvider.getName()); continue; } s_logger.info("Add provider <-> element map entry. " + implementedProvider.getName() + "-" + element.getName() + "-" + element.getClass().getSimpleName()); diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 3b9aa9e6d0f..fffb553bd87 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -41,6 +41,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd; @@ -158,13 +159,13 @@ import com.cloud.utils.db.Filter; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.TransactionStatus; -import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.ExceptionUtil; import com.cloud.utils.net.NetUtils; @@ -420,7 +421,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } if (service != null && !((Service)services.toArray()[0] == service || service.equals(Service.Firewall))) { throw new InvalidParameterException("The IP " + ip.getAddress() + " is already used as " + ((Service)services.toArray()[0]).getName() + " rather than " + - service.getName()); + service.getName()); } return true; } @@ -536,7 +537,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return _ipAddrMgr.allocateIp(ipOwner, false, caller, callerUserId, zone); } else { throw new InvalidParameterValueException("Associate IP address can only be called on the shared networks in the advanced zone" - + " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled"); + + " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled"); } } } @@ -579,7 +580,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return _ipAddrMgr.allocatePortableIp(ipOwner, caller, zoneId, networkId, null); } else { throw new InvalidParameterValueException("Associate IP address can only be called on the shared networks in the advanced zone" - + " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled"); + + " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled"); } } } @@ -802,7 +803,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { IPAddressVO publicIpVO = _ipAddressDao.findByVmIp(secondaryIp); if (publicIpVO != null) { s_logger.debug("VM nic IP " + secondaryIp + " is associated with the static NAT rule public IP address id " + publicIpVO.getId()); - throw new InvalidParameterValueException("Can' remove the ip " + secondaryIp + "is associate with static NAT rule public IP address id " + publicIpVO.getId()); + throw new InvalidParameterValueException("Can' remove the ip " + secondaryIp + "is associate with static NAT rule public IP address id " + + publicIpVO.getId()); } } else if (dc.getNetworkType() == NetworkType.Basic || ntwkOff.getGuestType() == Network.GuestType.Shared) { final IPAddressVO ip = _ipAddressDao.findByIpAndNetworkId(secIpVO.getNetworkId(), secIpVO.getIp4Address()); @@ -1059,7 +1061,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } else if (ntwkOff.getGuestType() == GuestType.Shared) { if (!(aclType == ACLType.Domain || aclType == ACLType.Account)) { - throw new InvalidParameterValueException("AclType should be " + ACLType.Domain + " or " + ACLType.Account + " for network of type " + Network.GuestType.Shared); + throw new InvalidParameterValueException("AclType should be " + ACLType.Domain + " or " + ACLType.Account + " for network of type " + + Network.GuestType.Shared); } } } else { @@ -1090,7 +1093,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (domainId != null) { if (ntwkOff.getTrafficType() != TrafficType.Guest || ntwkOff.getGuestType() != Network.GuestType.Shared) { throw new InvalidParameterValueException("Domain level networks are supported just for traffic type " + TrafficType.Guest + " and guest type " + - Network.GuestType.Shared); + Network.GuestType.Shared); } DomainVO domain = _domainDao.findById(domainId); @@ -1190,9 +1193,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // Regular user can create Guest Isolated Source Nat enabled network only if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL && (ntwkOff.getTrafficType() != TrafficType.Guest || ntwkOff.getGuestType() != Network.GuestType.Isolated && - areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))) { + areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))) { throw new InvalidParameterValueException("Regular user can create a network only from the network" + " offering having traffic type " + TrafficType.Guest + - " and network type " + Network.GuestType.Isolated + " with a service " + Service.SourceNat.getName() + " enabled"); + " and network type " + Network.GuestType.Isolated + " with a service " + Service.SourceNat.getName() + " enabled"); } // Don't allow to specify vlan if the caller is not ROOT admin @@ -1253,9 +1256,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { throw ex; } - Network network = commitNetwork(networkOfferingId, gateway, startIP, endIP, netmask, networkDomain, vlanId, name, displayText, caller, physicalNetworkId, zoneId, domainId, - isDomainSpecific, subdomainAccess, vpcId, startIPv6, endIPv6, ip6Gateway, ip6Cidr, displayNetwork, aclId, isolatedPvlan, ntwkOff, pNtwk, aclType, owner, cidr, - createVlan); + Network network = + commitNetwork(networkOfferingId, gateway, startIP, endIP, netmask, networkDomain, vlanId, name, displayText, caller, physicalNetworkId, zoneId, domainId, + isDomainSpecific, subdomainAccess, vpcId, startIPv6, endIPv6, ip6Gateway, ip6Cidr, displayNetwork, aclId, isolatedPvlan, ntwkOff, pNtwk, aclType, owner, + cidr, createVlan); // if the network offering has persistent set to true, implement the network if (ntwkOff.getIsPersistent()) { @@ -1284,11 +1288,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return network; } - private Network commitNetwork(final Long networkOfferingId, final String gateway, final String startIP, final String endIP, final String netmask, final String networkDomain, - final String vlanId, final String name, final String displayText, final Account caller, final Long physicalNetworkId, final Long zoneId, final Long domainId, - final boolean isDomainSpecific, final Boolean subdomainAccessFinal, final Long vpcId, final String startIPv6, final String endIPv6, final String ip6Gateway, - final String ip6Cidr, final Boolean displayNetwork, final Long aclId, final String isolatedPvlan, final NetworkOfferingVO ntwkOff, final PhysicalNetwork pNtwk, - final ACLType aclType, final Account ownerFinal, final String cidr, final boolean createVlan) throws InsufficientCapacityException, ResourceAllocationException { + private Network commitNetwork(final Long networkOfferingId, final String gateway, final String startIP, final String endIP, final String netmask, + final String networkDomain, final String vlanId, final String name, final String displayText, final Account caller, final Long physicalNetworkId, + final Long zoneId, final Long domainId, final boolean isDomainSpecific, final Boolean subdomainAccessFinal, final Long vpcId, final String startIPv6, + final String endIPv6, final String ip6Gateway, final String ip6Cidr, final Boolean displayNetwork, final Long aclId, final String isolatedPvlan, + final NetworkOfferingVO ntwkOff, final PhysicalNetwork pNtwk, final ACLType aclType, final Account ownerFinal, final String cidr, final boolean createVlan) + throws InsufficientCapacityException, ResourceAllocationException { try { return Transaction.execute(new TransactionCallbackWithException() { @Override @@ -1332,8 +1337,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } } - network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, sharedDomainId, pNtwk, zoneId, - aclType, subdomainAccess, vpcId, aclId, caller, displayNetwork); + network = + _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, sharedDomainId, pNtwk, + zoneId, aclType, subdomainAccess, vpcId, aclId, caller, displayNetwork); } else { if (_configMgr.isOfferingForVpc(ntwkOff)) { throw new InvalidParameterValueException("Network offering can be used for VPC networks only"); @@ -1342,14 +1348,15 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { throw new InvalidParameterValueException("Internal Lb can be enabled on vpc networks only"); } - network = _networkMgr.createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, sharedDomainId, pNtwk, zoneId, - aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr, displayNetwork, isolatedPvlan); + network = + _networkMgr.createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, sharedDomainId, pNtwk, + zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr, displayNetwork, isolatedPvlan); } if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN && createVlan) { // Create vlan ip range - _configMgr.createVlanAndPublicIpRange(pNtwk.getDataCenterId(), network.getId(), physicalNetworkId, false, null, startIP, endIP, gateway, netmask, vlanId, - null, startIPv6, endIPv6, ip6Gateway, ip6Cidr); + _configMgr.createVlanAndPublicIpRange(pNtwk.getDataCenterId(), network.getId(), physicalNetworkId, false, null, startIP, endIP, gateway, netmask, + vlanId, null, startIPv6, endIPv6, ip6Gateway, ip6Cidr); } return network; } @@ -1518,34 +1525,35 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (!permittedAccounts.isEmpty()) { //get account level networks networksToReturn.addAll(listAccountSpecificNetworks( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired, - specifyIpRanges, vpcId, tags), searchFilter, permittedAccounts)); + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, + restartRequired, specifyIpRanges, vpcId, tags), searchFilter, permittedAccounts)); //get domain level networks if (domainId != null) { networksToReturn.addAll(listDomainLevelNetworks( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, - vpcId, tags), searchFilter, domainId, false)); + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, true, restartRequired, + specifyIpRanges, vpcId, tags), searchFilter, domainId, false)); } } else { //add account specific networks networksToReturn.addAll(listAccountSpecificNetworksByDomainPath( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired, - specifyIpRanges, vpcId, tags), searchFilter, path, isRecursive)); + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, + restartRequired, specifyIpRanges, vpcId, tags), searchFilter, path, isRecursive)); //add domain specific networks of domain + parent domains networksToReturn.addAll(listDomainSpecificNetworksByDomainPath( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired, - specifyIpRanges, vpcId, tags), searchFilter, path, isRecursive)); + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, + restartRequired, specifyIpRanges, vpcId, tags), searchFilter, path, isRecursive)); //add networks of subdomains if (domainId == null) { networksToReturn.addAll(listDomainLevelNetworks( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, true, restartRequired, specifyIpRanges, - vpcId, tags), searchFilter, caller.getDomainId(), true)); + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, true, restartRequired, + specifyIpRanges, vpcId, tags), searchFilter, caller.getDomainId(), true)); } } } else { - networksToReturn = _networksDao.search( - buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, null, skipProjectNetworks, restartRequired, - specifyIpRanges, vpcId, tags), searchFilter); + networksToReturn = + _networksDao.search( + buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, null, skipProjectNetworks, + restartRequired, specifyIpRanges, vpcId, tags), searchFilter); } if (supportedServicesStr != null && !supportedServicesStr.isEmpty() && !networksToReturn.isEmpty()) { @@ -1779,7 +1787,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, eventDescription = "restarting network", async = true) - public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { // This method restarts all network elements belonging to the network and re-applies all the rules Long networkId = cmd.getNetworkId(); @@ -1797,7 +1806,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // Don't allow to restart network if it's not in Implemented/Setup state if (!(network.getState() == Network.State.Implemented || network.getState() == Network.State.Setup)) { throw new InvalidParameterValueException("Network is not in the right state to be restarted. Correct states are: " + Network.State.Implemented + ", " + - Network.State.Setup); + Network.State.Setup); } if (network.getBroadcastDomainType() == BroadcastDomainType.Lswitch) { @@ -1857,8 +1866,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (elementCapabilities == null || !elementCapabilities.containsKey(service)) { // TBD: We should be sending providerId and not the offering object itself. - throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + " implementing Provider=" + - provider); + throw new UnsupportedServiceException("Service " + service.getName() + " is not supported by the element=" + element.getName() + + " implementing Provider=" + provider); } serviceCapabilities = elementCapabilities.get(service); } @@ -1885,8 +1894,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); if ((networkOffering.getGuestType() == Network.GuestType.Shared) && (areServicesSupportedByNetworkOffering(networkOfferingId, Service.SourceNat) || areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) || - areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || areServicesSupportedByNetworkOffering( - networkOfferingId, Service.Lb))) { + areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) || + areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || areServicesSupportedByNetworkOffering(networkOfferingId, Service.Lb))) { return true; } return false; @@ -1901,8 +1910,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } private boolean checkForNonStoppedVmInNetwork(long networkId) { - List vms = _userVmDao.listByNetworkIdAndStates(networkId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Migrating, - VirtualMachine.State.Stopping); + List vms = + _userVmDao.listByNetworkIdAndStates(networkId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Migrating, + VirtualMachine.State.Stopping); return vms.isEmpty(); } @@ -1981,8 +1991,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // network offering should be in Enabled state if (networkOffering.getState() != NetworkOffering.State.Enabled) { - InvalidParameterValueException ex = new InvalidParameterValueException("Network offering with specified id is not in " + NetworkOffering.State.Enabled + - " state, can't upgrade to it"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Network offering with specified id is not in " + NetworkOffering.State.Enabled + " state, can't upgrade to it"); ex.addProxyObject(networkOffering.getUuid(), "networkOfferingId"); throw ex; } @@ -2003,7 +2013,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } if (changeCidr) { if (!checkForNonStoppedVmInNetwork(network.getId())) { - InvalidParameterValueException ex = new InvalidParameterValueException("All user vm of network of specified id should be stopped before changing CIDR!"); + InvalidParameterValueException ex = + new InvalidParameterValueException("All user vm of network of specified id should be stopped before changing CIDR!"); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -2011,15 +2022,16 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // check if the network is upgradable if (!canUpgrade(network, oldNetworkOfferingId, networkOfferingId)) { throw new InvalidParameterValueException("Can't upgrade from network offering " + oldNtwkOff.getUuid() + " to " + networkOffering.getUuid() + - "; check logs for more information"); + "; check logs for more information"); } restartNetwork = true; networkOfferingChanged = true; } } - final Map newSvcProviders = networkOfferingChanged ? _networkMgr.finalizeServicesAndProvidersForNetwork( - _entityMgr.findById(NetworkOffering.class, networkOfferingId), network.getPhysicalNetworkId()) : new HashMap(); + final Map newSvcProviders = + networkOfferingChanged ? _networkMgr.finalizeServicesAndProvidersForNetwork(_entityMgr.findById(NetworkOffering.class, networkOfferingId), + network.getPhysicalNetworkId()) : new HashMap(); // don't allow to modify network domain if the service is not supported if (domainSuffix != null) { @@ -2027,7 +2039,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (!NetUtils.verifyDomainName(domainSuffix)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } long offeringId = oldNetworkOfferingId; @@ -2064,7 +2076,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } if (!(network.getState() == Network.State.Implemented)) { throw new InvalidParameterValueException("The network must be in " + Network.State.Implemented + " state. IP Reservation cannot be applied in " + - network.getState() + " state"); + network.getState() + " state"); } if (!NetUtils.isValidCIDR(guestVmCidr)) { throw new InvalidParameterValueException("Invalid format of Guest VM CIDR."); @@ -2078,12 +2090,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (networkCidr != null) { if (!NetUtils.isNetworkAWithinNetworkB(guestVmCidr, networkCidr)) { throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR : " + - networkCidr); + networkCidr); } } else { if (!NetUtils.isNetworkAWithinNetworkB(guestVmCidr, network.getCidr())) { throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR : " + - network.getCidr()); + network.getCidr()); } } @@ -2113,15 +2125,15 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // the IP ranges exactly matches, in these special cases make sure no Reservation gets applied if (network.getNetworkCidr() == null) { if (NetUtils.isSameIpRange(guestVmCidr, network.getCidr()) && !guestVmCidr.equals(network.getCidr())) { - throw new InvalidParameterValueException("The Start IP and End IP of guestvmcidr: " + guestVmCidr + " and CIDR: " + network.getCidr() + " are same, " + - "even though both the cidrs appear to be different. As a precaution no IP Reservation will be applied."); + throw new InvalidParameterValueException("The Start IP and End IP of guestvmcidr: " + guestVmCidr + " and CIDR: " + network.getCidr() + + " are same, " + "even though both the cidrs appear to be different. As a precaution no IP Reservation will be applied."); } } else { if (NetUtils.isSameIpRange(guestVmCidr, network.getNetworkCidr()) && !guestVmCidr.equals(network.getNetworkCidr())) { - throw new InvalidParameterValueException( - "The Start IP and End IP of guestvmcidr: " + guestVmCidr + " and Network CIDR: " + network.getNetworkCidr() + " are same, " + - "even though both the cidrs appear to be different. As a precaution IP Reservation will not be affected. If you want to reset IP Reservation, " + - "specify guestVmCidr to be: " + network.getNetworkCidr()); + throw new InvalidParameterValueException("The Start IP and End IP of guestvmcidr: " + guestVmCidr + " and Network CIDR: " + network.getNetworkCidr() + + " are same, " + + "even though both the cidrs appear to be different. As a precaution IP Reservation will not be affected. If you want to reset IP Reservation, " + + "specify guestVmCidr to be: " + network.getNetworkCidr()); } } @@ -2146,7 +2158,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { ReservationContext context = new ReservationContextImpl(null, null, callerUser, callerAccount); // 1) Shutdown all the elements and cleanup all the rules. Don't allow to shutdown network in intermediate // states - Shutdown and Implementing - boolean validStateToShutdown = (network.getState() == Network.State.Implemented || network.getState() == Network.State.Setup || network.getState() == Network.State.Allocated); + boolean validStateToShutdown = + (network.getState() == Network.State.Implemented || network.getState() == Network.State.Setup || network.getState() == Network.State.Allocated); if (restartNetwork) { if (validStateToShutdown) { if (!changeCidr) { @@ -2154,7 +2167,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (!_networkMgr.shutdownNetworkElementsAndResources(context, true, network)) { s_logger.warn("Failed to shutdown the network elements and resources as a part of network restart: " + network); - CloudRuntimeException ex = new CloudRuntimeException("Failed to shutdown the network elements and resources as a part of update to network of specified id"); + CloudRuntimeException ex = + new CloudRuntimeException("Failed to shutdown the network elements and resources as a part of update to network of specified id"); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -2165,7 +2179,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { //check if network has reservation if (NetUtils.isNetworkAWithinNetworkB(network.getCidr(), network.getNetworkCidr())) { s_logger.warn("Existing IP reservation will become ineffective for the network with id = " + networkId + - " You need to reapply reservation after network reimplementation."); + " You need to reapply reservation after network reimplementation."); //set cidr to the newtork cidr network.setCidr(network.getNetworkCidr()); //set networkCidr to null to bring network back to no IP reservation state @@ -2180,8 +2194,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } } else { - CloudRuntimeException ex = new CloudRuntimeException( - "Failed to shutdown the network elements and resources as a part of update to network with specified id; network is in wrong state: " + network.getState()); + CloudRuntimeException ex = + new CloudRuntimeException( + "Failed to shutdown the network elements and resources as a part of update to network with specified id; network is in wrong state: " + + network.getState()); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -2192,8 +2208,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { Network.State networkState = _networksDao.findById(networkId).getState(); boolean validStateToImplement = (networkState == Network.State.Implemented || networkState == Network.State.Setup || networkState == Network.State.Allocated); if (restartNetwork && !validStateToImplement) { - CloudRuntimeException ex = new CloudRuntimeException( - "Failed to implement the network elements and resources as a part of update to network with specified id; network is in wrong state: " + networkState); + CloudRuntimeException ex = + new CloudRuntimeException( + "Failed to implement the network elements and resources as a part of update to network with specified id; network is in wrong state: " + networkState); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -2247,7 +2264,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } catch (Exception ex) { s_logger.warn("Failed to implement network " + network + " elements and resources as a part of network update due to ", ex); - CloudRuntimeException e = new CloudRuntimeException("Failed to implement network (with specified id) elements and resources as a part of network update"); + CloudRuntimeException e = + new CloudRuntimeException("Failed to implement network (with specified id) elements and resources as a part of network update"); e.addProxyObject(network.getUuid(), "networkId"); throw e; } @@ -2263,7 +2281,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { _networkMgr.implementNetwork(network.getId(), dest, context); } catch (Exception ex) { s_logger.warn("Failed to implement network " + network + " elements and resources as a part o" + "f network update due to ", ex); - CloudRuntimeException e = new CloudRuntimeException("Failed to implement network (with specified" + " id) elements and resources as a part of network update"); + CloudRuntimeException e = + new CloudRuntimeException("Failed to implement network (with specified" + " id) elements and resources as a part of network update"); e.addProxyObject(network.getUuid(), "networkId"); throw e; } @@ -2305,7 +2324,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } // security group service should be the same - if (areServicesSupportedByNetworkOffering(oldNetworkOfferingId, Service.SecurityGroup) != areServicesSupportedByNetworkOffering(newNetworkOfferingId, Service.SecurityGroup)) { + if (areServicesSupportedByNetworkOffering(oldNetworkOfferingId, Service.SecurityGroup) != areServicesSupportedByNetworkOffering(newNetworkOfferingId, + Service.SecurityGroup)) { s_logger.debug("Offerings " + newNetworkOfferingId + " and " + oldNetworkOfferingId + " have different securityGroupProperty, can't upgrade"); return false; } @@ -2319,7 +2339,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // tags should be the same if (newNetworkOffering.getTags() != null) { if (oldNetworkOffering.getTags() == null) { - s_logger.debug("New network offering id=" + newNetworkOfferingId + " has tags and old network offering id=" + oldNetworkOfferingId + " doesn't, can't upgrade"); + s_logger.debug("New network offering id=" + newNetworkOfferingId + " has tags and old network offering id=" + oldNetworkOfferingId + + " doesn't, can't upgrade"); return false; } if (!oldNetworkOffering.getTags().equalsIgnoreCase(newNetworkOffering.getTags())) { @@ -2397,7 +2418,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (zoneType == NetworkType.Basic) { if (!_physicalNetworkDao.listByZone(zoneId).isEmpty()) { // TBD: Send uuid instead of zoneId; may have to hardcode tablename in call to addProxyObject(). - throw new CloudRuntimeException("Cannot add the physical network to basic zone id: " + zoneId + ", there is a physical network already existing in this basic Zone"); + throw new CloudRuntimeException("Cannot add the physical network to basic zone id: " + zoneId + + ", there is a physical network already existing in this basic Zone"); } } if (tags != null && tags.size() > 1) { @@ -2412,7 +2434,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // Verify zone type if (zoneType == NetworkType.Basic || (zoneType == NetworkType.Advanced && zone.isSecurityGroupEnabled())) { throw new InvalidParameterValueException("Can't add vnet range to the physical network in the zone that supports " + zoneType + - " network, Security Group enabled: " + zone.isSecurityGroupEnabled()); + " network, Security Group enabled: " + zone.isSecurityGroupEnabled()); } } @@ -2526,7 +2548,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (newVnetRange != null) { if (zone.getNetworkType() == NetworkType.Basic || (zone.getNetworkType() == NetworkType.Advanced && zone.isSecurityGroupEnabled())) { throw new InvalidParameterValueException("Can't add vnet range to the physical network in the zone that supports " + zone.getNetworkType() + - " network, Security Group enabled: " + zone.isSecurityGroupEnabled()); + " network, Security Group enabled: " + zone.isSecurityGroupEnabled()); } } @@ -2615,13 +2637,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { public void doInTransactionWithoutResult(TransactionStatus status) { if (addVnetsFinal != null) { s_logger.debug("Adding vnet range " + addVnetsFinal.toString() + " for the physicalNetwork id= " + network.getId() + " and zone id=" + - network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); + network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); //add vnet takes a list of strings to be added. each string is a vnet. _dcDao.addVnet(network.getDataCenterId(), network.getId(), addVnetsFinal); } if (removeVnetsFinal != null) { s_logger.debug("removing vnet range " + removeVnetsFinal.toString() + " for the physicalNetwork id= " + network.getId() + " and zone id=" + - network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); + network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); //deleteVnets takes a list of strings to be removed. each string is a vnet. _datacneter_vnet.deleteVnets(TransactionLegacy.currentTxn(), network.getDataCenterId(), network.getId(), removeVnetsFinal); } @@ -2675,8 +2697,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return vlanTokens; } if (VnetRange.length < 2) { - throw new InvalidParameterValueException("Please provide valid vnet range. vnet range should be a coma seperated list of vlan ranges. example 500-500,600-601" + - rangeMessage); + throw new InvalidParameterValueException( + "Please provide valid vnet range. vnet range should be a coma seperated list of vlan ranges. example 500-500,600-601" + rangeMessage); } if (VnetRange[0] == null || VnetRange[1] == null) { @@ -2689,7 +2711,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } catch (NumberFormatException e) { s_logger.warn("Unable to parse vnet range:", e); throw new InvalidParameterValueException("Please provide valid vnet range. The vnet range should be a coma seperated list example 2001-2012,3000-3005." + - rangeMessage); + rangeMessage); } if (StartVnet < minVnet || EndVnet > maxVnet) { throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage); @@ -2775,9 +2797,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { Integer dedicatedStartVlan = Integer.parseInt(vlans[0]); Integer dedicatedEndVlan = Integer.parseInt(vlans[1]); if ((start >= dedicatedStartVlan && start <= dedicatedEndVlan) || (end >= dedicatedStartVlan && end <= dedicatedEndVlan)) { - throw new InvalidParameterValueException("Vnet range " + map.getGuestVlanRange() + " is dedicated" + " to an account. The specified range " + start + "-" + - end + " overlaps with the dedicated range " + - " Please release the overlapping dedicated range before deleting the range"); + throw new InvalidParameterValueException("Vnet range " + map.getGuestVlanRange() + " is dedicated" + " to an account. The specified range " + start + + "-" + end + " overlaps with the dedicated range " + " Please release the overlapping dedicated range before deleting the range"); } } } @@ -2990,12 +3011,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // Verify guest vlans in the range don't belong to a network of a different account for (int i = startVlan; i <= endVlan; i++) { - List allocatedVlans = _datacneter_vnet.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan); + List allocatedVlans = + _datacneter_vnet.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan); if (allocatedVlans != null && !allocatedVlans.isEmpty()) { for (DataCenterVnetVO allocatedVlan : allocatedVlans) { if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) { throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account." + - " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account "); + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account "); } } } @@ -3137,7 +3159,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (zoneId != null) { SearchBuilder physicalnetworkSearch = _physicalNetworkDao.createSearchBuilder(); physicalnetworkSearch.and("zoneId", physicalnetworkSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); - sb.join("physicalnetworkSearch", physicalnetworkSearch, sb.entity().getPhysicalNetworkId(), physicalnetworkSearch.entity().getId(), JoinBuilder.JoinType.INNER); + sb.join("physicalnetworkSearch", physicalnetworkSearch, sb.entity().getPhysicalNetworkId(), physicalnetworkSearch.entity().getId(), + JoinBuilder.JoinType.INNER); } SearchCriteria sc = sb.create(); @@ -3210,8 +3233,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @DB @ActionEvent(eventType = EventTypes.EVENT_SERVICE_PROVIDER_CREATE, eventDescription = "Creating Physical Network ServiceProvider", create = true) - public PhysicalNetworkServiceProvider - addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, List enabledServices) { + public PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, + List enabledServices) { // verify input parameters PhysicalNetworkVO network = _physicalNetworkDao.findById(physicalNetworkId); @@ -3253,8 +3276,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (enabledServices != null) { if (!element.canEnableIndividualServices()) { if (enabledServices.size() != element.getCapabilities().keySet().size()) { - throw new InvalidParameterValueException("Cannot enable subset of Services, Please specify the complete list of Services for this Service Provider '" + - providerName + "'"); + throw new InvalidParameterValueException( + "Cannot enable subset of Services, Please specify the complete list of Services for this Service Provider '" + providerName + "'"); } } @@ -3353,8 +3376,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (state != null) { if (s_logger.isDebugEnabled()) { - s_logger.debug("trying to update the state of the service provider id=" + id + " on physical network: " + provider.getPhysicalNetworkId() + " to state: " + - stateStr); + s_logger.debug("trying to update the state of the service provider id=" + id + " on physical network: " + provider.getPhysicalNetworkId() + + " to state: " + stateStr); } switch (state) { case Enabled: @@ -3473,7 +3496,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (pNtwks.size() > 1) { if (tag == null) { - throw new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + " and no tags are specified in order to make a choice"); + throw new InvalidParameterValueException("More than one physical networks exist in zone id=" + zoneId + + " and no tags are specified in order to make a choice"); } Long pNtwkId = null; @@ -3496,8 +3520,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @DB @ActionEvent(eventType = EventTypes.EVENT_TRAFFIC_TYPE_CREATE, eventDescription = "Creating Physical Network TrafficType", create = true) - public PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficTypeStr, String xenLabel, String kvmLabel, String vmwareLabel, - String simulatorLabel, String vlan, String hypervLabel) { + public PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficTypeStr, String xenLabel, String kvmLabel, + String vmwareLabel, String simulatorLabel, String vlan, String hypervLabel) { // verify input parameters PhysicalNetworkVO network = _physicalNetworkDao.findById(physicalNetworkId); @@ -3524,15 +3548,16 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (TrafficType.isSystemNetwork(trafficType) || TrafficType.Public.equals(trafficType) || TrafficType.Storage.equals(trafficType)) { if (!_physicalNetworkDao.listByZoneAndTrafficType(network.getDataCenterId(), trafficType).isEmpty()) { throw new CloudRuntimeException("Fail to add the traffic type to physical network because Zone already has a physical network with this traffic type: " + - trafficType); + trafficType); } } if (TrafficType.Storage.equals(trafficType)) { List ssvms = _stnwMgr.getSSVMWithNoStorageNetwork(network.getDataCenterId()); if (!ssvms.isEmpty()) { - StringBuilder sb = new StringBuilder( - "Cannot add " + + StringBuilder sb = + new StringBuilder( + "Cannot add " + trafficType + " traffic type as there are below secondary storage vm still running. Please stop them all and add Storage traffic type again, then destory them all to allow CloudStack recreate them with storage network(If you have added storage network ip range)"); sb.append("SSVMs:"); @@ -3548,8 +3573,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (xenLabel == null) { xenLabel = getDefaultXenNetworkLabel(trafficType); } - PhysicalNetworkTrafficTypeVO pNetworktrafficType = new PhysicalNetworkTrafficTypeVO(physicalNetworkId, trafficType, xenLabel, kvmLabel, vmwareLabel, simulatorLabel, - vlan, hypervLabel); + PhysicalNetworkTrafficTypeVO pNetworktrafficType = + new PhysicalNetworkTrafficTypeVO(physicalNetworkId, trafficType, xenLabel, kvmLabel, vmwareLabel, simulatorLabel, vlan, hypervLabel); pNetworktrafficType = _pNTrafficTypeDao.persist(pNetworktrafficType); return pNetworktrafficType; @@ -3643,13 +3668,14 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // check if there are any networks associated to this physical network with this traffic type if (TrafficType.Guest.equals(trafficType.getTrafficType())) { if (!_networksDao.listByPhysicalNetworkTrafficType(trafficType.getPhysicalNetworkId(), trafficType.getTrafficType()).isEmpty()) { - throw new CloudRuntimeException("The Traffic Type is not deletable because there are existing networks with this traffic type:" + trafficType.getTrafficType()); + throw new CloudRuntimeException("The Traffic Type is not deletable because there are existing networks with this traffic type:" + + trafficType.getTrafficType()); } } else if (TrafficType.Storage.equals(trafficType.getTrafficType())) { PhysicalNetworkVO pn = _physicalNetworkDao.findById(trafficType.getPhysicalNetworkId()); if (_stnwMgr.isAnyStorageIpInUseInZone(pn.getDataCenterId())) { throw new CloudRuntimeException("The Traffic Type is not deletable because there are still some storage network ip addresses in use:" + - trafficType.getTrafficType()); + trafficType.getTrafficType()); } } return _pNTrafficTypeDao.remove(id); @@ -3674,12 +3700,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { NetworkVO getExclusiveGuestNetwork(long zoneId) { List networks = _networksDao.listBy(Account.ACCOUNT_ID_SYSTEM, zoneId, GuestType.Shared, TrafficType.Guest); if (networks == null || networks.isEmpty()) { - throw new InvalidParameterValueException("Unable to find network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + zoneId); + throw new InvalidParameterValueException("Unable to find network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + + zoneId); } if (networks.size() > 1) { - throw new InvalidParameterValueException("Found more than 1 network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + " in zone " + - zoneId); + throw new InvalidParameterValueException("Found more than 1 network with trafficType " + TrafficType.Guest + " and guestType " + GuestType.Shared + + " in zone " + zoneId); } @@ -3793,8 +3820,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @ActionEvent(eventType = EventTypes.EVENT_NET_IP_ASSIGN, eventDescription = "associating Ip", async = true) - public IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException, ResourceAllocationException, ResourceUnavailableException, - ConcurrentOperationException { + public IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException, ResourceAllocationException, + ResourceUnavailableException, ConcurrentOperationException { Network network = _networksDao.findById(networkId); if (network == null) { @@ -3802,7 +3829,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } if (network.getVpcId() != null) { - throw new InvalidParameterValueException("Can't assign ip to the network directly when network belongs" + " to VPC.Specify vpcId to associate ip address to VPC"); + throw new InvalidParameterValueException("Can't assign ip to the network directly when network belongs" + + " to VPC.Specify vpcId to associate ip address to VPC"); } return _ipAddrMgr.associateIPToGuestNetwork(ipId, networkId, true); @@ -3810,8 +3838,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @DB - public Network createPrivateNetwork(final String networkName, final String displayText, long physicalNetworkId, String broadcastUriString, final String startIp, String endIp, - final String gateway, String netmask, final long networkOwnerId, final Long vpcId, final Boolean sourceNat, final Long networkOfferingId) + public Network createPrivateNetwork(final String networkName, final String displayText, long physicalNetworkId, String broadcastUriString, final String startIp, + String endIp, final String gateway, String netmask, final long networkOwnerId, final Long vpcId, final Boolean sourceNat, final Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException { final Account owner = _accountMgr.getAccount(networkOwnerId); @@ -3874,15 +3902,16 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId); if (privateNetwork == null) { //create Guest network - privateNetwork = _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, null, owner, null, pNtwk, - pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null); + privateNetwork = + _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, null, owner, null, pNtwk, + pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null); s_logger.debug("Created private network " + privateNetwork); } else { s_logger.debug("Private network already exists: " + privateNetwork); //Do not allow multiple private gateways with same Vlan within a VPC if (vpcId.equals(privateNetwork.getVpcId())) { - throw new InvalidParameterValueException("Private network for the vlan: " + uriString + " and cidr " + cidr + " already exists " + "for Vpc " + - vpcId + " in zone " + _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName()); + throw new InvalidParameterValueException("Private network for the vlan: " + uriString + " and cidr " + cidr + " already exists " + + "for Vpc " + vpcId + " in zone " + _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName()); } } @@ -3890,7 +3919,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { PrivateIpVO privateIp = _privateIpDao.findByIpAndSourceNetworkIdAndVpcId(privateNetwork.getId(), startIp, vpcId); if (privateIp != null) { throw new InvalidParameterValueException("Private ip address " + startIp + " already used for private gateway" + " in zone " + - _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName()); + _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName()); } Long mac = dc.getMacAddress(); diff --git a/server/src/com/cloud/network/NetworkUsageManager.java b/server/src/com/cloud/network/NetworkUsageManager.java index cb2d1a373e0..f75b3abd57f 100644 --- a/server/src/com/cloud/network/NetworkUsageManager.java +++ b/server/src/com/cloud/network/NetworkUsageManager.java @@ -19,7 +19,6 @@ package com.cloud.network; import java.util.List; import com.cloud.network.dao.IPAddressVO; - import com.cloud.utils.component.Manager; public interface NetworkUsageManager extends Manager { diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index 6f6c7f72fd8..021ae7f46e7 100755 --- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java +++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java @@ -32,6 +32,11 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd; +import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; + import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; @@ -67,18 +72,10 @@ import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; - -import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd; -import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd; -import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd; -import org.apache.cloudstack.api.response.TrafficMonitorResponse; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import com.cloud.usage.UsageIPAddressVO; +import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; -import com.cloud.user.User; import com.cloud.user.UserStatisticsVO; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.utils.NumbersUtil; @@ -88,10 +85,10 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; @@ -324,7 +321,8 @@ public class NetworkUsageManagerImpl extends ManagerBase implements NetworkUsage final Date now = rightNow.getTime(); if (lastCollection.after(now)) { - s_logger.debug("Current time is less than 2 hours after last collection time : " + lastCollection.toString() + ". Skipping direct network usage collection"); + s_logger.debug("Current time is less than 2 hours after last collection time : " + lastCollection.toString() + + ". Skipping direct network usage collection"); return false; } @@ -356,7 +354,7 @@ public class NetworkUsageManagerImpl extends ManagerBase implements NetworkUsage List IpList = new ArrayList(); for (IPAddressVO ip : allocatedIps) { - if (ip.getAllocatedToAccountId() == AccountVO.ACCOUNT_ID_SYSTEM) { + if (ip.getAllocatedToAccountId() == Account.ACCOUNT_ID_SYSTEM) { //Ignore usage for system account continue; } diff --git a/server/src/com/cloud/network/PortProfileManagerImpl.java b/server/src/com/cloud/network/PortProfileManagerImpl.java index b21c424cb2e..372164d6e9f 100644 --- a/server/src/com/cloud/network/PortProfileManagerImpl.java +++ b/server/src/com/cloud/network/PortProfileManagerImpl.java @@ -19,13 +19,11 @@ package com.cloud.network; import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.network.dao.PortProfileDaoImpl; import com.cloud.network.dao.PortProfileVO; import com.cloud.network.dao.PortProfileVO.BindingType; import com.cloud.network.dao.PortProfileVO.PortType; +import com.cloud.utils.db.DB; public class PortProfileManagerImpl { diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index 48dbd418e56..ea3bf5ccfdd 100755 --- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java +++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java @@ -26,6 +26,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd; import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd; import org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd; @@ -45,12 +46,12 @@ import com.cloud.network.dao.NetworkVO; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.QueryBuilder; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionCallbackWithException; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionLegacy; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.SecondaryStorageVmVO; @@ -92,7 +93,7 @@ public class StorageNetworkManagerImpl extends ManagerBase implements StorageNet for (StorageNetworkIpRangeVO range : curRanges) { if (NetUtils.ipRangesOverlap(startIp, endIp, range.getStartIp(), range.getEndIp())) { throw new InvalidParameterValueException("The Storage network Start IP and endIP address range overlap with private IP :" + range.getStartIp() + " - " + - range.getEndIp()); + range.getEndIp()); } } } @@ -100,7 +101,8 @@ public class StorageNetworkManagerImpl extends ManagerBase implements StorageNet private void createStorageIpEntires(TransactionLegacy txn, long rangeId, String startIp, String endIp, long zoneId) throws SQLException { long startIPLong = NetUtils.ip2Long(startIp); long endIPLong = NetUtils.ip2Long(endIp); - String insertSql = "INSERT INTO `cloud`.`op_dc_storage_network_ip_address` (range_id, ip_address, mac_address, taken) VALUES (?, ?, (select mac_address from `cloud`.`data_center` where id=?), ?)"; + String insertSql = + "INSERT INTO `cloud`.`op_dc_storage_network_ip_address` (range_id, ip_address, mac_address, taken) 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; Connection conn = txn.getConnection(); @@ -359,8 +361,8 @@ public class StorageNetworkManagerImpl extends ManagerBase implements StorageNet @Override public List getSSVMWithNoStorageNetwork(long zoneId) { - List ssvms = _ssvmDao.getSecStorageVmListInStates(null, zoneId, VirtualMachine.State.Starting, VirtualMachine.State.Running, - VirtualMachine.State.Stopping); + List ssvms = + _ssvmDao.getSecStorageVmListInStates(null, zoneId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping); return ssvms; } diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 1ffb85d8011..fb7c922dcf8 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -95,9 +95,9 @@ import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.net.NetUtils; @@ -181,7 +181,7 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale } if (!isRequiredParamPresent) { throw new InvalidParameterException("Parameter " + autoScaleCounterParam.getParamName() + " has to be set in AutoScaleVmProfile's " + - ApiConstants.COUNTERPARAM_LIST); + ApiConstants.COUNTERPARAM_LIST); } } } @@ -334,8 +334,9 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale */ ApiDispatcher.processParameters(new DeployVMCmd(), deployParams); - AutoScaleVmProfileVO profileVO = new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), - cmd.getOtherDeployParams(), cmd.getCounterParamList(), cmd.getDestroyVmGraceperiod(), autoscaleUserId); + AutoScaleVmProfileVO profileVO = + new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), cmd.getOtherDeployParams(), + cmd.getCounterParamList(), cmd.getDestroyVmGraceperiod(), autoscaleUserId); profileVO = checkValidityAndPersist(profileVO); s_logger.info("Successfully create AutoScale Vm Profile with Id: " + profileVO.getId()); @@ -571,8 +572,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale long pageSizeVal = cmd.getPageSizeVal(); Account caller = CallContext.current().getCallingAccount(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, - null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -704,8 +705,9 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale "there are Vms already bound to the specified LoadBalancing Rule. User bound Vms and AutoScaled Vm Group cannot co-exist on a Load Balancing Rule"); } - AutoScaleVmGroupVO vmGroupVO = new AutoScaleVmGroupVO(cmd.getLbRuleId(), zoneId, loadBalancer.getDomainId(), loadBalancer.getAccountId(), minMembers, maxMembers, - loadBalancer.getDefaultPortStart(), interval, cmd.getProfileId(), AutoScaleVmGroup.State_New); + AutoScaleVmGroupVO vmGroupVO = + new AutoScaleVmGroupVO(cmd.getLbRuleId(), zoneId, loadBalancer.getDomainId(), loadBalancer.getAccountId(), minMembers, maxMembers, + loadBalancer.getDefaultPortStart(), interval, cmd.getProfileId(), AutoScaleVmGroup.State_New); vmGroupVO = checkValidityAndPersist(vmGroupVO, cmd.getScaleUpPolicyIds(), cmd.getScaleDownPolicyIds()); s_logger.info("Successfully created Autoscale Vm Group with Id: " + vmGroupVO.getId()); @@ -832,7 +834,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale } @DB - protected AutoScaleVmGroupVO checkValidityAndPersist(final AutoScaleVmGroupVO vmGroup, final List passedScaleUpPolicyIds, final List passedScaleDownPolicyIds) { + protected AutoScaleVmGroupVO checkValidityAndPersist(final AutoScaleVmGroupVO vmGroup, final List passedScaleUpPolicyIds, + final List passedScaleDownPolicyIds) { int minMembers = vmGroup.getMinMembers(); int maxMembers = vmGroup.getMaxMembers(); int interval = vmGroup.getInterval(); @@ -854,7 +857,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale } if (minMembers > maxMembers) { - throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " (" + minMembers + ")cannot be greater than " + ApiConstants.MAX_MEMBERS + " (" + maxMembers + ")"); + throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " (" + minMembers + ")cannot be greater than " + ApiConstants.MAX_MEMBERS + " (" + + maxMembers + ")"); } if (interval < 0) { @@ -878,7 +882,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale getAutoScalePolicies("scaledownpolicyid", currentScaleDownPolicyIds, counters, interval, false); policyIds.addAll(currentScaleDownPolicyIds); } - AutoScaleVmProfileVO profileVO = getEntityInDatabase(CallContext.current().getCallingAccount(), ApiConstants.VMPROFILE_ID, vmGroup.getProfileId(), _autoScaleVmProfileDao); + AutoScaleVmProfileVO profileVO = + getEntityInDatabase(CallContext.current().getCallingAccount(), ApiConstants.VMPROFILE_ID, vmGroup.getProfileId(), _autoScaleVmProfileDao); LoadBalancerVO loadBalancer = getEntityInDatabase(CallContext.current().getCallingAccount(), ApiConstants.LBID, vmGroup.getLoadBalancerId(), _lbDao); validateAutoScaleCounters(loadBalancer.getNetworkId(), counters, profileVO.getCounterParams()); @@ -1076,7 +1081,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale if (policyId != null) { SearchBuilder asPolicyConditionSearch = _autoScalePolicyConditionMapDao.createSearchBuilder(); asPolicyConditionSearch.and("policyId", asPolicyConditionSearch.entity().getPolicyId(), SearchCriteria.Op.EQ); - sb.join("asPolicyConditionSearch", asPolicyConditionSearch, sb.entity().getId(), asPolicyConditionSearch.entity().getConditionId(), JoinBuilder.JoinType.INNER); + sb.join("asPolicyConditionSearch", asPolicyConditionSearch, sb.entity().getId(), asPolicyConditionSearch.entity().getConditionId(), + JoinBuilder.JoinType.INNER); } sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java index 971bdd5abfe..3b3646aecfb 100644 --- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java +++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java @@ -28,7 +28,6 @@ import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; -import com.cloud.agent.api.Command.OnError; import com.cloud.agent.api.routing.SavePasswordCommand; import com.cloud.agent.api.routing.VmDataCommand; import com.cloud.agent.manager.Commands; @@ -150,8 +149,8 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem return capabilities; } - private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, String guestIpAddress, String vmName, - String vmInstanceName, long vmId, String vmUuid, String publicKey) { + private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, String guestIpAddress, + String vmName, String vmInstanceName, long vmId, String vmUuid, String publicKey) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, _networkMgr.getExecuteInSeqNtwkElmtCmd()); cmd.addVmData("userdata", "user-data", userData); @@ -188,7 +187,8 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return true; } diff --git a/server/src/com/cloud/network/element/SecurityGroupElement.java b/server/src/com/cloud/network/element/SecurityGroupElement.java index 7b89d7f0490..356feced590 100644 --- a/server/src/com/cloud/network/element/SecurityGroupElement.java +++ b/server/src/com/cloud/network/element/SecurityGroupElement.java @@ -36,7 +36,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.DB; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = NetworkElement.class) @@ -69,13 +68,14 @@ public class SecurityGroupElement extends AdapterBase implements NetworkElement @Override @DB - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { return true; } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -95,7 +95,8 @@ public class SecurityGroupElement extends AdapterBase implements NetworkElement } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index 51f4002bc23..bcd4ce2082a 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -97,7 +97,7 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; @Local(value = {NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class, - LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, RemoteAccessVPNServiceProvider.class, NetworkMigrationResponder.class}) + LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, RemoteAccessVPNServiceProvider.class, NetworkMigrationResponder.class}) public class VirtualRouterElement extends AdapterBase implements VirtualRouterElementService, DhcpServiceProvider, UserDataServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider, LoadBalancingServiceProvider, PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, NetworkMigrationResponder { @@ -179,8 +179,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl Map params = new HashMap(1); params.put(VirtualMachineProfile.Param.ReProgramGuestNetworks, true); - List routers = _routerMgr.deployVirtualRouterInGuestNetwork(network, dest, _accountMgr.getAccount(network.getAccountId()), params, - offering.getRedundantRouter()); + List routers = + _routerMgr.deployVirtualRouterInGuestNetwork(network, dest, _accountMgr.getAccount(network.getAccountId()), params, offering.getRedundantRouter()); if ((routers == null) || (routers.size() == 0)) { throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId()); } @@ -189,8 +189,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { if (vm.getType() != VirtualMachine.Type.User || vm.getHypervisorType() == HypervisorType.BareMetal) { return false; } @@ -209,8 +209,9 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl @SuppressWarnings("unchecked") VirtualMachineProfile uservm = vm; - List routers = _routerMgr.deployVirtualRouterInGuestNetwork(network, dest, _accountMgr.getAccount(network.getAccountId()), uservm.getParameters(), - offering.getRedundantRouter()); + List routers = + _routerMgr.deployVirtualRouterInGuestNetwork(network, dest, _accountMgr.getAccount(network.getAccountId()), uservm.getParameters(), + offering.getRedundantRouter()); if ((routers == null) || (routers.size() == 0)) { throw new ResourceUnavailableException("Can't find at least one running router!", DataCenter.class, network.getDataCenterId()); } @@ -222,7 +223,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (canHandle(config, Service.Firewall)) { List routers = _routerDao.listByNetworkAndRole(config.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + config.getId()); + s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + + config.getId()); return true; } @@ -378,7 +380,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (canHandle(network, Service.Vpn)) { List routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to apply vpn users on the backend; virtual router" + " doesn't exist in the network " + network.getId()); + s_logger.debug("Virtual router elemnt doesn't need to apply vpn users on the backend; virtual router" + " doesn't exist in the network " + + network.getId()); return null; } return _routerMgr.applyVpnUsers(network, users, routers); @@ -440,7 +443,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (canHandle) { List routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to associate ip addresses on the backend; virtual " + "router doesn't exist in the network " + network.getId()); + s_logger.debug("Virtual router elemnt doesn't need to associate ip addresses on the backend; virtual " + "router doesn't exist in the network " + + network.getId()); return true; } @@ -467,39 +471,40 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl method = new LbStickinessMethod(StickinessMethodType.LBCookieBased, "This is loadbalancer cookie based stickiness method."); method.addParam("cookie-name", false, "Cookie name passed in http header by the LB to the client.", false); method.addParam("mode", false, "Valid values: insert, rewrite, prefix. Default value: insert. In the insert mode cookie will be created" - + " by the LB. In other modes, cookie will be created by the server and LB modifies it.", false); + + " by the LB. In other modes, cookie will be created by the server and LB modifies it.", false); method.addParam("nocache", false, "This option is recommended in conjunction with the insert mode when there is a cache between the client" - + " and HAProxy, as it ensures that a cacheable response will be tagged non-cacheable if a cookie needs " - + "to be inserted. This is important because if all persistence cookies are added on a cacheable home page" - + " for instance, then all customers will then fetch the page from an outer cache and will all share the " - + "same persistence cookie, leading to one server receiving much more traffic than others. See also the " - + "insert and postonly options. ", true); + + " and HAProxy, as it ensures that a cacheable response will be tagged non-cacheable if a cookie needs " + + "to be inserted. This is important because if all persistence cookies are added on a cacheable home page" + + " for instance, then all customers will then fetch the page from an outer cache and will all share the " + + "same persistence cookie, leading to one server receiving much more traffic than others. See also the " + "insert and postonly options. ", true); method.addParam("indirect", false, "When this option is specified in insert mode, cookies will only be added when the server was not reached" - + " after a direct access, which means that only when a server is elected after applying a load-balancing algorithm," - + " or after a redispatch, then the cookie will be inserted. If the client has all the required information" - + " to connect to the same server next time, no further cookie will be inserted. In all cases, when the " - + "indirect option is used in insert mode, the cookie is always removed from the requests transmitted to " - + "the server. The persistence mechanism then becomes totally transparent from the application point of view.", true); + + " after a direct access, which means that only when a server is elected after applying a load-balancing algorithm," + + " or after a redispatch, then the cookie will be inserted. If the client has all the required information" + + " to connect to the same server next time, no further cookie will be inserted. In all cases, when the " + + "indirect option is used in insert mode, the cookie is always removed from the requests transmitted to " + + "the server. The persistence mechanism then becomes totally transparent from the application point of view.", true); method.addParam("postonly", false, "This option ensures that cookie insertion will only be performed on responses to POST requests. It is an" - + " alternative to the nocache option, because POST responses are not cacheable, so this ensures that the " - + "persistence cookie will never get cached.Since most sites do not need any sort of persistence before the" - + " first POST which generally is a login request, this is a very efficient method to optimize caching " - + "without risking to find a persistence cookie in the cache. See also the insert and nocache options.", true); + + " alternative to the nocache option, because POST responses are not cacheable, so this ensures that the " + + "persistence cookie will never get cached.Since most sites do not need any sort of persistence before the" + + " first POST which generally is a login request, this is a very efficient method to optimize caching " + + "without risking to find a persistence cookie in the cache. See also the insert and nocache options.", true); method.addParam("domain", false, "This option allows to specify the domain at which a cookie is inserted. It requires exactly one parameter:" - + " a valid domain name. If the domain begins with a dot, the browser is allowed to use it for any host " - + "ending with that name. It is also possible to specify several domain names by invoking this option multiple" - + " times. Some browsers might have small limits on the number of domains, so be careful when doing that. " - + "For the record, sending 10 domains to MSIE 6 or Firefox 2 works as expected.", false); + + " a valid domain name. If the domain begins with a dot, the browser is allowed to use it for any host " + + "ending with that name. It is also possible to specify several domain names by invoking this option multiple" + + " times. Some browsers might have small limits on the number of domains, so be careful when doing that. " + + "For the record, sending 10 domains to MSIE 6 or Firefox 2 works as expected.", false); methodList.add(method); - method = new LbStickinessMethod(StickinessMethodType.AppCookieBased, - "This is App session based sticky method. Define session stickiness on an existing application cookie. " + "It can be used only for a specific http traffic"); + method = + new LbStickinessMethod(StickinessMethodType.AppCookieBased, + "This is App session based sticky method. Define session stickiness on an existing application cookie. " + + "It can be used only for a specific http traffic"); method.addParam("cookie-name", false, "This is the name of the cookie used by the application and which LB will " - + "have to learn for each new session. Default value: Auto geneared based on ip", false); + + "have to learn for each new session. Default value: Auto geneared based on ip", false); method.addParam("length", false, "This is the max number of characters that will be memorized and checked in " + "each cookie value. Default value:52", false); method.addParam("holdtime", false, "This is the time after which the cookie will be removed from memory if unused. The value should be in " - + "the format Example : 20s or 30m or 4h or 5d . only seconds(s), minutes(m) hours(h) and days(d) are valid," - + " cannot use th combinations like 20h30m. Default value:3h ", false); + + "the format Example : 20s or 30m or 4h or 5d . only seconds(s), minutes(m) hours(h) and days(d) are valid," + + " cannot use th combinations like 20h30m. Default value:3h ", false); method.addParam( "request-learn", false, @@ -509,18 +514,18 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl "prefix", false, "When this option is specified, haproxy will match on the cookie prefix (or URL parameter prefix). " - + "The appsession value is the data following this prefix. Example : appsession ASPSESSIONID len 64 timeout 3h prefix This will match the cookie ASPSESSIONIDXXXX=XXXXX, the appsession value will be XXXX=XXXXX.", + + "The appsession value is the data following this prefix. Example : appsession ASPSESSIONID len 64 timeout 3h prefix This will match the cookie ASPSESSIONIDXXXX=XXXXX, the appsession value will be XXXX=XXXXX.", true); method.addParam("mode", false, "This option allows to change the URL parser mode. 2 modes are currently supported : - path-parameters " - + ": The parser looks for the appsession in the path parameters part (each parameter is separated by a semi-colon), " - + "which is convenient for JSESSIONID for example.This is the default mode if the option is not set. - query-string :" - + " In this mode, the parser will look for the appsession in the query string.", false); + + ": The parser looks for the appsession in the path parameters part (each parameter is separated by a semi-colon), " + + "which is convenient for JSESSIONID for example.This is the default mode if the option is not set. - query-string :" + + " In this mode, the parser will look for the appsession in the query string.", false); methodList.add(method); method = new LbStickinessMethod(StickinessMethodType.SourceBased, "This is source based Stickiness method, " + "it can be used for any type of protocol."); method.addParam("tablesize", false, "Size of table to store source ip addresses. example: tablesize=200k or 300m" + " or 400g. Default value:200k", false); - method.addParam("expire", false, - "Entry in source ip table will expire after expire duration. units can be s,m,h,d ." + " example: expire=30m 20s 50h 4d. Default value:3h", false); + method.addParam("expire", false, "Entry in source ip table will expire after expire duration. units can be s,m,h,d ." + + " example: expire=30m 20s 50h 4d. Default value:3h", false); methodList.add(method); Gson gson = new Gson(); @@ -584,7 +589,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (canHandle(config, Service.StaticNat)) { List routers = _routerDao.listByNetworkAndRole(config.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to apply static nat on the backend; virtual " + "router doesn't exist in the network " + config.getId()); + s_logger.debug("Virtual router elemnt doesn't need to apply static nat on the backend; virtual " + "router doesn't exist in the network " + + config.getId()); return true; } @@ -709,7 +715,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl @Override public VirtualRouterProvider addElement(Long nspId, Type providerType) { if (!(providerType == Type.VirtualRouter || providerType == Type.VPCVirtualRouter)) { - throw new InvalidParameterValueException("Element " + getName() + " supports only providerTypes: " + Type.VirtualRouter.toString() + " and " + Type.VPCVirtualRouter); + throw new InvalidParameterValueException("Element " + getName() + " supports only providerTypes: " + Type.VirtualRouter.toString() + " and " + + Type.VPCVirtualRouter); } VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(nspId, providerType); if (element != null) { @@ -726,7 +733,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (canHandle(network, Service.PortForwarding)) { List routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + network.getId()); + s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + + network.getId()); return true; } @@ -750,7 +758,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl } @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), getVirtualRouterProvider()); if (element == null) { return true; @@ -787,7 +796,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl } @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { return true; } @@ -829,8 +839,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl } @Override - public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { if (canHandle(network, Service.Dhcp)) { if (vm.getType() != VirtualMachine.Type.User) { return false; @@ -882,8 +892,9 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, getProvider())) { publicNetwork = true; } - boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMgr.isSecurityGroupSupportedInNetwork(network)) && - network.getTrafficType() == TrafficType.Guest; + boolean isPodBased = + (dest.getDataCenter().getNetworkType() == NetworkType.Basic || _networkMgr.isSecurityGroupSupportedInNetwork(network)) && + network.getTrafficType() == TrafficType.Guest; List routers; @@ -934,8 +945,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl @Override public boolean verifyServicesCombination(Set services) { if (!services.contains(Service.SourceNat)) { - if (services.contains(Service.StaticNat) || services.contains(Service.Firewall) || services.contains(Service.Lb) || services.contains(Service.PortForwarding) || - services.contains(Service.Vpn)) { + if (services.contains(Service.StaticNat) || services.contains(Service.Firewall) || services.contains(Service.Lb) || + services.contains(Service.PortForwarding) || services.contains(Service.Vpn)) { String servicesList = "["; for (Service service : services) { servicesList += service.getName() + " "; diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java index 8aefce86944..f535e2e959c 100644 --- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java @@ -68,8 +68,8 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = {NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class, - LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, VpcProvider.class, Site2SiteVpnServiceProvider.class, - NetworkACLServiceProvider.class}) + LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, VpcProvider.class, Site2SiteVpnServiceProvider.class, + NetworkACLServiceProvider.class}) public class VpcVirtualRouterElement extends VirtualRouterElement implements VpcProvider, Site2SiteVpnServiceProvider, NetworkACLServiceProvider { private static final Logger s_logger = Logger.getLogger(VpcVirtualRouterElement.class); @Inject @@ -190,8 +190,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc } @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { Long vpcId = network.getVpcId(); if (vpcId == null) { @@ -331,7 +331,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _vpcRouterMgr.getVpcRouters(gateway.getVpcId()); if (routers == null || routers.isEmpty()) { - s_logger.debug(getName() + " element doesn't need to create Private gateway on the backend; VPC virtual " + "router doesn't exist in the vpc id=" + gateway.getVpcId()); + s_logger.debug(getName() + " element doesn't need to create Private gateway on the backend; VPC virtual " + "router doesn't exist in the vpc id=" + + gateway.getVpcId()); return true; } @@ -365,7 +366,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _vpcRouterMgr.getVpcRouters(gateway.getVpcId()); if (routers == null || routers.isEmpty()) { - s_logger.debug(getName() + " element doesn't need to delete Private gateway on the backend; VPC virtual " + "router doesn't exist in the vpc id=" + gateway.getVpcId()); + s_logger.debug(getName() + " element doesn't need to delete Private gateway on the backend; VPC virtual " + "router doesn't exist in the vpc id=" + + gateway.getVpcId()); return true; } @@ -391,7 +393,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { s_logger.debug(getName() + " element doesn't need to associate ip addresses on the backend; VPC virtual " + "router doesn't exist in the network " + - network.getId()); + network.getId()); return true; } @@ -406,7 +408,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc if (canHandle(config, Service.NetworkACL)) { List routers = _routerDao.listByNetworkAndRole(config.getId(), Role.VIRTUAL_ROUTER); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + config.getId()); + s_logger.debug("Virtual router elemnt doesn't need to apply firewall rules on the backend; virtual " + "router doesn't exist in the network " + + config.getId()); return true; } @@ -448,7 +451,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _vpcRouterMgr.getVpcRouters(gateway.getVpcId()); if (routers == null || routers.isEmpty()) { - s_logger.debug("Virtual router element doesn't need to apply network acl rules on the backend; virtual " + "router doesn't exist in the network " + config.getId()); + s_logger.debug("Virtual router element doesn't need to apply network acl rules on the backend; virtual " + "router doesn't exist in the network " + + config.getId()); return true; } @@ -479,8 +483,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _vpcRouterMgr.getVpcRouters(ip.getVpcId()); if (routers == null || routers.size() != 1) { - throw new ResourceUnavailableException("Cannot enable site-to-site VPN on the backend; virtual router doesn't exist in the vpc " + ip.getVpcId(), DataCenter.class, - vpc.getZoneId()); + throw new ResourceUnavailableException("Cannot enable site-to-site VPN on the backend; virtual router doesn't exist in the vpc " + ip.getVpcId(), + DataCenter.class, vpc.getZoneId()); } return _vpcRouterMgr.startSite2SiteVpn(conn, routers.get(0)); @@ -506,8 +510,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc List routers = _vpcRouterMgr.getVpcRouters(ip.getVpcId()); if (routers == null || routers.size() != 1) { - throw new ResourceUnavailableException("Cannot enable site-to-site VPN on the backend; virtual router doesn't exist in the vpc " + ip.getVpcId(), DataCenter.class, - vpc.getZoneId()); + throw new ResourceUnavailableException("Cannot enable site-to-site VPN on the backend; virtual router doesn't exist in the vpc " + ip.getVpcId(), + DataCenter.class, vpc.getZoneId()); } return _vpcRouterMgr.stopSite2SiteVpn(conn, routers.get(0)); diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index b41cd6c64c6..a14c880ea41 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -27,12 +27,13 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.domain.dao.DomainDao; @@ -179,14 +180,14 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, Account caller = CallContext.current().getCallingAccount(); Long sourceIpAddressId = rule.getSourceIpAddressId(); - return createFirewallRule(sourceIpAddressId, caller, rule.getXid(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), rule.getSourceCidrList(), - rule.getIcmpCode(), rule.getIcmpType(), null, rule.getType(), rule.getNetworkId(), rule.getTrafficType()); + return createFirewallRule(sourceIpAddressId, caller, rule.getXid(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), + rule.getSourceCidrList(), rule.getIcmpCode(), rule.getIcmpType(), null, rule.getType(), rule.getNetworkId(), rule.getTrafficType()); } @DB - protected FirewallRule createFirewallRule(final Long ipAddrId, Account caller, final String xId, final Integer portStart, final Integer portEnd, final String protocol, - final List sourceCidrList, final Integer icmpCode, final Integer icmpType, final Long relatedRuleId, final FirewallRule.FirewallRuleType type, - final Long networkId, final FirewallRule.TrafficType trafficType) throws NetworkRuleConflictException { + protected FirewallRule createFirewallRule(final Long ipAddrId, Account caller, final String xId, final Integer portStart, final Integer portEnd, + final String protocol, final List sourceCidrList, final Integer icmpCode, final Integer icmpType, final Long relatedRuleId, + final FirewallRule.FirewallRuleType type, final Long networkId, final FirewallRule.TrafficType trafficType) throws NetworkRuleConflictException { IPAddressVO ipAddress = null; if (ipAddrId != null) { @@ -229,8 +230,9 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, return Transaction.execute(new TransactionCallbackWithException() { @Override public FirewallRuleVO doInTransaction(TransactionStatus status) throws NetworkRuleConflictException { - FirewallRuleVO newRule = new FirewallRuleVO(xId, ipAddrId, portStart, portEnd, protocol.toLowerCase(), networkId, accountIdFinal, domainIdFinal, Purpose.Firewall, - sourceCidrList, icmpCode, icmpType, relatedRuleId, trafficType); + FirewallRuleVO newRule = + new FirewallRuleVO(xId, ipAddrId, portStart, portEnd, protocol.toLowerCase(), networkId, accountIdFinal, domainIdFinal, Purpose.Firewall, + sourceCidrList, icmpCode, icmpType, relatedRuleId, trafficType); newRule.setType(type); newRule = _firewallDao.persist(newRule); @@ -266,8 +268,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, _accountMgr.checkAccess(caller, null, true, ipAddressVO); } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -333,7 +335,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, if (newRule.getSourceIpAddressId() != null) { rules = _firewallDao.listByIpAndPurposeAndNotRevoked(newRule.getSourceIpAddressId(), null); assert (rules.size() >= 1) : "For network rules, we now always first persist the rule and then check for " - + "network conflicts so we should at least have one rule at this point."; + + "network conflicts so we should at least have one rule at this point."; } else { // fetches only firewall egress rules. rules = _firewallDao.listByNetworkPurposeTrafficTypeAndNotRevoked(newRule.getNetworkId(), Purpose.Firewall, newRule.getTrafficType()); @@ -345,8 +347,9 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, continue; // Skips my own rule. } - boolean oneOfRulesIsFirewall = ((rule.getPurpose() == Purpose.Firewall || newRule.getPurpose() == Purpose.Firewall) && ((newRule.getPurpose() != rule.getPurpose()) || (!newRule.getProtocol() - .equalsIgnoreCase(rule.getProtocol())))); + boolean oneOfRulesIsFirewall = + ((rule.getPurpose() == Purpose.Firewall || newRule.getPurpose() == Purpose.Firewall) && ((newRule.getPurpose() != rule.getPurpose()) || (!newRule.getProtocol() + .equalsIgnoreCase(rule.getProtocol())))); // if both rules are firewall and their cidrs are different, we can skip port ranges verification boolean bothRulesFirewall = (rule.getPurpose() == newRule.getPurpose() && rule.getPurpose() == Purpose.Firewall); @@ -390,28 +393,30 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, } } - boolean notNullPorts = (newRule.getSourcePortStart() != null && newRule.getSourcePortEnd() != null && rule.getSourcePortStart() != null && rule.getSourcePortEnd() != null); + boolean notNullPorts = + (newRule.getSourcePortStart() != null && newRule.getSourcePortEnd() != null && rule.getSourcePortStart() != null && rule.getSourcePortEnd() != null); if (!notNullPorts) { 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()))) { + !(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()))) { // we allow port forwarding rules with the same parameters but different protocols - boolean allowPf = (rule.getPurpose() == Purpose.PortForwarding && newRule.getPurpose() == Purpose.PortForwarding && !newRule.getProtocol().equalsIgnoreCase( - rule.getProtocol())); - boolean allowStaticNat = (rule.getPurpose() == Purpose.StaticNat && newRule.getPurpose() == Purpose.StaticNat && !newRule.getProtocol().equalsIgnoreCase( - rule.getProtocol())); + boolean allowPf = + (rule.getPurpose() == Purpose.PortForwarding && newRule.getPurpose() == Purpose.PortForwarding && !newRule.getProtocol().equalsIgnoreCase( + rule.getProtocol())); + boolean allowStaticNat = + (rule.getPurpose() == Purpose.StaticNat && newRule.getPurpose() == Purpose.StaticNat && !newRule.getProtocol().equalsIgnoreCase(rule.getProtocol())); if (!(allowPf || allowStaticNat || oneOfRulesIsFirewall)) { - throw new NetworkRuleConflictException("The range specified, " + newRule.getSourcePortStart() + "-" + newRule.getSourcePortEnd() + ", conflicts with rule " + - rule.getId() + " which has " + rule.getSourcePortStart() + "-" + rule.getSourcePortEnd()); + throw new NetworkRuleConflictException("The range specified, " + newRule.getSourcePortStart() + "-" + newRule.getSourcePortEnd() + + ", conflicts with rule " + rule.getId() + " which has " + rule.getSourcePortStart() + "-" + rule.getSourcePortEnd()); } } } @@ -518,7 +523,7 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, FirewallRuleVO relatedRule = _firewallDao.findByRelatedId(rule.getId()); if (relatedRule != null) { s_logger.warn("Can't remove the firewall rule id=" + rule.getId() + " as it has related firewall rule id=" + relatedRule.getId() + - "; leaving it in Revoke state"); + "; leaving it in Revoke state"); success = false; } else { removeRule(rule); @@ -652,8 +657,9 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, List sourceCidr = new ArrayList(); sourceCidr.add(NetUtils.ALL_CIDRS); - FirewallRuleVO ruleVO = new FirewallRuleVO(null, null, null, null, "all", networkId, network.getAccountId(), network.getDomainId(), Purpose.Firewall, sourceCidr, null, - null, null, FirewallRule.TrafficType.Egress, FirewallRuleType.System); + FirewallRuleVO ruleVO = + new FirewallRuleVO(null, null, null, null, "all", networkId, network.getAccountId(), network.getDomainId(), Purpose.Firewall, sourceCidr, null, null, null, + FirewallRule.TrafficType.Egress, FirewallRuleType.System); List rules = new ArrayList(); rules.add(ruleVO); @@ -738,7 +744,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, } if (generateUsageEvent && needUsageEvent) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), 0, rule.getId(), null, rule.getClass().getName(), rule.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_DELETE, rule.getAccountId(), 0, rule.getId(), null, rule.getClass().getName(), + rule.getUuid()); } } }); @@ -792,8 +799,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService, List oneCidr = new ArrayList(); oneCidr.add(NetUtils.ALL_CIDRS); - return createFirewallRule(ipAddrId, caller, null, startPort, endPort, protocol, oneCidr, icmpCode, icmpType, relatedRuleId, FirewallRule.FirewallRuleType.User, networkId, - FirewallRule.TrafficType.Ingress); + return createFirewallRule(ipAddrId, caller, null, startPort, endPort, protocol, oneCidr, icmpCode, icmpType, relatedRuleId, FirewallRule.FirewallRuleType.User, + networkId, FirewallRule.TrafficType.Ingress); } @Override diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java index 5e65e7aa447..08cc3e6fd30 100755 --- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java @@ -98,8 +98,9 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu return null; } - NetworkVO config = new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.LinkLocal, offering.getId(), Network.State.Setup, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO config = + new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.LinkLocal, offering.getId(), Network.State.Setup, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); config.setCidr(_cidr); config.setGateway(_gateway); @@ -111,7 +112,8 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu } @Override - public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { if (vm.getHypervisorType() == HypervisorType.VMware && !isRouterVm(vm)) { NicProfile nicProf = new NicProfile(Nic.ReservationStrategy.Create, null, null, null, null); @@ -205,7 +207,8 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu } @Override - public Network implement(Network config, NetworkOffering offering, DeployDestination destination, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network config, NetworkOffering offering, DeployDestination destination, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert config.getTrafficType() == TrafficType.Control : "Why are you sending this configuration to me " + config; return config; } diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 7cb2b947d94..0fec81f7093 100755 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -22,6 +22,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import com.cloud.dc.DataCenter; @@ -57,7 +58,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.ExceptionUtil; @@ -138,15 +138,16 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { state = State.Setup; } - NetworkVO config = new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Vlan, offering.getId(), state, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO config = + new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Vlan, offering.getId(), state, plan.getDataCenterId(), plan.getPhysicalNetworkId()); if (userSpecified != null) { if ((userSpecified.getCidr() == null && userSpecified.getGateway() != null) || (userSpecified.getCidr() != null && userSpecified.getGateway() == null)) { throw new InvalidParameterValueException("cidr and gateway must be specified together."); } - if ((userSpecified.getIp6Cidr() == null && userSpecified.getIp6Gateway() != null) || (userSpecified.getIp6Cidr() != null && userSpecified.getIp6Gateway() == null)) { + if ((userSpecified.getIp6Cidr() == null && userSpecified.getIp6Gateway() != null) || + (userSpecified.getIp6Cidr() != null && userSpecified.getIp6Gateway() == null)) { throw new InvalidParameterValueException("cidrv6 and gatewayv6 must be specified together."); } @@ -198,8 +199,8 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, - ConcurrentOperationException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException { DataCenter dc = _dcDao.findById(network.getDataCenterId()); @@ -240,14 +241,15 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { try { Transaction.execute(new TransactionCallbackWithExceptionNoReturn() { @Override - public void doInTransactionWithoutResult(TransactionStatus status) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public void doInTransactionWithoutResult(TransactionStatus status) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { _ipAddrMgr.allocateDirectIp(nic, dc, vm, network, requestedIp4Addr, requestedIp6Addr); //save the placeholder nic if the vm is the Virtual router if (vm.getType() == VirtualMachine.Type.DomainRouter) { Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); if (placeholderNic == null) { - s_logger.debug("Saving placeholder nic with ip4 address " + nic.getIp4Address() + " and ipv6 address " + nic.getIp6Address() + " for the network " + - network); + s_logger.debug("Saving placeholder nic with ip4 address " + nic.getIp4Address() + " and ipv6 address " + nic.getIp6Address() + + " for the network " + network); _networkMgr.savePlaceholderNic(network, nic.getIp4Address(), nic.getIp6Address(), VirtualMachine.Type.DomainRouter); } } diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index b36600d4633..0b5d6f7b4fe 100755 --- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -22,6 +22,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import com.cloud.configuration.ZoneConfig; @@ -93,8 +94,8 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru { } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, - ConcurrentOperationException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException { DataCenterVO dc = _dcDao.findById(network.getDataCenterId()); ReservationStrategy rsStrategy = ReservationStrategy.Start; @@ -184,8 +185,8 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru { if (placeholderNic != null) { IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIp4Address()); ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); - s_logger.debug("Nic got an ip address " + placeholderNic.getIp4Address() + " stored in placeholder nic for the network " + network + " and gateway " + - podRangeGateway); + s_logger.debug("Nic got an ip address " + placeholderNic.getIp4Address() + " stored in placeholder nic for the network " + network + + " and gateway " + podRangeGateway); } } diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java index 0833a2e3be5..cb7bbe1e046 100644 --- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java @@ -115,7 +115,8 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru { } @Override - public Network implement(Network config, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network config, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (config.getState() == State.Implementing) : "Why are we implementing " + config; if (Boolean.parseBoolean(_configDao.getValue(Config.OvsTunnelNetwork.key()))) { @@ -127,14 +128,16 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru { } DataCenter zone = dest.getDataCenter(); - NetworkVO implemented = new NetworkVO(config.getTrafficType(), config.getMode(), config.getBroadcastDomainType(), config.getNetworkOfferingId(), State.Allocated, - config.getDataCenterId(), config.getPhysicalNetworkId()); + NetworkVO implemented = + new NetworkVO(config.getTrafficType(), config.getMode(), config.getBroadcastDomainType(), config.getNetworkOfferingId(), State.Allocated, + config.getDataCenterId(), config.getPhysicalNetworkId()); // Get a vlan tag int vlanTag; if (config.getBroadcastUri() == null) { - String vnet = _dcDao.allocateVnet(zone.getId(), config.getPhysicalNetworkId(), config.getAccountId(), context.getReservationId(), - UseSystemGuestVlans.valueIn(config.getAccountId())); + String vnet = + _dcDao.allocateVnet(zone.getId(), config.getPhysicalNetworkId(), config.getAccountId(), context.getReservationId(), + UseSystemGuestVlans.valueIn(config.getAccountId())); try { // when supporting more types of networks this need to become @@ -145,8 +148,8 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru { } implemented.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vlanTag)); - ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), config.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_ASSIGN, - "Assigned Zone Vlan: " + vnet + " Network Id: " + config.getId(), 0); + ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), config.getAccountId(), EventVO.LEVEL_INFO, + EventTypes.EVENT_ZONE_VLAN_ASSIGN, "Assigned Zone Vlan: " + vnet + " Network Id: " + config.getId(), 0); } else { vlanTag = Integer.parseInt(BroadcastDomainType.getValue(config.getBroadcastUri())); implemented.setBroadcastUri(config.getBroadcastUri()); @@ -213,7 +216,8 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru { } @Override - public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { if (_networkModel.networkIsConfiguredForExternalNetworking(config.getDataCenterId(), config.getId()) && nic != null && nic.getRequestedIpv4() != null) { throw new CloudRuntimeException("Does not support custom ip allocation at this time: " + nic); diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index f54b5d8e9ba..1fd3e7fb397 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.ConfigKey; @@ -107,9 +108,14 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur IpAddressManager _ipAddrMgr; Random _rand = new Random(System.currentTimeMillis()); - static final ConfigKey UseSystemGuestVlans = new ConfigKey("Advanced", Boolean.class, "use.system.guest.vlans", "true", - "If true, when account has dedicated guest vlan range(s), once the vlans dedicated to the account have been consumed vlans will be allocated from the system pool", false, - ConfigKey.Scope.Account); + static final ConfigKey UseSystemGuestVlans = + new ConfigKey( + "Advanced", + Boolean.class, + "use.system.guest.vlans", + "true", + "If true, when account has dedicated guest vlan range(s), once the vlans dedicated to the account have been consumed vlans will be allocated from the system pool", + false, ConfigKey.Scope.Account); private static final TrafficType[] _trafficTypes = {TrafficType.Guest}; @@ -177,8 +183,9 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur return null; } - NetworkVO network = new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Vlan, offering.getId(), State.Allocated, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO network = + new NetworkVO(offering.getTrafficType(), Mode.Dhcp, BroadcastDomainType.Vlan, offering.getId(), State.Allocated, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); if (userSpecified != null) { if ((userSpecified.getCidr() == null && userSpecified.getGateway() != null) || (userSpecified.getCidr() != null && userSpecified.getGateway() == null)) { throw new InvalidParameterValueException("cidr and gateway must be specified together."); @@ -269,22 +276,25 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur } } - protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) throws InsufficientVirtualNetworkCapcityException { + protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId) + throws InsufficientVirtualNetworkCapcityException { if (network.getBroadcastUri() == null) { String vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId())); if (vnet == null) { - throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, dcId); + throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class, + dcId); } implemented.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vnet)); - ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_ASSIGN, - "Assigned Zone Vlan: " + vnet + " Network Id: " + network.getId(), 0); + ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, + EventTypes.EVENT_ZONE_VLAN_ASSIGN, "Assigned Zone Vlan: " + vnet + " Network Id: " + network.getId(), 0); } else { implemented.setBroadcastUri(network.getBroadcastUri()); } } @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { assert (network.getState() == State.Implementing) : "Why are we implementing " + network; long dcId = dest.getDataCenter().getId(); @@ -297,8 +307,9 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur physicalNetworkId = _networkModel.findPhysicalNetworkId(dcId, offering.getTags(), offering.getTrafficType()); } - NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, - network.getDataCenterId(), physicalNetworkId); + NetworkVO implemented = + new NetworkVO(network.getTrafficType(), network.getMode(), network.getBroadcastDomainType(), network.getNetworkOfferingId(), State.Allocated, + network.getDataCenterId(), physicalNetworkId); allocateVnet(network, implemented, dcId, physicalNetworkId, context.getReservationId()); @@ -313,7 +324,8 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { assert (network.getTrafficType() == TrafficType.Guest) : "Look at my name! Why are you calling" + " me when the traffic type is : " + network.getTrafficType(); @@ -351,7 +363,8 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur } else { guestIp = _ipAddrMgr.acquireGuestIpAddress(network, nic.getRequestedIpv4()); if (guestIp == null) { - throw new InsufficientVirtualNetworkCapcityException("Unable to acquire Guest IP" + " address for network " + network, DataCenter.class, dc.getId()); + throw new InsufficientVirtualNetworkCapcityException("Unable to acquire Guest IP" + " address for network " + network, DataCenter.class, + dc.getId()); } } @@ -406,9 +419,10 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur if (profile.getBroadcastDomainType() == BroadcastDomainType.Vlan && profile.getBroadcastUri() != null && !offering.getSpecifyVlan()) { s_logger.debug("Releasing vnet for the network id=" + profile.getId()); - _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(), profile.getAccountId(), - profile.getReservationId()); - ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), profile.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_RELEASE, + _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(), + profile.getAccountId(), profile.getReservationId()); + ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), profile.getAccountId(), EventVO.LEVEL_INFO, + EventTypes.EVENT_ZONE_VLAN_RELEASE, "Released Zone Vlan: " + BroadcastDomainType.getValue(profile.getBroadcastUri()) + " for Network: " + profile.getId(), 0); } profile.setBroadcastUri(null); diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java index 40cee7ab3f3..66b80c9e6b5 100755 --- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -35,8 +35,8 @@ import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; -import com.cloud.network.dao.NetworkVO; import com.cloud.network.StorageNetworkManager; +import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.Pair; @@ -46,7 +46,6 @@ import com.cloud.utils.net.NetUtils; import com.cloud.vm.Nic.ReservationStrategy; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Local(value = {NetworkGuru.class}) @@ -83,7 +82,8 @@ public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { return null; } - NetworkVO config = new NetworkVO(type, Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), plan.getPhysicalNetworkId()); + NetworkVO config = + new NetworkVO(type, Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), plan.getPhysicalNetworkId()); return config; } @@ -96,7 +96,8 @@ public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { } @Override - public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network config, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { TrafficType trafficType = config.getTrafficType(); assert trafficType == TrafficType.Management || trafficType == TrafficType.Storage : "Well, I can't take care of this config now can I? " + config; @@ -157,7 +158,8 @@ public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { } @Override - public Network implement(Network config, NetworkOffering offering, DeployDestination destination, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network config, NetworkOffering offering, DeployDestination destination, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { return config; } diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index 0b491f50f94..1710c4db470 100644 --- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java @@ -111,8 +111,8 @@ public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru { } else { broadcastType = BroadcastDomainType.Vlan; } - NetworkVO network = new NetworkVO(offering.getTrafficType(), Mode.Static, broadcastType, offering.getId(), State.Allocated, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO network = + new NetworkVO(offering.getTrafficType(), Mode.Static, broadcastType, offering.getId(), State.Allocated, plan.getDataCenterId(), plan.getPhysicalNetworkId()); if (userSpecified != null) { if ((userSpecified.getCidr() == null && userSpecified.getGateway() != null) || (userSpecified.getCidr() != null && userSpecified.getGateway() == null)) { throw new InvalidParameterValueException("cidr and gateway must be specified together."); @@ -151,13 +151,15 @@ public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru { } @Override - public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws InsufficientVirtualNetworkCapcityException { + public Network implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException { return network; } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { DataCenter dc = _entityMgr.findById(DataCenter.class, network.getDataCenterId()); NetworkOffering offering = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId()); if (!canHandle(offering, dc)) { @@ -184,8 +186,8 @@ public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru { PrivateIpVO ipVO = _privateIpDao.allocateIpAddress(network.getDataCenterId(), network.getId(), null); String vlanTag = BroadcastDomainType.getValue(network.getBroadcastUri()); String netmask = NetUtils.getCidrNetmask(network.getCidr()); - PrivateIpAddress ip = new PrivateIpAddress(ipVO, vlanTag, network.getGateway(), netmask, - NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress()))); + PrivateIpAddress ip = + new PrivateIpAddress(ipVO, vlanTag, network.getGateway(), netmask, NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress()))); nic.setIp4Address(ip.getIpAddress()); nic.setGateway(ip.getGateway()); diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index f95569e5c4e..58816af87b6 100755 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -20,6 +20,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import com.cloud.dc.DataCenter; @@ -101,8 +102,9 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru { } if (offering.getTrafficType() == TrafficType.Public) { - NetworkVO ntwk = new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.Vlan, offering.getId(), State.Setup, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO ntwk = + new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.Vlan, offering.getId(), State.Setup, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); return ntwk; } else { return null; @@ -142,8 +144,8 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru { } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, - ConcurrentOperationException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException, ConcurrentOperationException { DataCenter dc = _dcDao.findById(network.getDataCenterId()); diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java index 80280e10172..2c2bd9096da 100755 --- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java @@ -39,11 +39,10 @@ import com.cloud.network.dao.NetworkVO; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; +import com.cloud.vm.Nic.ReservationStrategy; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -import com.cloud.vm.Nic.ReservationStrategy; @Local(value = NetworkGuru.class) public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru { @@ -89,8 +88,9 @@ public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGu return null; } - NetworkVO config = new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), - plan.getPhysicalNetworkId()); + NetworkVO config = + new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), + plan.getPhysicalNetworkId()); return config; } @@ -105,7 +105,8 @@ public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGu } @Override - public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException, + InsufficientAddressCapacityException { assert network.getTrafficType() == TrafficType.Storage : "Well, I can't take care of this config now can I? " + network; if (!_sNwMgr.isStorageIpRangeAvailable(network.getDataCenterId())) { return super.allocate(network, nic, vm); diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java index 4794ee425ba..84ac061b40c 100644 --- a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java +++ b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java @@ -29,6 +29,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 17c9d711419..a2eba0754b3 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -100,6 +100,8 @@ import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.LBHealthCheckPolicyDao; import com.cloud.network.dao.LBStickinessPolicyDao; import com.cloud.network.dao.LBStickinessPolicyVO; +import com.cloud.network.dao.LoadBalancerCertMapDao; +import com.cloud.network.dao.LoadBalancerCertMapVO; import com.cloud.network.dao.LoadBalancerDao; import com.cloud.network.dao.LoadBalancerVMMapDao; import com.cloud.network.dao.LoadBalancerVMMapVO; @@ -107,8 +109,6 @@ import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.NetworkVO; -import com.cloud.network.dao.LoadBalancerCertMapDao; -import com.cloud.network.dao.LoadBalancerCertMapVO; import com.cloud.network.dao.SslCertVO; import com.cloud.network.element.LoadBalancingServiceProvider; import com.cloud.network.lb.LoadBalancingRule.LbAutoScalePolicy; @@ -117,8 +117,8 @@ import com.cloud.network.lb.LoadBalancingRule.LbAutoScaleVmProfile; import com.cloud.network.lb.LoadBalancingRule.LbCondition; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; -import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRule.LbSslCert; +import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.rules.FirewallManager; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.FirewallRuleType; @@ -337,8 +337,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements throw new InvalidParameterValueException("Global setting endpointe.url has to be set to the Management Server's API end point"); } - LbAutoScaleVmProfile lbAutoScaleVmProfile = new LbAutoScaleVmProfile(autoScaleVmProfile, apiKey, secretKey, csUrl, zoneId, domainId, serviceOfferingId, templateId, vmName, - lbNetworkUuid); + LbAutoScaleVmProfile lbAutoScaleVmProfile = + new LbAutoScaleVmProfile(autoScaleVmProfile, apiKey, secretKey, csUrl, zoneId, domainId, serviceOfferingId, templateId, vmName, lbNetworkUuid); return new LbAutoScaleVmGroup(vmGroup, autoScalePolicies, lbAutoScaleVmProfile, currentState); } @@ -539,19 +539,20 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements * Specific validations using network element validator for specific * validations */ - LBStickinessPolicyVO lbpolicy = new LBStickinessPolicyVO(loadBalancer.getId(), cmd.getLBStickinessPolicyName(), cmd.getStickinessMethodName(), cmd.getparamList(), - cmd.getDescription()); + LBStickinessPolicyVO lbpolicy = + new LBStickinessPolicyVO(loadBalancer.getId(), cmd.getLBStickinessPolicyName(), cmd.getStickinessMethodName(), cmd.getparamList(), cmd.getDescription()); List policyList = new ArrayList(); policyList.add(new LbStickinessPolicy(cmd.getStickinessMethodName(), lbpolicy.getParams())); Ip sourceIp = getSourceIp(loadBalancer); - LoadBalancingRule lbRule = new LoadBalancingRule(loadBalancer, getExistingDestinations(lbpolicy.getId()), policyList, null, sourceIp, null, loadBalancer.getLbProtocol()); + LoadBalancingRule lbRule = + new LoadBalancingRule(loadBalancer, getExistingDestinations(lbpolicy.getId()), policyList, null, sourceIp, null, loadBalancer.getLbProtocol()); if (!validateLbRule(lbRule)) { throw new InvalidParameterValueException("Failed to create Stickiness policy: Validation Failed " + cmd.getLbRuleId()); } /* Finally Insert into DB */ - LBStickinessPolicyVO policy = new LBStickinessPolicyVO(loadBalancer.getId(), cmd.getLBStickinessPolicyName(), cmd.getStickinessMethodName(), cmd.getparamList(), - cmd.getDescription()); + LBStickinessPolicyVO policy = + new LBStickinessPolicyVO(loadBalancer.getId(), cmd.getLBStickinessPolicyName(), cmd.getStickinessMethodName(), cmd.getparamList(), cmd.getDescription()); policy = _lb2stickinesspoliciesDao.persist(policy); return policy; @@ -603,16 +604,18 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements * Specific validations using network element validator for specific * validations */ - LBHealthCheckPolicyVO hcpolicy = new LBHealthCheckPolicyVO(loadBalancer.getId(), cmd.getPingPath(), cmd.getDescription(), cmd.getResponsTimeOut(), - cmd.getHealthCheckInterval(), cmd.getHealthyThreshold(), cmd.getUnhealthyThreshold()); + LBHealthCheckPolicyVO hcpolicy = + new LBHealthCheckPolicyVO(loadBalancer.getId(), cmd.getPingPath(), cmd.getDescription(), cmd.getResponsTimeOut(), cmd.getHealthCheckInterval(), + cmd.getHealthyThreshold(), cmd.getUnhealthyThreshold()); List hcPolicyList = new ArrayList(); hcPolicyList.add(new LbHealthCheckPolicy(hcpolicy.getpingpath(), hcpolicy.getDescription(), hcpolicy.getResponseTime(), hcpolicy.getHealthcheckInterval(), hcpolicy.getHealthcheckThresshold(), hcpolicy.getUnhealthThresshold())); // Finally Insert into DB - LBHealthCheckPolicyVO policy = new LBHealthCheckPolicyVO(loadBalancer.getId(), cmd.getPingPath(), cmd.getDescription(), cmd.getResponsTimeOut(), - cmd.getHealthCheckInterval(), cmd.getHealthyThreshold(), cmd.getUnhealthyThreshold()); + LBHealthCheckPolicyVO policy = + new LBHealthCheckPolicyVO(loadBalancer.getId(), cmd.getPingPath(), cmd.getDescription(), cmd.getResponsTimeOut(), cmd.getHealthCheckInterval(), + cmd.getHealthyThreshold(), cmd.getUnhealthyThreshold()); policy = _lb2healthcheckDao.persist(policy); return policy; @@ -977,7 +980,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements } if (nicInSameNetwork == null) { - InvalidParameterValueException ex = new InvalidParameterValueException("VM with id specified cannot be added because it doesn't belong in the same network."); + InvalidParameterValueException ex = + new InvalidParameterValueException("VM with id specified cannot be added because it doesn't belong in the same network."); ex.addProxyObject(vm.getUuid(), "instanceId"); throw ex; } @@ -1392,7 +1396,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements FirewallRuleVO relatedRule = _firewallDao.findByRelatedId(lb.getId()); if (relatedRule != null) { - s_logger.warn("Unable to remove firewall rule id=" + lb.getId() + " as it has related firewall rule id=" + relatedRule.getId() + "; leaving it in Revoke state"); + s_logger.warn("Unable to remove firewall rule id=" + lb.getId() + " as it has related firewall rule id=" + relatedRule.getId() + + "; leaving it in Revoke state"); return false; } else { _firewallMgr.removeRule(lb); @@ -1467,8 +1472,9 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements throw new InvalidParameterValueException("Ip address " + ipVO + " is not assigned to the network " + network); } - result = createPublicLoadBalancer(xId, name, description, srcPortStart, defPortStart, ipVO.getId(), protocol, algorithm, openFirewall, CallContext.current(), - lbProtocol); + result = + createPublicLoadBalancer(xId, name, description, srcPortStart, defPortStart, ipVO.getId(), protocol, algorithm, openFirewall, CallContext.current(), + lbProtocol); } catch (Exception ex) { s_logger.warn("Failed to create load balancer due to ", ex); if (ex instanceof NetworkRuleConflictException) { @@ -1496,8 +1502,9 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements @DB @Override - public LoadBalancer createPublicLoadBalancer(final String xId, final String name, final String description, final int srcPort, final int destPort, final long sourceIpId, - final String protocol, final String algorithm, final boolean openFirewall, final CallContext caller, final String lbProtocol) throws NetworkRuleConflictException { + public LoadBalancer createPublicLoadBalancer(final String xId, final String name, final String description, final int srcPort, final int destPort, + final long sourceIpId, final String protocol, final String algorithm, final boolean openFirewall, final CallContext caller, final String lbProtocol) + throws NetworkRuleConflictException { if (!NetUtils.isValidPort(destPort)) { throw new InvalidParameterValueException("privatePort is an invalid value: " + destPort); @@ -1527,7 +1534,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements final Long networkId = ipAddr.getAssociatedWithNetworkId(); if (networkId == null) { - InvalidParameterValueException ex = new InvalidParameterValueException("Unable to create load balancer rule ; specified sourceip id is not associated with any network"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Unable to create load balancer rule ; specified sourceip id is not associated with any network"); ex.addProxyObject(ipAddr.getUuid(), "sourceIpId"); throw ex; } @@ -1537,13 +1545,15 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements _firewallMgr.validateFirewallRule(caller.getCallingAccount(), ipAddr, srcPort, srcPort, protocol, Purpose.LoadBalancing, FirewallRuleType.User, networkId, null); - LoadBalancerVO newRule = new LoadBalancerVO(xId, name, description, sourceIpId, srcPort, destPort, algorithm, networkId, ipAddr.getAllocatedToAccountId(), - ipAddr.getAllocatedInDomainId(), lbProtocol); + LoadBalancerVO newRule = + new LoadBalancerVO(xId, name, description, sourceIpId, srcPort, destPort, algorithm, networkId, ipAddr.getAllocatedToAccountId(), + ipAddr.getAllocatedInDomainId(), lbProtocol); // verify rule is supported by Lb provider of the network Ip sourceIp = getSourceIp(newRule); - LoadBalancingRule loadBalancing = new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), new ArrayList(), - sourceIp, null, lbProtocol); + LoadBalancingRule loadBalancing = + new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), new ArrayList(), sourceIp, null, + lbProtocol); if (!validateLbRule(loadBalancing)) { throw new InvalidParameterValueException("LB service provider cannot support this rule"); } @@ -1551,13 +1561,15 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements return Transaction.execute(new TransactionCallbackWithException() { @Override public LoadBalancerVO doInTransaction(TransactionStatus status) throws NetworkRuleConflictException { - LoadBalancerVO newRule = new LoadBalancerVO(xId, name, description, sourceIpId, srcPort, destPort, algorithm, networkId, ipAddr.getAllocatedToAccountId(), - ipAddr.getAllocatedInDomainId(), lbProtocol); + LoadBalancerVO newRule = + new LoadBalancerVO(xId, name, description, sourceIpId, srcPort, destPort, algorithm, networkId, ipAddr.getAllocatedToAccountId(), + ipAddr.getAllocatedInDomainId(), lbProtocol); // verify rule is supported by Lb provider of the network Ip sourceIp = getSourceIp(newRule); - LoadBalancingRule loadBalancing = new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), - new ArrayList(), sourceIp, null, lbProtocol); + LoadBalancingRule loadBalancing = + new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), new ArrayList(), sourceIp, + null, lbProtocol); if (!validateLbRule(loadBalancing)) { throw new InvalidParameterValueException("LB service provider cannot support this rule"); } @@ -1577,10 +1589,10 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements throw new CloudRuntimeException("Unable to update the state to add for " + newRule); } s_logger.debug("Load balancer " + newRule.getId() + " for Ip address id=" + sourceIpId + ", public port " + srcPort + ", private port " + destPort + - " is added successfully."); + " is added successfully."); CallContext.current().setEventDetails("Load balancer Id: " + newRule.getId()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_CREATE, ipAddr.getAllocatedToAccountId(), ipAddr.getDataCenterId(), newRule.getId(), null, - LoadBalancingRule.class.getName(), newRule.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_CREATE, ipAddr.getAllocatedToAccountId(), ipAddr.getDataCenterId(), newRule.getId(), + null, LoadBalancingRule.class.getName(), newRule.getUuid()); return newRule; } catch (Exception e) { @@ -1600,6 +1612,7 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements } + @Override public boolean applyLoadBalancerConfig(long lbRuleId) throws ResourceUnavailableException { LoadBalancerVO lb = _lbDao.findById(lbRuleId); List lbs; @@ -1845,8 +1858,9 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements for (LBHealthCheckPolicyVO policy : hcDbpolicies) { String pingpath = policy.getpingpath(); - LbHealthCheckPolicy hDbPolicy = new LbHealthCheckPolicy(pingpath, policy.getDescription(), policy.getResponseTime(), policy.getHealthcheckInterval(), - policy.getHealthcheckThresshold(), policy.getUnhealthThresshold(), policy.isRevoke()); + LbHealthCheckPolicy hDbPolicy = + new LbHealthCheckPolicy(pingpath, policy.getDescription(), policy.getResponseTime(), policy.getHealthcheckInterval(), policy.getHealthcheckThresshold(), + policy.getUnhealthThresshold(), policy.isRevoke()); healthCheckPolicies.add(hDbPolicy); } return healthCheckPolicies; @@ -2050,8 +2064,8 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java index bc97ff65c10..86145fac6b5 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java @@ -80,12 +80,14 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA * @param routers TODO * */ - boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) throws ResourceUnavailableException; + boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) + throws ResourceUnavailableException; boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers, String SSHPublicKey) throws ResourceUnavailableException; - boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) throws ResourceUnavailableException; + boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) + throws ResourceUnavailableException; List deployVirtualRouterInGuestNetwork(Network guestNetwork, DeployDestination dest, Account owner, Map params, boolean isRedundant) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException; @@ -94,7 +96,8 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA boolean deleteRemoteAccessVpn(Network network, RemoteAccessVpn vpn, List routers) throws ResourceUnavailableException; - boolean associatePublicIP(Network network, final List ipAddress, List routers) throws ResourceUnavailableException; + boolean associatePublicIP(Network network, final List ipAddress, List routers) + throws ResourceUnavailableException; boolean applyFirewallRules(Network network, final List rules, List routers) throws ResourceUnavailableException; @@ -108,9 +111,11 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA boolean applyStaticNats(Network network, final List rules, List routers) throws ResourceUnavailableException; - boolean applyDhcpEntry(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, List routers) throws ResourceUnavailableException; + boolean applyDhcpEntry(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, List routers) + throws ResourceUnavailableException; - boolean applyUserData(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, List routers) throws ResourceUnavailableException; + boolean applyUserData(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, List routers) + throws ResourceUnavailableException; boolean applyLoadBalancingRules(Network network, List rules, List routers) throws ResourceUnavailableException; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 7e0e129ba1d..4bbc872e7cf 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -17,13 +17,91 @@ package com.cloud.network.router; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; +import org.apache.cloudstack.framework.config.ConfigDepot; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.config.Configurable; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.framework.jobs.AsyncJobManager; +import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; +import org.apache.cloudstack.managed.context.ManagedContextRunnable; +import org.apache.cloudstack.utils.identity.ManagementServerNode; + import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; -import com.cloud.agent.api.*; +import com.cloud.agent.api.AgentControlAnswer; +import com.cloud.agent.api.AgentControlCommand; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.BumpUpPriorityCommand; +import com.cloud.agent.api.CheckRouterAnswer; +import com.cloud.agent.api.CheckRouterCommand; +import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer; +import com.cloud.agent.api.CheckS2SVpnConnectionsCommand; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.GetDomRVersionAnswer; +import com.cloud.agent.api.GetDomRVersionCmd; +import com.cloud.agent.api.ModifySshKeysCommand; +import com.cloud.agent.api.NetworkUsageAnswer; +import com.cloud.agent.api.NetworkUsageCommand; +import com.cloud.agent.api.PvlanSetupCommand; +import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.check.CheckSshAnswer; import com.cloud.agent.api.check.CheckSshCommand; -import com.cloud.agent.api.routing.*; -import com.cloud.agent.api.to.*; +import com.cloud.agent.api.routing.CreateIpAliasCommand; +import com.cloud.agent.api.routing.DeleteIpAliasCommand; +import com.cloud.agent.api.routing.DhcpEntryCommand; +import com.cloud.agent.api.routing.DnsMasqConfigCommand; +import com.cloud.agent.api.routing.IpAliasTO; +import com.cloud.agent.api.routing.IpAssocCommand; +import com.cloud.agent.api.routing.LoadBalancerConfigCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand; +import com.cloud.agent.api.routing.SavePasswordCommand; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetMonitorServiceCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.routing.VmDataCommand; +import com.cloud.agent.api.routing.VpnUsersCfgCommand; +import com.cloud.agent.api.to.DhcpTO; +import com.cloud.agent.api.to.FirewallRuleTO; +import com.cloud.agent.api.to.IpAddressTO; +import com.cloud.agent.api.to.LoadBalancerTO; +import com.cloud.agent.api.to.MonitorServiceTO; +import com.cloud.agent.api.to.PortForwardingRuleTO; +import com.cloud.agent.api.to.StaticNatRuleTO; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; import com.cloud.api.ApiAsyncJobDispatcher; @@ -35,8 +113,14 @@ import com.cloud.cluster.dao.ManagementServerHostDao; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ZoneConfig; -import com.cloud.dc.*; +import com.cloud.dc.ClusterVO; +import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.HostPodVO; +import com.cloud.dc.Pod; +import com.cloud.dc.Vlan; +import com.cloud.dc.VlanVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; @@ -47,23 +131,66 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; -import com.cloud.exception.*; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ConnectionException; +import com.cloud.exception.InsufficientAddressCapacityException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InsufficientServerCapacityException; +import com.cloud.exception.InsufficientVirtualNetworkCapcityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.maint.Version; -import com.cloud.network.*; +import com.cloud.network.IpAddress; +import com.cloud.network.IpAddressManager; +import com.cloud.network.MonitoringService; +import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; +import com.cloud.network.NetworkModel; +import com.cloud.network.NetworkService; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.PublicIpAddress; +import com.cloud.network.RemoteAccessVpn; +import com.cloud.network.Site2SiteCustomerGateway; +import com.cloud.network.Site2SiteVpnConnection; +import com.cloud.network.SshKeysDistriMonitor; +import com.cloud.network.VirtualNetworkApplianceService; +import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.Type; +import com.cloud.network.VpnUser; +import com.cloud.network.VpnUserVO; import com.cloud.network.addr.PublicIp; -import com.cloud.network.dao.*; +import com.cloud.network.dao.FirewallRulesDao; +import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVMMapDao; +import com.cloud.network.dao.LoadBalancerVO; +import com.cloud.network.dao.MonitoringServiceDao; +import com.cloud.network.dao.MonitoringServiceVO; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; +import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; +import com.cloud.network.dao.RemoteAccessVpnDao; +import com.cloud.network.dao.Site2SiteCustomerGatewayDao; +import com.cloud.network.dao.Site2SiteVpnConnectionDao; +import com.cloud.network.dao.Site2SiteVpnConnectionVO; +import com.cloud.network.dao.Site2SiteVpnGatewayDao; +import com.cloud.network.dao.UserIpv6AddressDao; +import com.cloud.network.dao.VirtualRouterProviderDao; +import com.cloud.network.dao.VpnUserDao; import com.cloud.network.lb.LoadBalancingRule; import com.cloud.network.lb.LoadBalancingRule.LbDestination; import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy; @@ -72,9 +199,14 @@ import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRulesManager; import com.cloud.network.router.VirtualRouter.RedundantState; import com.cloud.network.router.VirtualRouter.Role; -import com.cloud.network.rules.*; +import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.LoadBalancerContainer.Scheme; +import com.cloud.network.rules.PortForwardingRule; +import com.cloud.network.rules.RulesManager; +import com.cloud.network.rules.StaticNat; +import com.cloud.network.rules.StaticNatImpl; +import com.cloud.network.rules.StaticNatRule; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.offering.NetworkOffering; @@ -91,7 +223,12 @@ import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; -import com.cloud.user.*; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.User; +import com.cloud.user.UserStatisticsVO; +import com.cloud.user.UserStatsLogVO; +import com.cloud.user.UserVO; import com.cloud.user.dao.UserDao; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.user.dao.UserStatsLogDao; @@ -103,42 +240,50 @@ import com.cloud.utils.StringUtils; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; -import com.cloud.utils.db.*; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.EntityManager; +import com.cloud.utils.db.Filter; +import com.cloud.utils.db.GlobalLock; +import com.cloud.utils.db.JoinBuilder; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.Ip; import com.cloud.utils.net.MacAddress; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.*; +import com.cloud.vm.DomainRouterVO; +import com.cloud.vm.Nic; +import com.cloud.vm.NicIpAlias; +import com.cloud.vm.NicProfile; +import com.cloud.vm.NicVO; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.ReservationContextImpl; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.VirtualMachineGuru; +import com.cloud.vm.VirtualMachineManager; +import com.cloud.vm.VirtualMachineName; +import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfile.Param; -import com.cloud.vm.dao.*; -import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd; -import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; -import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; -import org.apache.cloudstack.framework.config.ConfigDepot; -import org.apache.cloudstack.framework.config.ConfigKey; -import org.apache.cloudstack.framework.config.Configurable; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.framework.jobs.AsyncJobManager; -import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO; -import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.cloudstack.utils.identity.ManagementServerNode; -import org.apache.log4j.Logger; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.util.*; -import java.util.concurrent.*; +import com.cloud.vm.dao.DomainRouterDao; +import com.cloud.vm.dao.NicDao; +import com.cloud.vm.dao.NicIpAliasDao; +import com.cloud.vm.dao.NicIpAliasVO; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.UserVmDetailsDao; +import com.cloud.vm.dao.VMInstanceDao; /** * VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack. */ @Local(value = {VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class}) -public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, Listener, - Configurable { +public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, + Listener, Configurable { private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class); @Inject @@ -345,7 +490,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (!router.getState().equals(State.Stopped)) { s_logger.warn("Unable to upgrade router " + router.toString() + " in state " + router.getState()); throw new InvalidParameterValueException("Unable to upgrade router " + router.toString() + " in state " + router.getState() + - "; make sure the router is stopped and not in an error state before upgrading."); + "; make sure the router is stopped and not in an error state before upgrading."); } ServiceOfferingVO currentServiceOffering = _serviceOfferingDao.findById(router.getServiceOfferingId()); @@ -353,8 +498,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // Check that the service offering being upgraded to has the same storage pool preference as the VM's current service // offering if (currentServiceOffering.getUseLocalStorage() != newServiceOffering.getUseLocalStorage()) { - throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getUseLocalStorage() + " is different from " + - "curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); + throw new InvalidParameterValueException("Can't upgrade, due to new local storage status : " + newServiceOffering.getUseLocalStorage() + + " is different from " + "curruent local storage status: " + currentServiceOffering.getUseLocalStorage()); } router.setServiceOfferingId(serviceOfferingId); @@ -386,8 +531,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public boolean saveSSHPublicKeyToRouter(Network network, final NicProfile nic, VirtualMachineProfile profile, List routers, final String SSHPublicKey) - throws ResourceUnavailableException { + public boolean saveSSHPublicKeyToRouter(Network network, final NicProfile nic, VirtualMachineProfile profile, List routers, + final String SSHPublicKey) throws ResourceUnavailableException { final UserVmVO vm = _userVmDao.findById(profile.getVirtualMachine().getId()); _userVmDao.loadDetails(vm); @@ -466,8 +611,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V //FIXME!!! - UserStats command should grab bytesSent/Received for all guest interfaces of the VR List routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId()); for (Long guestNtwkId : routerGuestNtwkIds) { - final UserStatisticsVO userStats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), guestNtwkId, null, router.getId(), router.getType() - .toString()); + final UserStatisticsVO userStats = + _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), guestNtwkId, null, router.getId(), router.getType().toString()); if (userStats != null) { final long currentBytesRcvd = userStats.getCurrentBytesReceived(); userStats.setCurrentBytesReceived(0); @@ -488,7 +633,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V @Override @ActionEvent(eventType = EventTypes.EVENT_ROUTER_REBOOT, eventDescription = "rebooting router Vm", async = true) - public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { Account caller = CallContext.current().getCallingAccount(); // verify parameters @@ -577,8 +723,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V _agentMgr.registerForHostEvents(new SshKeysDistriMonitor(_agentMgr, _hostDao, _configDao), true, false, false); boolean useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - _offering = new ServiceOfferingVO("System Offering For Software Router", 1, _routerRamSize, _routerCpuMHz, null, null, true, null, useLocalStorage, true, null, true, - VirtualMachine.Type.DomainRouter, true); + _offering = + new ServiceOfferingVO("System Offering For Software Router", 1, _routerRamSize, _routerCpuMHz, null, null, true, null, useLocalStorage, true, null, true, + VirtualMachine.Type.DomainRouter, true); _offering.setUniqueName(ServiceOffering.routerDefaultOffUniqueName); _offering = _serviceOfferingDao.persistSystemServiceOffering(_offering); @@ -672,8 +819,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V protected VirtualNetworkApplianceManagerImpl() { } - private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, String guestIpAddress, - String vmName, String vmInstanceName, long vmId, String vmUuid, String publicKey, long guestNetworkId) { + private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, + String guestIpAddress, String vmName, String vmInstanceName, long vmId, String vmUuid, String publicKey, long guestNetworkId) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, _networkModel.getExecuteInSeqNtwkElmtCmd()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); @@ -752,20 +899,22 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V (!forVpc && network.getTrafficType() == TrafficType.Guest && network.getGuestType() == Network.GuestType.Isolated)) { final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIp4Address()); final String routerType = router.getType().toString(); - final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), - (forVpc ? routerNic.getIp4Address() : null), router.getId(), routerType); + final UserStatisticsVO previousStats = + _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), + router.getId(), routerType); NetworkUsageAnswer answer = null; try { answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd); } catch (Exception e) { - s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + router.getHostId(), e); + s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + router.getHostId(), + e); continue; } if (answer != null) { if (!answer.getResult()) { - s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + router.getHostId() + - "; details: " + answer.getDetails()); + s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + + router.getHostId() + "; details: " + answer.getDetails()); continue; } try { @@ -777,8 +926,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { - UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), - (forVpc ? routerNic.getIp4Address() : null), router.getId(), routerType); + UserStatisticsVO stats = + _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), + (forVpc ? routerNic.getIp4Address() : null), router.getId(), routerType); if (stats == null) { s_logger.warn("unable to find stats for account: " + router.getAccountId()); return; @@ -786,16 +936,17 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (previousStats != null && ((previousStats.getCurrentBytesReceived() != stats.getCurrentBytesReceived()) || (previousStats.getCurrentBytesSent() != stats.getCurrentBytesSent()))) { - s_logger.debug("Router stats changed from the time NetworkUsageCommand was sent. " + "Ignoring current answer. Router: " + - answerFinal.getRouterName() + " Rcvd: " + answerFinal.getBytesReceived() + "Sent: " + answerFinal.getBytesSent()); + s_logger.debug("Router stats changed from the time NetworkUsageCommand was sent. " + + "Ignoring current answer. Router: " + answerFinal.getRouterName() + " Rcvd: " + answerFinal.getBytesReceived() + + "Sent: " + answerFinal.getBytesSent()); return; } if (stats.getCurrentBytesReceived() > answerFinal.getBytesReceived()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Received # of bytes that's less than the last one. " + - "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + - answerFinal.getBytesReceived() + " Stored: " + stats.getCurrentBytesReceived()); + "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + + answerFinal.getBytesReceived() + " Stored: " + stats.getCurrentBytesReceived()); } stats.setNetBytesReceived(stats.getNetBytesReceived() + stats.getCurrentBytesReceived()); } @@ -803,8 +954,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (stats.getCurrentBytesSent() > answerFinal.getBytesSent()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Received # of bytes that's less than the last one. " + - "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + - answerFinal.getBytesSent() + " Stored: " + stats.getCurrentBytesSent()); + "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + + answerFinal.getBytesSent() + " Stored: " + stats.getCurrentBytesSent()); } stats.setNetBytesSent(stats.getNetBytesSent() + stats.getCurrentBytesSent()); } @@ -819,8 +970,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V }); } catch (Exception e) { - s_logger.warn("Unable to update user statistics for account: " + router.getAccountId() + " Rx: " + answer.getBytesReceived() + "; Tx: " + - answer.getBytesSent()); + s_logger.warn("Unable to update user statistics for account: " + router.getAccountId() + " Rx: " + answer.getBytesReceived() + + "; Tx: " + answer.getBytesSent()); } } } @@ -864,8 +1015,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V stat.setAggBytesSent(stat.getCurrentBytesSent() + stat.getNetBytesSent()); _userStatsDao.update(stat.getId(), stat); //insert into op_user_stats_log - UserStatsLogVO statsLog = new UserStatsLogVO(stat.getId(), stat.getNetBytesReceived(), stat.getNetBytesSent(), stat.getCurrentBytesReceived(), - stat.getCurrentBytesSent(), stat.getAggBytesReceived(), stat.getAggBytesSent(), updatedTime); + UserStatsLogVO statsLog = + new UserStatsLogVO(stat.getId(), stat.getNetBytesReceived(), stat.getNetBytesSent(), stat.getCurrentBytesReceived(), + stat.getCurrentBytesSent(), stat.getAggBytesReceived(), stat.getAggBytesSent(), updatedTime); _userStatsLogDao.persist(statsLog); } s_logger.debug("Successfully updated aggregate network stats"); @@ -952,8 +1104,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V _s2sVpnConnectionDao.persist(conn); if (oldState != conn.getState()) { String title = "Site-to-site Vpn Connection to " + gw.getName() + " just switch from " + oldState + " to " + conn.getState(); - String context = "Site-to-site Vpn Connection to " + gw.getName() + " on router " + router.getHostName() + "(id: " + router.getId() + ") " + - " just switch from " + oldState + " to " + conn.getState(); + String context = + "Site-to-site Vpn Connection to " + gw.getName() + " on router " + router.getHostName() + "(id: " + router.getId() + ") " + + " just switch from " + oldState + " to " + conn.getState(); s_logger.info(context); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), title, context); } @@ -1012,8 +1165,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V RedundantState currState = router.getRedundantState(); if (prevState != currState) { String title = "Redundant virtual router " + router.getInstanceName() + " just switch from " + prevState + " to " + currState; - String context = "Redundant virtual router (name: " + router.getHostName() + ", id: " + router.getId() + ") " + " just switch from " + prevState + " to " + - currState; + String context = + "Redundant virtual router (name: " + router.getHostName() + ", id: " + router.getId() + ") " + " just switch from " + prevState + " to " + currState; s_logger.info(context); if (currState == RedundantState.MASTER) { _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), title, context); @@ -1118,9 +1271,11 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (router.getRedundantState() == RedundantState.MASTER) { if (networkRouterMaps.containsKey(routerGuestNtwkId)) { DomainRouterVO dupRouter = networkRouterMaps.get(routerGuestNtwkId); - String title = "More than one redundant virtual router is in MASTER state! Router " + router.getHostName() + " and router " + dupRouter.getHostName(); - String context = "Virtual router (name: " + router.getHostName() + ", id: " + router.getId() + " and router (name: " + dupRouter.getHostName() + - ", id: " + router.getId() + ") are both in MASTER state! If the problem persist, restart both of routers. "; + String title = + "More than one redundant virtual router is in MASTER state! Router " + router.getHostName() + " and router " + dupRouter.getHostName(); + String context = + "Virtual router (name: " + router.getHostName() + ", id: " + router.getId() + " and router (name: " + dupRouter.getHostName() + ", id: " + + router.getId() + ") are both in MASTER state! If the problem persist, restart both of routers. "; _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), title, context); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, dupRouter.getDataCenterId(), dupRouter.getPodIdToDeployIn(), title, context); s_logger.warn(context); @@ -1257,9 +1412,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } } - String errMsg = "Cannot find an available cluster in Pod " + podId + " to start domain router for Ovm. \n Ovm won't support any system vm including domain router, " + - "please make sure you have a cluster with hypervisor type of any of xenserver/KVM/Vmware in the same pod" + - " with Ovm cluster. And there is at least one host in UP status in that cluster."; + String errMsg = + "Cannot find an available cluster in Pod " + podId + " to start domain router for Ovm. \n Ovm won't support any system vm including domain router, " + + "please make sure you have a cluster with hypervisor type of any of xenserver/KVM/Vmware in the same pod" + + " with Ovm cluster. And there is at least one host in UP status in that cluster."; throw new CloudRuntimeException(errMsg); } @@ -1299,8 +1455,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V try { - assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + - guestNetwork; + assert guestNetwork.getState() == Network.State.Implemented || guestNetwork.getState() == Network.State.Setup || + guestNetwork.getState() == Network.State.Implementing : "Network is not yet fully implemented: " + guestNetwork; assert guestNetwork.getTrafficType() == TrafficType.Guest; // 1) Get deployment plan and find out the list of routers @@ -1404,8 +1560,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V int count = routerCount - routers.size(); DeploymentPlan plan = planAndRouters.first(); for (int i = 0; i < count; i++) { - LinkedHashMap networks = createRouterNetworks(owner, isRedundant, plan, guestNetwork, new Pair(publicNetwork, - sourceNatIp)); + LinkedHashMap networks = + createRouterNetworks(owner, isRedundant, plan, guestNetwork, new Pair(publicNetwork, sourceNatIp)); //don't start the router as we are holding the network lock that needs to be released at the end of router allocation DomainRouterVO router = deployRouter(owner, destination, plan, params, isRedundant, vrProvider, offeringId, null, networks, false, null); @@ -1445,9 +1601,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } protected DomainRouterVO deployRouter(Account owner, DeployDestination dest, DeploymentPlan plan, Map params, boolean isRedundant, - VirtualRouterProvider vrProvider, long svcOffId, Long vpcId, LinkedHashMap networks, boolean startRouter, List supportedHypervisors) - throws ConcurrentOperationException, InsufficientAddressCapacityException, InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, - ResourceUnavailableException { + VirtualRouterProvider vrProvider, long svcOffId, Long vpcId, LinkedHashMap networks, boolean startRouter, + List supportedHypervisors) throws ConcurrentOperationException, InsufficientAddressCapacityException, InsufficientServerCapacityException, + InsufficientCapacityException, StorageUnavailableException, ResourceUnavailableException { ServiceOfferingVO routerOffering = _serviceOfferingDao.findById(svcOffId); @@ -1499,8 +1655,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V offerHA = false; } - router = new DomainRouterVO(id, routerOffering.getId(), vrProvider.getId(), VirtualMachineName.getRouterName(id, _instance), template.getId(), - template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), isRedundant, 0, false, RedundantState.UNKNOWN, offerHA, false, vpcId); + router = + new DomainRouterVO(id, routerOffering.getId(), vrProvider.getId(), VirtualMachineName.getRouterName(id, _instance), template.getId(), + template.getHypervisorType(), template.getGuestOSId(), owner.getDomainId(), owner.getId(), isRedundant, 0, false, RedundantState.UNKNOWN, + offerHA, false, vpcId); router.setDynamicallyScalable(template.isDynamicallyScalable()); router.setRole(Role.VIRTUAL_ROUTER); router = _routerDao.persist(router); @@ -1574,7 +1732,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (hypervisors.isEmpty()) { String errMsg = (hTypesStr.capacity() > 0) ? "supporting hypervisors " + hTypesStr.toString() : ""; if (plan.getPodId() != null) { - throw new InsufficientServerCapacityException("Unable to create virtual router, " + "there are no clusters in the pod " + errMsg, Pod.class, plan.getPodId()); + throw new InsufficientServerCapacityException("Unable to create virtual router, " + "there are no clusters in the pod " + errMsg, Pod.class, + plan.getPodId()); } throw new InsufficientServerCapacityException("Unable to create virtual router, " + "there are no clusters in the zone " + errMsg, DataCenter.class, dest.getDataCenter().getId()); @@ -1610,7 +1769,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V defaultNetworkStartIp = startIp; } else if (s_logger.isDebugEnabled()) { s_logger.debug("First ipv4 " + startIp + " in network id=" + guestNetwork.getId() + - " is already allocated, can't use it for domain router; will get random ip address from the range"); + " is already allocated, can't use it for domain router; will get random ip address from the range"); } } } @@ -1625,7 +1784,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V defaultNetworkStartIpv6 = startIpv6; } else if (s_logger.isDebugEnabled()) { s_logger.debug("First ipv6 " + startIpv6 + " in network id=" + guestNetwork.getId() + - " is already allocated, can't use it for domain router; will get random ipv6 address from the range"); + " is already allocated, can't use it for domain router; will get random ipv6 address from the range"); } } } @@ -1739,9 +1898,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (rrouter.getHostId() != null && rrouter.getIsRedundantRouter() && rrouter.getState() == State.Running) { if (routerToBeAvoid != null) { throw new ResourceUnavailableException("Try to start router " + router.getInstanceName() + "(" + router.getId() + ")" + - ", but there are already two redundant routers with IP " + router.getPublicIpAddress() + ", they are " + - rrouter.getInstanceName() + "(" + rrouter.getId() + ") and " + routerToBeAvoid.getInstanceName() + "(" + - routerToBeAvoid.getId() + ")", DataCenter.class, rrouter.getDataCenterId()); + ", but there are already two redundant routers with IP " + router.getPublicIpAddress() + ", they are " + rrouter.getInstanceName() + "(" + + rrouter.getId() + ") and " + routerToBeAvoid.getInstanceName() + "(" + routerToBeAvoid.getId() + ")", DataCenter.class, + rrouter.getDataCenterId()); } routerToBeAvoid = rrouter; } @@ -1785,16 +1944,16 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public List deployVirtualRouterInGuestNetwork(Network guestNetwork, DeployDestination dest, Account owner, Map params, boolean isRedundant) - throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { + public List deployVirtualRouterInGuestNetwork(Network guestNetwork, DeployDestination dest, Account owner, Map params, + boolean isRedundant) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { List routers = findOrDeployVirtualRouterInGuestNetwork(guestNetwork, dest, owner, isRedundant, params); return startRouters(params, routers); } - protected List startRouters(Map params, List routers) throws StorageUnavailableException, InsufficientCapacityException, - ConcurrentOperationException, ResourceUnavailableException { + protected List startRouters(Map params, List routers) throws StorageUnavailableException, + InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { List runningRouters = null; if (routers != null) { @@ -1885,7 +2044,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // DOMR control command is sent over management server in VMware if (dest.getHost().getHypervisorType() == HypervisorType.VMware) { s_logger.info("Check if we need to add management server explicit route to DomR. pod cidr: " + dest.getPod().getCidrAddress() + "/" + - dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + ClusterManager.ManagementHostIPAdr.value()); + dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + ClusterManager.ManagementHostIPAdr.value()); if (s_logger.isInfoEnabled()) { s_logger.info("Add management server explicit route to DomR."); @@ -2076,7 +2235,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } Network network = _networkDao.findById(nic.getNetworkId()); String networkTag = _networkModel.getNetworkTag(router.getHypervisorType(), network); - PvlanSetupCommand cmd = PvlanSetupCommand.createDhcpSetup(op, nic.getBroadCastUri(), networkTag, router.getInstanceName(), nic.getMacAddress(), nic.getIp4Address()); + PvlanSetupCommand cmd = + PvlanSetupCommand.createDhcpSetup(op, nic.getBroadCastUri(), networkTag, router.getInstanceName(), nic.getMacAddress(), nic.getIp4Address()); // In fact we send command to the host of router, we're not programming router but the host Answer answer = null; try { @@ -2096,7 +2256,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws ResourceUnavailableException { + public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) + throws ResourceUnavailableException { DomainRouterVO router = _routerDao.findById(profile.getId()); List nics = profile.getNics(); @@ -2184,8 +2345,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V List servicesTO = new ArrayList(); for (MonitoringServiceVO service : services) { - MonitorServiceTO serviceTO = new MonitorServiceTO(service.getService(), service.getProcessname(), service.getServiceName(), service.getServicePath(), - service.getPidFile(), service.isDefaultService()); + MonitorServiceTO serviceTO = + new MonitorServiceTO(service.getService(), service.getProcessname(), service.getServiceName(), service.getServicePath(), service.getPidFile(), + service.isDefaultService()); servicesTO.add(serviceTO); } @@ -2363,8 +2525,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V //Reapply dhcp and dns configuration. Network guestNetwork = _networkDao.findById(guestNetworkId); if (guestNetwork.getGuestType() == GuestType.Shared && _networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.Dhcp, provider)) { - Map dhcpCapabilities = _networkSvc.getNetworkOfferingServiceCapabilities( - _networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId()), Service.Dhcp); + Map dhcpCapabilities = + _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId()), Service.Dhcp); String supportsMultipleSubnets = dhcpCapabilities.get(Network.Capability.DhcpAccrossMultipleSubnets); if (supportsMultipleSubnets != null && Boolean.valueOf(supportsMultipleSubnets)) { List revokedIpAliasVOs = _nicIpAliasDao.listByNetworkIdAndState(guestNetworkId, NicIpAlias.state.revoked); @@ -2545,17 +2707,16 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V Answer answer = cmds.getAnswer("users"); if (!answer.getResult()) { s_logger.error("Unable to start vpn: unable add users to vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + - router.getInstanceName() + " due to " + answer.getDetails()); + router.getInstanceName() + " due to " + answer.getDetails()); throw new ResourceUnavailableException("Unable to start vpn: Unable to add users to vpn in zone " + router.getDataCenterId() + " for account " + - vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, - router.getDataCenterId()); + vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); } answer = cmds.getAnswer("startVpn"); if (!answer.getResult()) { - s_logger.error("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + router.getInstanceName() + - " due to " + answer.getDetails()); + s_logger.error("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + + router.getInstanceName() + " due to " + answer.getDetails()); throw new ResourceUnavailableException("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + - router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); } } @@ -2588,8 +2749,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V return result; } - private DomainRouterVO start(DomainRouterVO router, User user, Account caller, Map params, DeploymentPlan planToDeploy) throws StorageUnavailableException, - InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { + private DomainRouterVO start(DomainRouterVO router, User user, Account caller, Map params, DeploymentPlan planToDeploy) + throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { s_logger.debug("Starting router " + router); try { _itMgr.advanceStart(router.getUuid(), params, planToDeploy); @@ -2634,11 +2795,12 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V DomainRouterVO router = routers.get(0); if (router.getState() != State.Running) { s_logger.warn("Failed to configure dhcp: router not in running state"); - throw new ResourceUnavailableException("Unable to assign ip addresses, domR is not in right state " + router.getState(), DataCenter.class, network.getDataCenterId()); + throw new ResourceUnavailableException("Unable to assign ip addresses, domR is not in right state " + router.getState(), DataCenter.class, + network.getDataCenterId()); } //check if this is not the primary subnet. - NicVO domr_guest_nic = _nicDao.findByInstanceIdAndIpAddressAndVmtype(router.getId(), _nicDao.getIpAddress(nic.getNetworkId(), router.getId()), - VirtualMachine.Type.DomainRouter); + NicVO domr_guest_nic = + _nicDao.findByInstanceIdAndIpAddressAndVmtype(router.getId(), _nicDao.getIpAddress(nic.getNetworkId(), router.getId()), VirtualMachine.Type.DomainRouter); //check if the router ip address and the vm ip address belong to same subnet. //if they do not belong to same netwoek check for the alias ips. if not create one. // This should happen only in case of Basic and Advanced SG enabled networks. @@ -2666,11 +2828,13 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V vlanDbIdList.add(vlan.getId()); } if (dc.getNetworkType() == NetworkType.Basic) { - routerPublicIP = _ipAddrMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, - vlanDbIdList, nic.getNetworkId(), null, false); + routerPublicIP = + _ipAddrMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, + vlanDbIdList, nic.getNetworkId(), null, false); } else { - routerPublicIP = _ipAddrMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), null, caller, Vlan.VlanType.DirectAttached, vlanDbIdList, - nic.getNetworkId(), null, false); + routerPublicIP = + _ipAddrMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), null, caller, Vlan.VlanType.DirectAttached, vlanDbIdList, + nic.getNetworkId(), null, false); } routerAliasIp = routerPublicIP.getAddress().addr(); @@ -2681,8 +2845,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V return false; } //this means we did not create a ip alis on the router. - NicIpAliasVO alias = new NicIpAliasVO(domr_guest_nic.getId(), routerAliasIp, router.getId(), CallContext.current().getCallingAccountId(), network.getDomainId(), - nic.getNetworkId(), nic.getGateway(), nic.getNetmask()); + NicIpAliasVO alias = + new NicIpAliasVO(domr_guest_nic.getId(), routerAliasIp, router.getId(), CallContext.current().getCallingAccountId(), network.getDomainId(), + nic.getNetworkId(), nic.getGateway(), nic.getNetmask()); alias.setAliasCount((routerPublicIP.getIpMacAddress())); _nicIpAliasDao.persist(alias); List ipaliasTo = new ArrayList(); @@ -2714,7 +2879,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V public boolean removeDhcpSupportForSubnet(Network network, List routers) throws ResourceUnavailableException { if (routers == null || routers.isEmpty()) { s_logger.warn("Failed to add/remove VPN users: no router found for account and zone"); - throw new ResourceUnavailableException("Unable to assign ip addresses, domR doesn't exist for network " + network.getId(), DataCenter.class, network.getDataCenterId()); + throw new ResourceUnavailableException("Unable to assign ip addresses, domR doesn't exist for network " + network.getId(), DataCenter.class, + network.getDataCenterId()); } for (DomainRouterVO router : routers) { @@ -2893,7 +3059,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V String[] applyVpnUsers(Network network, List users, List routers) throws ResourceUnavailableException { if (routers == null || routers.isEmpty()) { s_logger.warn("Failed to add/remove VPN users: no router found for account and zone"); - throw new ResourceUnavailableException("Unable to assign ip addresses, domR doesn't exist for network " + network.getId(), DataCenter.class, network.getDataCenterId()); + throw new ResourceUnavailableException("Unable to assign ip addresses, domR doesn't exist for network " + network.getId(), DataCenter.class, + network.getDataCenterId()); } boolean agentResults = true; @@ -2933,7 +3100,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException { + public VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ResourceUnavailableException, InsufficientCapacityException, + ConcurrentOperationException { Account caller = CallContext.current().getCallingAccount(); User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId()); @@ -3053,8 +3221,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V vifMacAddress = ipAddr.getMacAddress(); } - IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, - networkRate, ipAddr.isOneToOneNat()); + IpAddressTO ip = + new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, + networkRate, ipAddr.isOneToOneNat()); ip.setTrafficType(network.getTrafficType()); ip.setNetworkName(_networkModel.getNetworkTag(router.getHypervisorType(), network)); @@ -3151,8 +3320,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V Network guestNetwork = _networkModel.getNetwork(guestNetworkId); Nic nic = _nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), router.getId()); - NicProfile nicProfile = new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(guestNetwork.getId(), router.getId()), - _networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork)); + NicProfile nicProfile = + new NicProfile(nic, guestNetwork, nic.getBroadcastUri(), nic.getIsolationUri(), _networkModel.getNetworkRate(guestNetwork.getId(), router.getId()), + _networkModel.isSecurityGroupSupportedInNetwork(guestNetwork), _networkModel.getNetworkTag(router.getHypervisorType(), guestNetwork)); NetworkOffering offering = _networkOfferingDao.findById(guestNetwork.getNetworkOfferingId()); String maxconn = null; if (offering.getConcurrentConnections() == null) { @@ -3161,8 +3331,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V maxconn = offering.getConcurrentConnections().toString(); } - LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, routerPublicIp, getRouterIpInNetwork(guestNetworkId, router.getId()), router.getPrivateIpAddress(), - _itMgr.toNicTO(nicProfile, router.getHypervisorType()), router.getVpcId(), maxconn, offering.isKeepAliveEnabled()); + LoadBalancerConfigCommand cmd = + new LoadBalancerConfigCommand(lbs, routerPublicIp, getRouterIpInNetwork(guestNetworkId, router.getId()), router.getPrivateIpAddress(), _itMgr.toNicTO( + nicProfile, router.getHypervisorType()), router.getVpcId(), maxconn, offering.isKeepAliveEnabled()); cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key()); cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key()); @@ -3191,8 +3362,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V IpAddress ip = _networkModel.getIp(vpn.getServerAddressId()); String cidr = getVpnCidr(vpn); - RemoteAccessVpnCfgCommand startVpnCmd = new RemoteAccessVpnCfgCommand(isCreate, ip.getAddress().addr(), vpn.getLocalIp(), vpn.getIpRange(), vpn.getIpsecPresharedKey(), - (vpn.getVpcId() != null)); + RemoteAccessVpnCfgCommand startVpnCmd = + new RemoteAccessVpnCfgCommand(isCreate, ip.getAddress().addr(), vpn.getLocalIp(), vpn.getIpRange(), vpn.getIpsecPresharedKey(), (vpn.getVpcId() != null)); startVpnCmd.setLocalCidr(cidr); startVpnCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); startVpnCmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); @@ -3209,8 +3380,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // password should be set only on default network element if (password != null && nic.isDefaultNic()) { final String encodedPassword = PasswordGenerator.rot13(password); - SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), - _networkModel.getExecuteInSeqNtwkElmtCmd()); + SavePasswordCommand cmd = + new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(nic.getNetworkId(), router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); @@ -3251,8 +3422,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } private void createDhcpEntryCommand(VirtualRouter router, UserVm vm, NicVO nic, Commands cmds) { - DhcpEntryCommand dhcpCommand = new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getHostName(), nic.getIp6Address(), - _networkModel.getExecuteInSeqNtwkElmtCmd()); + DhcpEntryCommand dhcpCommand = + new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getHostName(), nic.getIp6Address(), _networkModel.getExecuteInSeqNtwkElmtCmd()); DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); Nic defaultNic = findGatewayIp(vm.getId()); String gatewayIp = defaultNic.getGateway(); @@ -3294,8 +3465,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V for (NicIpAliasVO ipAliasVO : ipAliasVOList) { DhcpTO DhcpTO = new DhcpTO(ipAliasVO.getIp4Address(), ipAliasVO.getGateway(), ipAliasVO.getNetmask(), ipAliasVO.getStartIpOfSubnet()); if (s_logger.isTraceEnabled()) { - s_logger.trace("configDnsMasq : adding ip {" + DhcpTO.getGateway() + ", " + DhcpTO.getNetmask() + ", " + DhcpTO.getRouterIp() + ", " + DhcpTO.getStartIpOfSubnet() + - "}"); + s_logger.trace("configDnsMasq : adding ip {" + DhcpTO.getGateway() + ", " + DhcpTO.getNetmask() + ", " + DhcpTO.getRouterIp() + ", " + + DhcpTO.getStartIpOfSubnet() + "}"); } ipList.add(DhcpTO); ipAliasVO.setVmId(router.getId()); @@ -3399,8 +3570,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V s_logger.debug("About to stop the router " + disconnectedRouter.getInstanceName() + " due to: " + reason); } String title = "Virtual router " + disconnectedRouter.getInstanceName() + " would be stopped after connecting back, due to " + reason; - String context = "Virtual router (name: " + disconnectedRouter.getInstanceName() + ", id: " + disconnectedRouter.getId() + - ") would be stopped after connecting back, due to: " + reason; + String context = + "Virtual router (name: " + disconnectedRouter.getInstanceName() + ", id: " + disconnectedRouter.getId() + + ") would be stopped after connecting back, due to: " + reason; _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, disconnectedRouter.getDataCenterId(), disconnectedRouter.getPodIdToDeployIn(), title, context); disconnectedRouter.setStopPending(true); disconnectedRouter = _routerDao.persist(disconnectedRouter); @@ -3425,7 +3597,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public boolean associatePublicIP(Network network, final List ipAddress, List routers) throws ResourceUnavailableException { + public boolean associatePublicIP(Network network, final List ipAddress, List routers) + throws ResourceUnavailableException { if (ipAddress == null || ipAddress.isEmpty()) { s_logger.debug("No ip association rules to be applied for network " + network.getId()); return true; @@ -3441,7 +3614,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } @Override - public boolean applyFirewallRules(Network network, final List rules, List routers) throws ResourceUnavailableException { + public boolean applyFirewallRules(Network network, final List rules, List routers) + throws ResourceUnavailableException { if (rules == null || rules.isEmpty()) { s_logger.debug("No firewall rules to be applied for network " + network.getId()); return true; @@ -3591,8 +3765,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V boolean execute(Network network, VirtualRouter router) throws ResourceUnavailableException; } - protected boolean applyRules(Network network, List routers, String typeString, boolean isPodLevelException, Long podId, boolean failWhenDisconnect, - RuleApplier applier) throws ResourceUnavailableException { + protected boolean applyRules(Network network, List routers, String typeString, boolean isPodLevelException, Long podId, + boolean failWhenDisconnect, RuleApplier applier) throws ResourceUnavailableException { if (routers == null || routers.isEmpty()) { s_logger.warn("Unable to apply " + typeString + ", virtual router doesn't exist in the network " + network.getId()); throw new ResourceUnavailableException("Unable to apply " + typeString, DataCenter.class, network.getDataCenterId()); @@ -3615,7 +3789,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (router.isStopPending()) { if (_hostDao.findById(router.getHostId()).getState() == Status.Up) { throw new ResourceUnavailableException("Unable to process due to the stop pending router " + router.getInstanceName() + - " haven't been stopped after it's host coming back!", DataCenter.class, router.getDataCenterId()); + " haven't been stopped after it's host coming back!", DataCenter.class, router.getDataCenterId()); } s_logger.debug("Router " + router.getInstanceName() + " is stop pending, so not sending apply " + typeString + " commands to the backend"); continue; @@ -3643,7 +3817,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (isZoneBasic && isPodLevelException) { throw new ResourceUnavailableException("Unable to apply " + typeString + ", virtual router is not in the right state", Pod.class, podId); } - throw new ResourceUnavailableException("Unable to apply " + typeString + ", virtual router is not in the right state", DataCenter.class, router.getDataCenterId()); + throw new ResourceUnavailableException("Unable to apply " + typeString + ", virtual router is not in the right state", DataCenter.class, + router.getDataCenterId()); } } @@ -3697,7 +3872,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V rulesTO = new ArrayList(); for (StaticNat rule : rules) { IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); - StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); + StaticNatRuleTO ruleTO = + new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); } } @@ -3815,8 +3991,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V (!forVpc && network.getTrafficType() == TrafficType.Guest && network.getGuestType() == Network.GuestType.Isolated)) { final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIp4Address()); final String routerType = router.getType().toString(); - final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), - (forVpc ? routerNic.getIp4Address() : null), router.getId(), routerType); + final UserStatisticsVO previousStats = + _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), + router.getId(), routerType); NetworkUsageAnswer answer = null; try { answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd); @@ -3827,8 +4004,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (answer != null) { if (!answer.getResult()) { - s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + router.getHostId() + "; details: " + - answer.getDetails()); + s_logger.warn("Error while collecting network stats from router: " + router.getInstanceName() + " from host: " + router.getHostId() + + "; details: " + answer.getDetails()); continue; } try { @@ -3841,8 +4018,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { - UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), - (forVpc ? routerNic.getIp4Address() : null), router.getId(), routerType); + UserStatisticsVO stats = + _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), + router.getId(), routerType); if (stats == null) { s_logger.warn("unable to find stats for account: " + router.getAccountId()); return; @@ -3851,23 +4029,24 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (previousStats != null && ((previousStats.getCurrentBytesReceived() != stats.getCurrentBytesReceived()) || (previousStats.getCurrentBytesSent() != stats.getCurrentBytesSent()))) { s_logger.debug("Router stats changed from the time NetworkUsageCommand was sent. " + "Ignoring current answer. Router: " + - answerFinal.getRouterName() + " Rcvd: " + answerFinal.getBytesReceived() + "Sent: " + answerFinal.getBytesSent()); + answerFinal.getRouterName() + " Rcvd: " + answerFinal.getBytesReceived() + "Sent: " + answerFinal.getBytesSent()); return; } if (stats.getCurrentBytesReceived() > answerFinal.getBytesReceived()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Received # of bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Router: " + - answerFinal.getRouterName() + " Reported: " + answerFinal.getBytesReceived() + " Stored: " + - stats.getCurrentBytesReceived()); + s_logger.debug("Received # of bytes that's less than the last one. " + + "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + + answerFinal.getBytesReceived() + " Stored: " + stats.getCurrentBytesReceived()); } stats.setNetBytesReceived(stats.getNetBytesReceived() + stats.getCurrentBytesReceived()); } stats.setCurrentBytesReceived(answerFinal.getBytesReceived()); if (stats.getCurrentBytesSent() > answerFinal.getBytesSent()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Received # of bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Router: " + - answerFinal.getRouterName() + " Reported: " + answerFinal.getBytesSent() + " Stored: " + stats.getCurrentBytesSent()); + s_logger.debug("Received # of bytes that's less than the last one. " + + "Assuming something went wrong and persisting it. Router: " + answerFinal.getRouterName() + " Reported: " + + answerFinal.getBytesSent() + " Stored: " + stats.getCurrentBytesSent()); } stats.setNetBytesSent(stats.getNetBytesSent() + stats.getCurrentBytesSent()); } @@ -3882,7 +4061,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V }); } catch (Exception e) { s_logger.warn("Unable to update user statistics for account: " + router.getAccountId() + " Rx: " + answer.getBytesReceived() + "; Tx: " + - answer.getBytesSent()); + answer.getBytesSent()); } } } @@ -3972,9 +4151,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V ComponentContext.inject(cmd); params.put("id", "" + router.getId()); params.put("ctxStartEventId", "1"); - AsyncJobVO job = new AsyncJobVO(UUID.randomUUID().toString(), User.UID_SYSTEM, router.getAccountId(), RebootRouterCmd.class.getName(), ApiGsonHelper.getBuilder() - .create() - .toJson(params), router.getId(), cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); + AsyncJobVO job = + new AsyncJobVO(UUID.randomUUID().toString(), User.UID_SYSTEM, router.getAccountId(), RebootRouterCmd.class.getName(), ApiGsonHelper.getBuilder() + .create() + .toJson(params), router.getId(), cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); job.setDispatcher(_asyncDispatcher.getName()); long jobId = _asyncMgr.submitAsyncJob(job); jobIds.add(jobId); diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java index 07addafc760..439b2a73435 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java @@ -18,6 +18,7 @@ package com.cloud.network.router; import java.util.List; import java.util.Map; + import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -27,7 +28,10 @@ import com.cloud.network.RemoteAccessVpn; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.network.VpcVirtualNetworkApplianceService; import com.cloud.network.VpnUser; -import com.cloud.network.vpc.*; +import com.cloud.network.vpc.NetworkACLItem; +import com.cloud.network.vpc.PrivateGateway; +import com.cloud.network.vpc.StaticRouteProfile; +import com.cloud.network.vpc.Vpc; import com.cloud.user.Account; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.VirtualMachineProfile.Param; diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index c84e57d08b2..c3099c7754a 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -40,12 +40,10 @@ import com.cloud.agent.api.SetupGuestNetworkAnswer; import com.cloud.agent.api.SetupGuestNetworkCommand; import com.cloud.agent.api.routing.IpAssocVpcCommand; import com.cloud.agent.api.routing.NetworkElementCommand; -import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand; import com.cloud.agent.api.routing.SetNetworkACLCommand; import com.cloud.agent.api.routing.SetSourceNatCommand; import com.cloud.agent.api.routing.SetStaticRouteCommand; import com.cloud.agent.api.routing.Site2SiteVpnCfgCommand; -import com.cloud.agent.api.routing.VpnUsersCfgCommand; import com.cloud.agent.api.to.IpAddressTO; import com.cloud.agent.api.to.NetworkACLTO; import com.cloud.agent.api.to.NicTO; @@ -185,8 +183,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } @DB - protected List findOrDeployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map params) throws ConcurrentOperationException, - InsufficientCapacityException, ResourceUnavailableException { + protected List findOrDeployVirtualRouterInVpc(Vpc vpc, DeployDestination dest, Account owner, Map params) + throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { s_logger.debug("Deploying Virtual Router in VPC " + vpc); Vpc vpcLock = _vpcDao.acquireInLockTable(vpc.getId()); @@ -247,8 +245,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } @Override - public boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { if (network.getTrafficType() != TrafficType.Guest) { s_logger.warn("Network " + network + " is not of type " + TrafficType.Guest); @@ -288,7 +286,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } @Override - public boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, + ResourceUnavailableException { if (network.getTrafficType() != TrafficType.Guest) { s_logger.warn("Network " + network + " is not of type " + TrafficType.Guest); return false; @@ -323,7 +322,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian InsufficientServerCapacityException, InsufficientCapacityException, StorageUnavailableException, ResourceUnavailableException { LinkedHashMap networks = createVpcRouterNetworks(owner, isRedundant, plan, new Pair(true, sourceNatIp), vpcId); - DomainRouterVO router = super.deployRouter(owner, dest, plan, params, isRedundant, vrProvider, svcOffId, vpcId, networks, true, _vpcMgr.getSupportedVpcHypervisors()); + DomainRouterVO router = + super.deployRouter(owner, dest, plan, params, isRedundant, vrProvider, svcOffId, vpcId, networks, true, _vpcMgr.getSupportedVpcHypervisors()); return router; } @@ -351,8 +351,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return true; } else { s_logger.warn("Unable to setup guest network on virtual router " + router + " is not in the right state " + router.getState()); - throw new ResourceUnavailableException("Unable to setup guest network on the backend," + " virtual router " + router + " is not in the right state", DataCenter.class, - router.getDataCenterId()); + throw new ResourceUnavailableException("Unable to setup guest network on the backend," + " virtual router " + router + " is not in the right state", + DataCenter.class, router.getDataCenterId()); } } @@ -378,8 +378,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian NicProfile nicProfile = _networkModel.getNicProfile(router, nic.getNetworkId(), null); - SetupGuestNetworkCommand setupCmd = new SetupGuestNetworkCommand(dhcpRange, networkDomain, false, null, defaultDns1, defaultDns2, add, _itMgr.toNicTO(nicProfile, - router.getHypervisorType())); + SetupGuestNetworkCommand setupCmd = + new SetupGuestNetworkCommand(dhcpRange, networkDomain, false, null, defaultDns1, defaultDns2, add, _itMgr.toNicTO(nicProfile, router.getHypervisorType())); String brd = NetUtils.long2Ip(NetUtils.ip2Long(guestNic.getIp4Address()) | ~NetUtils.ip2Long(guestNic.getNetmask())); setupCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); @@ -397,7 +397,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return setupCmd; } - private void createVpcAssociatePublicIPCommands(final VirtualRouter router, final List ips, Commands cmds, Map vlanMacAddress) { + private void createVpcAssociatePublicIPCommands(final VirtualRouter router, final List ips, Commands cmds, + Map vlanMacAddress) { Pair sourceNatIpAdd = null; Boolean addSourceNat = null; @@ -432,8 +433,9 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian String macAddress = vlanMacAddress.get(BroadcastDomainType.getValue(BroadcastDomainType.fromString(ipAddr.getVlanTag()))); - IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, ipAddr.isSourceNat(), ipAddr.getVlanTag(), ipAddr.getGateway(), - ipAddr.getNetmask(), macAddress, networkRate, ipAddr.isOneToOneNat()); + IpAddressTO ip = + new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, ipAddr.isSourceNat(), ipAddr.getVlanTag(), ipAddr.getGateway(), + ipAddr.getNetmask(), macAddress, networkRate, ipAddr.isOneToOneNat()); ip.setTrafficType(network.getTrafficType()); ip.setNetworkName(_networkModel.getNetworkTag(router.getHypervisorType(), network)); @@ -472,7 +474,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } @Override - public boolean associatePublicIP(Network network, final List ipAddress, List routers) throws ResourceUnavailableException { + public boolean associatePublicIP(Network network, final List ipAddress, List routers) + throws ResourceUnavailableException { if (ipAddress == null || ipAddress.isEmpty()) { s_logger.debug("No ip association rules to be applied for network " + network.getId()); return true; @@ -537,13 +540,16 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } } //Create network usage commands. Send commands to router after IPAssoc - NetworkUsageCommand netUsageCmd = new NetworkUsageCommand(router.getPrivateIpAddress(), router.getInstanceName(), true, defaultNic.getIp4Address(), vpc.getCidr()); + NetworkUsageCommand netUsageCmd = + new NetworkUsageCommand(router.getPrivateIpAddress(), router.getInstanceName(), true, defaultNic.getIp4Address(), vpc.getCidr()); netUsagecmds.addCommand(netUsageCmd); - UserStatisticsVO stats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), publicNtwk.getId(), publicNic.getIp4Address(), router.getId(), - router.getType().toString()); + UserStatisticsVO stats = + _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), publicNtwk.getId(), publicNic.getIp4Address(), router.getId(), router.getType() + .toString()); if (stats == null) { - stats = new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), publicNic.getIp4Address(), router.getId(), router.getType().toString(), - publicNtwk.getId()); + stats = + new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), publicNic.getIp4Address(), router.getId(), router.getType().toString(), + publicNtwk.getId()); _userStatsDao.persist(stats); } } @@ -739,17 +745,20 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian _routerDao.update(routerVO.getId(), routerVO); } } - PlugNicCommand plugNicCmd = new PlugNicCommand(getNicTO(router, publicNic.getNetworkId(), publicNic.getBroadcastUri().toString()), router.getInstanceName(), - router.getType()); + PlugNicCommand plugNicCmd = + new PlugNicCommand(getNicTO(router, publicNic.getNetworkId(), publicNic.getBroadcastUri().toString()), router.getInstanceName(), router.getType()); cmds.addCommand(plugNicCmd); VpcVO vpc = _vpcDao.findById(router.getVpcId()); - NetworkUsageCommand netUsageCmd = new NetworkUsageCommand(router.getPrivateIpAddress(), router.getInstanceName(), true, publicNic.getIp4Address(), vpc.getCidr()); + NetworkUsageCommand netUsageCmd = + new NetworkUsageCommand(router.getPrivateIpAddress(), router.getInstanceName(), true, publicNic.getIp4Address(), vpc.getCidr()); usageCmds.add(netUsageCmd); - UserStatisticsVO stats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), publicNtwk.getId(), publicNic.getIp4Address(), router.getId(), - router.getType().toString()); + UserStatisticsVO stats = + _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), publicNtwk.getId(), publicNic.getIp4Address(), router.getId(), router.getType() + .toString()); if (stats == null) { - stats = new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), publicNic.getIp4Address(), router.getId(), router.getType().toString(), - publicNtwk.getId()); + stats = + new UserStatisticsVO(router.getAccountId(), router.getDataCenterId(), publicNic.getIp4Address(), router.getId(), router.getType().toString(), + publicNtwk.getId()); _userStatsDao.persist(stats); } } @@ -792,7 +801,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian //set network acl on private gateway List networkACLs = _networkACLItemDao.listByACL(privateGwAclId); s_logger.debug("Found " + networkACLs.size() + " network ACLs to apply as a part of VPC VR " + router + " start for private gateway ip = " + - ipVO.getIpAddress()); + ipVO.getIpAddress()); createNetworkACLsCommands(networkACLs, router, cmds, ipVO.getNetworkId(), true); } @@ -867,7 +876,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian if (_networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.NetworkACL, Provider.VPCVirtualRouter)) { List networkACLs = _networkACLMgr.listNetworkACLItems(guestNetworkId); if ((networkACLs != null) && !networkACLs.isEmpty()) { - s_logger.debug("Found " + networkACLs.size() + " network ACLs to apply as a part of VPC VR " + router + " start for guest network id=" + guestNetworkId); + s_logger.debug("Found " + networkACLs.size() + " network ACLs to apply as a part of VPC VR " + router + " start for guest network id=" + + guestNetworkId); createNetworkACLsCommands(networkACLs, router, cmds, guestNetworkId, false); } } @@ -1081,8 +1091,9 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian Long espLifetime = gw.getEspLifetime(); Boolean dpd = gw.getDpd(); - Site2SiteVpnCfgCommand cmd = new Site2SiteVpnCfgCommand(isCreate, localPublicIp, localPublicGateway, localGuestCidr, peerGatewayIp, peerGuestCidrList, ikePolicy, - espPolicy, ipsecPsk, ikeLifetime, espLifetime, dpd, conn.isPassive()); + Site2SiteVpnCfgCommand cmd = + new Site2SiteVpnCfgCommand(isCreate, localPublicIp, localPublicGateway, localGuestCidr, peerGatewayIp, peerGuestCidrList, ikePolicy, espPolicy, ipsecPsk, + ikeLifetime, espLifetime, dpd, conn.isPassive()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName()); @@ -1113,8 +1124,9 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian for (final PrivateIpAddress ipAddr : ipAddrList) { Network network = _networkModel.getNetwork(ipAddr.getNetworkId()); - IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false, ipAddr.getSourceNat(), ipAddr.getBroadcastUri(), - ipAddr.getGateway(), ipAddr.getNetmask(), ipAddr.getMacAddress(), null, false); + IpAddressTO ip = + new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false, ipAddr.getSourceNat(), ipAddr.getBroadcastUri(), ipAddr.getGateway(), + ipAddr.getNetmask(), ipAddr.getMacAddress(), null, false); ip.setTrafficType(network.getTrafficType()); ip.setNetworkName(_networkModel.getNetworkTag(router.getHypervisorType(), network)); @@ -1132,8 +1144,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } } - protected LinkedHashMap createVpcRouterNetworks(Account owner, boolean isRedundant, DeploymentPlan plan, Pair sourceNatIp, long vpcId) - throws ConcurrentOperationException, InsufficientAddressCapacityException { + protected LinkedHashMap createVpcRouterNetworks(Account owner, boolean isRedundant, DeploymentPlan plan, Pair sourceNatIp, + long vpcId) throws ConcurrentOperationException, InsufficientAddressCapacityException { LinkedHashMap networks = new LinkedHashMap(4); @@ -1198,13 +1210,15 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian if (privateNic != null) { VirtualMachine vm = _vmDao.findById(privateNic.getId()); - privateNicProfile = new NicProfile(privateNic, privateNetwork, privateNic.getBroadcastUri(), privateNic.getIsolationUri(), _networkModel.getNetworkRate( - privateNetwork.getId(), vm.getId()), _networkModel.isSecurityGroupSupportedInNetwork(privateNetwork), _networkModel.getNetworkTag(vm.getHypervisorType(), - privateNetwork)); + privateNicProfile = + new NicProfile(privateNic, privateNetwork, privateNic.getBroadcastUri(), privateNic.getIsolationUri(), _networkModel.getNetworkRate( + privateNetwork.getId(), vm.getId()), _networkModel.isSecurityGroupSupportedInNetwork(privateNetwork), _networkModel.getNetworkTag( + vm.getHypervisorType(), privateNetwork)); } else { String netmask = NetUtils.getCidrNetmask(privateNetwork.getCidr()); - PrivateIpAddress ip = new PrivateIpAddress(ipVO, privateNetwork.getBroadcastUri().toString(), privateNetwork.getGateway(), netmask, - NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress()))); + PrivateIpAddress ip = + new PrivateIpAddress(ipVO, privateNetwork.getBroadcastUri().toString(), privateNetwork.getGateway(), netmask, + NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress()))); URI netUri = BroadcastDomainType.fromString(ip.getBroadcastUri()); privateNicProfile.setIp4Address(ip.getIpAddress()); @@ -1236,7 +1250,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return guestNic; } - protected Pair, Map> getNicsToChangeOnRouter(final List publicIps, VirtualRouter router) { + protected Pair, Map> getNicsToChangeOnRouter(final List publicIps, + VirtualRouter router) { //1) check which nics need to be plugged/unplugged and plug/unplug them Map nicsToPlug = new HashMap(); @@ -1290,8 +1305,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian } } - Pair, Map> nicsToChange = new Pair, Map>(nicsToPlug, - nicsToUnplug); + Pair, Map> nicsToChange = + new Pair, Map>(nicsToPlug, nicsToUnplug); return nicsToChange; } @@ -1351,6 +1366,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return result; } + @Override protected String getVpnCidr(RemoteAccessVpn vpn) { if (vpn.getVpcId() == null) { return super.getVpnCidr(vpn); @@ -1379,16 +1395,16 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian Answer answer = cmds.getAnswer("users"); if (!answer.getResult()) { s_logger.error("Unable to start vpn: unable add users to vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + - router.getInstanceName() + " due to " + answer.getDetails()); - throw new ResourceUnavailableException("Unable to start vpn: Unable to add users to vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + - " on domR: " + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); + router.getInstanceName() + " due to " + answer.getDetails()); + throw new ResourceUnavailableException("Unable to start vpn: Unable to add users to vpn in zone " + router.getDataCenterId() + " for account " + + vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); } answer = cmds.getAnswer("startVpn"); if (!answer.getResult()) { - s_logger.error("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + - answer.getDetails()); + s_logger.error("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + router.getInstanceName() + + " due to " + answer.getDetails()); throw new ResourceUnavailableException("Unable to start vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + - router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); } return true; diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index b7bc1ab004e..69be58ff31f 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -25,10 +25,11 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; -import org.apache.log4j.Logger; import com.cloud.configuration.ConfigurationManager; import com.cloud.domain.dao.DomainDao; @@ -166,8 +167,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules // validate that IP address and userVM belong to the same account if (ipAddress.getAllocatedToAccountId().longValue() != userVm.getAccountId()) { - throw new InvalidParameterValueException("Unable to create ip forwarding rule, IP address " + ipAddress + " owner is not the same as owner of virtual machine " + - userVm.toString()); + throw new InvalidParameterValueException("Unable to create ip forwarding rule, IP address " + ipAddress + + " owner is not the same as owner of virtual machine " + userVm.toString()); } // validate that userVM is in the same availability zone as the IP address @@ -175,7 +176,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules //make an exception for portable IP if (!ipAddress.isPortable()) { throw new InvalidParameterValueException("Unable to create ip forwarding rule, IP address " + ipAddress + - " is not in the same availability zone as virtual machine " + userVm.toString()); + " is not in the same availability zone as virtual machine " + userVm.toString()); } } @@ -201,7 +202,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules @Override @DB @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_ADD, eventDescription = "creating forwarding rule", create = true) - public PortForwardingRule createPortForwardingRule(final PortForwardingRule rule, final Long vmId, Ip vmIp, final boolean openFirewall) throws NetworkRuleConflictException { + public PortForwardingRule createPortForwardingRule(final PortForwardingRule rule, final Long vmId, Ip vmIp, final boolean openFirewall) + throws NetworkRuleConflictException { CallContext ctx = CallContext.current(); final Account caller = ctx.getCallingAccount(); @@ -262,7 +264,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules // validate user VM exists UserVm vm = _vmDao.findById(vmId); if (vm == null) { - throw new InvalidParameterValueException("Unable to create port forwarding rule on address " + ipAddress + ", invalid virtual machine id specified (" + vmId + ")."); + throw new InvalidParameterValueException("Unable to create port forwarding rule on address " + ipAddress + ", invalid virtual machine id specified (" + + vmId + ")."); } else { checkRuleAndUserVm(rule, vm, caller); } @@ -311,14 +314,15 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules return Transaction.execute(new TransactionCallbackWithException() { @Override public PortForwardingRuleVO doInTransaction(TransactionStatus status) throws NetworkRuleConflictException { - PortForwardingRuleVO newRule = new PortForwardingRuleVO(rule.getXid(), rule.getSourceIpAddressId(), rule.getSourcePortStart(), rule.getSourcePortEnd(), - dstIpFinal, rule.getDestinationPortStart(), rule.getDestinationPortEnd(), rule.getProtocol().toLowerCase(), networkId, accountId, domainId, vmId); + PortForwardingRuleVO newRule = + new PortForwardingRuleVO(rule.getXid(), rule.getSourceIpAddressId(), rule.getSourcePortStart(), rule.getSourcePortEnd(), dstIpFinal, + rule.getDestinationPortStart(), rule.getDestinationPortEnd(), rule.getProtocol().toLowerCase(), networkId, accountId, domainId, vmId); newRule = _portForwardingDao.persist(newRule); // create firewallRule for 0.0.0.0/0 cidr if (openFirewall) { - _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, newRule.getId(), - networkId); + _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, + newRule.getId(), networkId); } try { @@ -373,8 +377,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules throw new NetworkRuleConflictException("Can't do static nat on ip address: " + ipAddress.getAddress()); } - _firewallMgr.validateFirewallRule(caller, ipAddress, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), Purpose.StaticNat, FirewallRuleType.User, - null, rule.getTrafficType()); + _firewallMgr.validateFirewallRule(caller, ipAddress, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), Purpose.StaticNat, + FirewallRuleType.User, null, rule.getTrafficType()); final Long networkId = ipAddress.getAssociatedWithNetworkId(); final Long accountId = ipAddress.getAllocatedToAccountId(); @@ -394,15 +398,16 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules @Override public StaticNatRule doInTransaction(TransactionStatus status) throws NetworkRuleConflictException { - FirewallRuleVO newRule = new FirewallRuleVO(rule.getXid(), rule.getSourceIpAddressId(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol() - .toLowerCase(), networkId, accountId, domainId, rule.getPurpose(), null, null, null, null, null); + FirewallRuleVO newRule = + new FirewallRuleVO(rule.getXid(), rule.getSourceIpAddressId(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol().toLowerCase(), + networkId, accountId, domainId, rule.getPurpose(), null, null, null, null, null); newRule = _firewallDao.persist(newRule); // create firewallRule for 0.0.0.0/0 cidr if (openFirewall) { - _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, newRule.getId(), - networkId); + _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, + newRule.getId(), networkId); } try { @@ -440,7 +445,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules return enableStaticNat(ipId, vmId, networkId, false, vmGuestIp); } - private boolean enableStaticNat(long ipId, long vmId, long networkId, boolean isSystemVm, String vmGuestIp) throws NetworkRuleConflictException, ResourceUnavailableException { + private boolean enableStaticNat(long ipId, long vmId, long networkId, boolean isSystemVm, String vmGuestIp) throws NetworkRuleConflictException, + ResourceUnavailableException { CallContext ctx = CallContext.current(); Account caller = ctx.getCallingAccount(); CallContext.current().setEventDetails("Ip Id: " + ipId); @@ -479,7 +485,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules if (!isSystemVm) { UserVmVO vm = _vmDao.findById(vmId); if (vm == null) { - throw new InvalidParameterValueException("Can't enable static nat for the address id=" + ipId + ", invalid virtual machine id specified (" + vmId + ")."); + throw new InvalidParameterValueException("Can't enable static nat for the address id=" + ipId + ", invalid virtual machine id specified (" + vmId + + ")."); } //associate ip address to network (if needed) if (ipAddress.getAssociatedWithNetworkId() == null) { @@ -495,7 +502,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules return false; } } else if (ipAddress.isPortable()) { - s_logger.info("Portable IP " + ipAddress.getUuid() + " is not associated with the network yet " + " so associate IP with the network " + networkId); + s_logger.info("Portable IP " + ipAddress.getUuid() + " is not associated with the network yet " + " so associate IP with the network " + + networkId); try { // check if StaticNat service is enabled in the network _networkModel.checkIpForService(ipAddress, Service.StaticNat, networkId); @@ -528,11 +536,12 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules return false; } } else { - throw new InvalidParameterValueException("Portable IP: " + ipId + " has associated services " + "in network " + ipAddress.getAssociatedWithNetworkId() + - " so can not be transferred to " + " network " + networkId); + throw new InvalidParameterValueException("Portable IP: " + ipId + " has associated services " + "in network " + + ipAddress.getAssociatedWithNetworkId() + " so can not be transferred to " + " network " + networkId); } } else { - throw new InvalidParameterValueException("Invalid network Id=" + networkId + ". IP is associated with" + " a different network than passed network id"); + throw new InvalidParameterValueException("Invalid network Id=" + networkId + ". IP is associated with" + + " a different network than passed network id"); } } else { _networkModel.checkIpForService(ipAddress, Service.StaticNat, null); @@ -624,7 +633,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules throw new NetworkRuleConflictException("Failed to enable static nat for the ip address " + ipAddress + " as it already has LoadBalancing rules assigned"); } } else if (ipAddress.getAssociatedWithVmId() != null && ipAddress.getAssociatedWithVmId().longValue() != vmId) { - throw new NetworkRuleConflictException("Failed to enable static for the ip address " + ipAddress + " and vm id=" + vmId + " as it's already assigned to antoher vm"); + throw new NetworkRuleConflictException("Failed to enable static for the ip address " + ipAddress + " and vm id=" + vmId + + " as it's already assigned to antoher vm"); } //check wether the vm ip is alreday associated with any public ip address @@ -646,7 +656,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules // If there is public ip address already associated with the vm, throw an exception if (!reassignStaticNat) { throw new InvalidParameterValueException("Failed to enable static nat for the ip address id=" + ipAddress.getId() + " as vm id=" + vmId + - " is already associated with ip id=" + oldIP.getId()); + " is already associated with ip id=" + oldIP.getId()); } // unassign old static nat rule s_logger.debug("Disassociating static nat for ip " + oldIP); @@ -778,8 +788,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules _accountMgr.checkAccess(caller, null, true, ipAddressVO); } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -990,7 +1000,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules _accountMgr.checkAccess(caller, null, true, ipAddressVO); } - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -1147,12 +1158,14 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules public void doInTransactionWithoutResult(TransactionStatus status) throws NetworkRuleConflictException { for (int i = 0; i < ports.length; i++) { - rules[i] = new FirewallRuleVO(null, ip.getId(), ports[i], protocol, ip.getAssociatedWithNetworkId(), ip.getAllocatedToAccountId(), ip.getAllocatedInDomainId(), - purpose, null, null, null, null); + rules[i] = + new FirewallRuleVO(null, ip.getId(), ports[i], protocol, ip.getAssociatedWithNetworkId(), ip.getAllocatedToAccountId(), + ip.getAllocatedInDomainId(), purpose, null, null, null, null); rules[i] = _firewallDao.persist(rules[i]); if (openFirewall) { - _firewallMgr.createRuleForAllCidrs(ip.getId(), caller, ports[i], ports[i], protocol, null, null, rules[i].getId(), ip.getAssociatedWithNetworkId()); + _firewallMgr.createRuleForAllCidrs(ip.getId(), caller, ports[i], ports[i], protocol, null, null, rules[i].getId(), + ip.getAssociatedWithNetworkId()); } } } @@ -1416,11 +1429,11 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules success = enableStaticNat(ip.getId(), vm.getId(), guestNetwork.getId(), isSystemVM, null); } catch (NetworkRuleConflictException ex) { s_logger.warn("Failed to enable static nat as a part of enabling elasticIp and staticNat for vm " + vm + " in guest network " + guestNetwork + - " due to exception ", ex); + " due to exception ", ex); success = false; } catch (ResourceUnavailableException ex) { s_logger.warn("Failed to enable static nat as a part of enabling elasticIp and staticNat for vm " + vm + " in guest network " + guestNetwork + - " due to exception ", ex); + " due to exception ", ex); success = false; } @@ -1456,8 +1469,9 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules VMInstanceVO vm = _vmInstanceDao.findById(nic.getInstanceId()); // generate a static Nat rule on the fly because staticNATrule does not persist into db anymore // FIX ME - FirewallRuleVO staticNatRule = new FirewallRuleVO(null, ip.getId(), 0, 65535, NetUtils.ALL_PROTO.toString(), nic.getNetworkId(), vm.getAccountId(), - vm.getDomainId(), Purpose.StaticNat, null, null, null, null, null); + FirewallRuleVO staticNatRule = + new FirewallRuleVO(null, ip.getId(), 0, 65535, NetUtils.ALL_PROTO.toString(), nic.getNetworkId(), vm.getAccountId(), vm.getDomainId(), + Purpose.StaticNat, null, null, null, null, null); result.add(staticNatRule); } } diff --git a/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java b/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java index 82f8abc2dd5..93811a92170 100644 --- a/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java +++ b/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java @@ -17,7 +17,6 @@ package com.cloud.network.security; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; diff --git a/server/src/com/cloud/network/security/SecurityGroupListener.java b/server/src/com/cloud/network/security/SecurityGroupListener.java index 3a64f195249..af963b1ad4a 100755 --- a/server/src/com/cloud/network/security/SecurityGroupListener.java +++ b/server/src/com/cloud/network/security/SecurityGroupListener.java @@ -33,9 +33,9 @@ import com.cloud.agent.api.CleanupNetworkRulesCmd; import com.cloud.agent.api.Command; import com.cloud.agent.api.PingRoutingWithNwGroupsCommand; import com.cloud.agent.api.SecurityGroupRuleAnswer; +import com.cloud.agent.api.SecurityGroupRuleAnswer.FailureReason; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; -import com.cloud.agent.api.SecurityGroupRuleAnswer.FailureReason; import com.cloud.agent.manager.Commands; import com.cloud.exception.AgentUnavailableException; import com.cloud.host.Host; @@ -92,9 +92,11 @@ public class SecurityGroupListener implements Listener { } else { _workDao.updateStep(ruleAnswer.getVmId(), ruleAnswer.getLogSequenceNumber(), Step.Error); ; - s_logger.debug("Failed to program rule " + ruleAnswer.toString() + " into host " + agentId + " due to " + ruleAnswer.getDetails() + " and updated jobs"); + s_logger.debug("Failed to program rule " + ruleAnswer.toString() + " into host " + agentId + " due to " + ruleAnswer.getDetails() + + " and updated jobs"); if (ruleAnswer.getReason() == FailureReason.CANNOT_BRIDGE_FIREWALL) { - s_logger.debug("Not retrying security group rules for vm " + ruleAnswer.getVmId() + " on failure since host " + agentId + " cannot do bridge firewalling"); + s_logger.debug("Not retrying security group rules for vm " + ruleAnswer.getVmId() + " on failure since host " + agentId + + " cannot do bridge firewalling"); } else if (ruleAnswer.getReason() == FailureReason.PROGRAMMING_FAILED) { if (checkShouldRetryOnFailure(ruleAnswer.getVmId())) { s_logger.debug("Retrying security group rules on failure for vm " + ruleAnswer.getVmId()); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 13b30ee5d57..d60d2f3d8bf 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -42,6 +42,7 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.digest.DigestUtils; import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd; import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd; import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd; @@ -121,7 +122,8 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @Local(value = {SecurityGroupManager.class, SecurityGroupService.class}) -public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, StateListener { +public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, + StateListener { public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class); @Inject @@ -509,16 +511,16 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro for (PortAndProto pAp : ingressRules.keySet()) { Set cidrs = ingressRules.get(pAp); if (cidrs.size() > 0) { - IpPortAndProto ipPortAndProto = new SecurityGroupRulesCmd.IpPortAndProto(pAp.getProto(), pAp.getStartPort(), pAp.getEndPort(), - cidrs.toArray(new String[cidrs.size()])); + IpPortAndProto ipPortAndProto = + new SecurityGroupRulesCmd.IpPortAndProto(pAp.getProto(), pAp.getStartPort(), pAp.getEndPort(), cidrs.toArray(new String[cidrs.size()])); ingressResult.add(ipPortAndProto); } } for (PortAndProto pAp : egressRules.keySet()) { Set cidrs = egressRules.get(pAp); if (cidrs.size() > 0) { - IpPortAndProto ipPortAndProto = new SecurityGroupRulesCmd.IpPortAndProto(pAp.getProto(), pAp.getStartPort(), pAp.getEndPort(), - cidrs.toArray(new String[cidrs.size()])); + IpPortAndProto ipPortAndProto = + new SecurityGroupRulesCmd.IpPortAndProto(pAp.getProto(), pAp.getStartPort(), pAp.getEndPort(), cidrs.toArray(new String[cidrs.size()])); egressResult.add(ipPortAndProto); } } @@ -689,13 +691,13 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro Account authorizedAccount = _accountDao.findActiveAccount(authorizedAccountName, domainId); if (authorizedAccount == null) { throw new InvalidParameterValueException("Nonexistent account: " + authorizedAccountName + " when trying to authorize security group rule for " + - securityGroupId + ":" + protocol + ":" + startPortOrType + ":" + endPortOrCode); + securityGroupId + ":" + protocol + ":" + startPortOrType + ":" + endPortOrCode); } SecurityGroupVO groupVO = _securityGroupDao.findByAccountAndName(authorizedAccount.getId(), group); if (groupVO == null) { throw new InvalidParameterValueException("Nonexistent group " + group + " for account " + authorizedAccountName + "/" + domainId + - " is given, unable to authorize security group rule."); + " is given, unable to authorize security group rule."); } // Check permissions @@ -735,19 +737,21 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro throw new ConcurrentAccessException("Failed to acquire lock on security group: " + ngId); } } - SecurityGroupRuleVO securityGroupRule = _securityGroupRuleDao.findByProtoPortsAndAllowedGroupId(securityGroup.getId(), protocolFinal, startPortOrTypeFinal, - endPortOrCodeFinal, ngVO.getId()); + SecurityGroupRuleVO securityGroupRule = + _securityGroupRuleDao.findByProtoPortsAndAllowedGroupId(securityGroup.getId(), protocolFinal, startPortOrTypeFinal, endPortOrCodeFinal, + ngVO.getId()); if ((securityGroupRule != null) && (securityGroupRule.getRuleType() == ruleType)) { continue; // rule already exists. } - securityGroupRule = new SecurityGroupRuleVO(ruleType, securityGroup.getId(), startPortOrTypeFinal, endPortOrCodeFinal, protocolFinal, ngVO.getId()); + securityGroupRule = + new SecurityGroupRuleVO(ruleType, securityGroup.getId(), startPortOrTypeFinal, endPortOrCodeFinal, protocolFinal, ngVO.getId()); securityGroupRule = _securityGroupRuleDao.persist(securityGroupRule); newRules.add(securityGroupRule); } if (cidrList != null) { for (String cidr : cidrList) { - SecurityGroupRuleVO securityGroupRule = _securityGroupRuleDao.findByProtoPortsAndCidr(securityGroup.getId(), protocolFinal, startPortOrTypeFinal, - endPortOrCodeFinal, cidr); + SecurityGroupRuleVO securityGroupRule = + _securityGroupRuleDao.findByProtoPortsAndCidr(securityGroup.getId(), protocolFinal, startPortOrTypeFinal, endPortOrCodeFinal, cidr); if ((securityGroupRule != null) && (securityGroupRule.getRuleType() == ruleType)) { continue; } @@ -890,7 +894,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro _serverId = ManagementServerNode.getManagementServerId(); s_logger.info("SecurityGroupManager: num worker threads=" + _numWorkerThreads + ", time between cleanups=" + _timeBetweenCleanups + " global lock timeout=" + - _globalWorkLockTimeout); + _globalWorkLockTimeout); createThreadPools(); return true; @@ -998,8 +1002,9 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro nicSecIps = _nicSecIpDao.getSecondaryIpAddressesForNic(nic.getId()); } } - SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(), - generateRulesetSignature(ingressRules, egressRules), seqnum, ingressRules, egressRules, nicSecIps); + SecurityGroupRulesCmd cmd = + generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(), + generateRulesetSignature(ingressRules, egressRules), seqnum, ingressRules, egressRules, nicSecIps); Commands cmds = new Commands(cmd); try { _agentMgr.send(agentId, cmds, _answerListener); @@ -1049,7 +1054,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro if (ngrpLock == null) { s_logger.warn("Failed to acquire lock on network group id=" + securityGroup.getId() + " name=" + securityGroup.getName()); throw new ConcurrentModificationException("Failed to acquire lock on network group id=" + securityGroup.getId() + " name=" + - securityGroup.getName()); + securityGroup.getName()); } if (_securityGroupVMMapDao.findByVmIdGroupId(userVmId, securityGroup.getId()) == null) { SecurityGroupVMMapVO groupVmMapVO = new SecurityGroupVMMapVO(securityGroup.getId(), userVmId); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java index 908921a9bad..3c0c5c3c141 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java @@ -29,14 +29,13 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.cloudstack.managed.context.ManagedContext; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; import com.cloud.agent.api.SecurityGroupRulesCmd; import com.cloud.agent.manager.Commands; import com.cloud.configuration.Config; import com.cloud.exception.AgentUnavailableException; import com.cloud.network.security.SecurityGroupWork.Step; +import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.uservm.UserVm; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Profiler; @@ -44,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.mgmt.JmxUtil; import com.cloud.vm.NicVO; import com.cloud.vm.VirtualMachine.State; -import com.cloud.network.security.SecurityRule.SecurityRuleType; /** * Same as the base class -- except it uses the abstracted security group work queue @@ -109,8 +107,8 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { workItems.removeAll(_disabledVms); if (s_logger.isDebugEnabled()) { - s_logger.debug("Security Group Mgr v2: scheduling ruleset updates for " + affectedVms.size() + " vms " + " (unique=" + workItems.size() + "), current queue size=" + - _workQueue.size()); + s_logger.debug("Security Group Mgr v2: scheduling ruleset updates for " + affectedVms.size() + " vms " + " (unique=" + workItems.size() + + "), current queue size=" + _workQueue.size()); } Profiler p = new Profiler(); @@ -126,8 +124,8 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { _mBean.logScheduledDetails(workItems); p.stop(); if (s_logger.isDebugEnabled()) { - s_logger.debug("Security Group Mgr v2: done scheduling ruleset updates for " + workItems.size() + " vms: num new jobs=" + newJobs + " num rows insert or updated=" + - updated + " time taken=" + p.getDuration()); + s_logger.debug("Security Group Mgr v2: done scheduling ruleset updates for " + workItems.size() + " vms: num new jobs=" + newJobs + + " num rows insert or updated=" + updated + " time taken=" + p.getDuration()); } } @@ -191,12 +189,14 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { nicSecIps = _nicSecIpDao.getSecondaryIpAddressesForNic(nic.getId()); } } - SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(), null, - work.getLogsequenceNumber(), ingressRules, egressRules, nicSecIps); + SecurityGroupRulesCmd cmd = + generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(), null, work.getLogsequenceNumber(), + ingressRules, egressRules, nicSecIps); cmd.setMsId(_serverId); if (s_logger.isDebugEnabled()) { - s_logger.debug("SecurityGroupManager v2: sending ruleset update for vm " + vm.getInstanceName() + ":ingress num rules=" + cmd.getIngressRuleSet().length + - ":egress num rules=" + cmd.getEgressRuleSet().length + " num cidrs=" + cmd.getTotalNumCidrs() + " sig=" + cmd.getSignature()); + s_logger.debug("SecurityGroupManager v2: sending ruleset update for vm " + vm.getInstanceName() + ":ingress num rules=" + + cmd.getIngressRuleSet().length + ":egress num rules=" + cmd.getEgressRuleSet().length + " num cidrs=" + cmd.getTotalNumCidrs() + " sig=" + + cmd.getSignature()); } Commands cmds = new Commands(cmd); try { diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerMBean.java b/server/src/com/cloud/network/security/SecurityGroupManagerMBean.java index 8d6cb9072e5..0745b80ed53 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerMBean.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerMBean.java @@ -16,9 +16,9 @@ // under the License. package com.cloud.network.security; +import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Date; /** * Allows JMX access diff --git a/server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java b/server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java index 5fa3e96c84c..4c64fca62c1 100644 --- a/server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java +++ b/server/src/com/cloud/network/security/SecurityManagerMBeanImpl.java @@ -30,7 +30,6 @@ import com.cloud.network.security.LocalSecurityGroupWorkQueue.LocalSecurityGroup import com.cloud.network.security.SecurityGroupWork.Step; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine.Type; -import com.cloud.network.security.SecurityRule.SecurityRuleType; public class SecurityManagerMBeanImpl extends StandardMBean implements SecurityGroupManagerMBean, RuleUpdateLog { SecurityGroupManagerImpl2 _sgMgr; diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java index a84e0a02dbf..c67bc5f1672 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; + import org.apache.cloudstack.context.CallContext; import com.cloud.configuration.ConfigurationManager; @@ -212,8 +213,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana @Override @DB @ActionEvent(eventType = EventTypes.EVENT_NETWORK_ACL_ITEM_CREATE, eventDescription = "creating network ACL Item", create = true) - public NetworkACLItem createNetworkACLItem(final Integer portStart, final Integer portEnd, final String protocol, final List sourceCidrList, final Integer icmpCode, - final Integer icmpType, final NetworkACLItem.TrafficType trafficType, final Long aclId, final String action, Integer number) { + public NetworkACLItem createNetworkACLItem(final Integer portStart, final Integer portEnd, final String protocol, final List sourceCidrList, + final Integer icmpCode, final Integer icmpType, final NetworkACLItem.TrafficType trafficType, final Long aclId, final String action, Integer number) { // If number is null, set it to currentMax + 1 (for backward compatibility) if (number == null) { number = _networkACLItemDao.getMaxNumberByACL(aclId) + 1; @@ -228,8 +229,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana ruleAction = NetworkACLItem.Action.Deny; } - NetworkACLItemVO newRule = new NetworkACLItemVO(portStart, portEnd, protocol.toLowerCase(), aclId, sourceCidrList, icmpCode, icmpType, trafficType, ruleAction, - numberFinal); + NetworkACLItemVO newRule = + new NetworkACLItemVO(portStart, portEnd, protocol.toLowerCase(), aclId, sourceCidrList, icmpCode, icmpType, trafficType, ruleAction, numberFinal); newRule = _networkACLItemDao.persist(newRule); if (!_networkACLItemDao.setStateToAdd(newRule)) { @@ -390,8 +391,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana } @Override - public NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number, - Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType) throws ResourceUnavailableException { + public NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, + Integer number, Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType) throws ResourceUnavailableException { NetworkACLItemVO aclItem = _networkACLItemDao.findById(id); aclItem.setState(State.Add); diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 80ddc93ee43..645393449a3 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -312,15 +312,16 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } } - validateNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(), aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), - aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber()); + validateNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(), aclItemCmd.getProtocol(), + aclItemCmd.getIcmpCode(), aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber()); - return _networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), aclItemCmd.getSourceCidrList(), - aclItemCmd.getIcmpCode(), aclItemCmd.getIcmpType(), aclItemCmd.getTrafficType(), aclId, aclItemCmd.getAction(), aclItemCmd.getNumber()); + return _networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(), aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), + aclItemCmd.getSourceCidrList(), aclItemCmd.getIcmpCode(), aclItemCmd.getIcmpType(), aclItemCmd.getTrafficType(), aclId, aclItemCmd.getAction(), + aclItemCmd.getNumber()); } - private void validateNetworkACLItem(Integer portStart, Integer portEnd, List sourceCidrList, String protocol, Integer icmpCode, Integer icmpType, String action, - Integer number) { + private void validateNetworkACLItem(Integer portStart, Integer portEnd, List sourceCidrList, String protocol, Integer icmpCode, Integer icmpType, + String action, Integer number) { if (portStart != null && !NetUtils.isValidPort(portStart)) { throw new InvalidParameterValueException("publicPort is an invalid value: " + portStart); @@ -380,7 +381,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } if (icmpCode != null) { if (icmpCode.longValue() != -1 && !NetUtils.validateIcmpCode(icmpCode.longValue())) { - throw new InvalidParameterValueException("Invalid icmp code; should belong to [0-15] range and can" + " be defined when icmpType belongs to [0-40] range"); + throw new InvalidParameterValueException("Invalid icmp code; should belong to [0-15] range and can" + + " be defined when icmpType belongs to [0-40] range"); } } } @@ -421,8 +423,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -504,8 +506,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } @Override - public NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number, - Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType) throws ResourceUnavailableException { + public NetworkACLItem updateNetworkACLItem(Long id, String protocol, List sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, + Integer number, Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType) throws ResourceUnavailableException { NetworkACLItemVO aclItem = _networkACLItemDao.findById(id); if (aclItem == null) { throw new InvalidParameterValueException("Unable to find ACL Item cannot be found"); @@ -531,8 +533,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } } - validateNetworkACLItem((sourcePortStart == null) ? aclItem.getSourcePortStart() : sourcePortStart, (sourcePortEnd == null) ? aclItem.getSourcePortEnd() : sourcePortEnd, - sourceCidrList, protocol, icmpCode, (icmpType == null) ? aclItem.getIcmpType() : icmpType, action, number); + validateNetworkACLItem((sourcePortStart == null) ? aclItem.getSourcePortStart() : sourcePortStart, (sourcePortEnd == null) ? aclItem.getSourcePortEnd() + : sourcePortEnd, sourceCidrList, protocol, icmpCode, (icmpType == null) ? aclItem.getIcmpType() : icmpType, action, number); return _networkAclMgr.updateNetworkACLItem(id, protocol, sourceCidrList, trafficType, action, number, sourcePortStart, sourcePortEnd, icmpCode, icmpType); } diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 9fd2abafdf8..cb3d9afc7c3 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -270,7 +270,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis IpAddressSearch.and("associatedWithNetworkId", IpAddressSearch.entity().getAssociatedWithNetworkId(), Op.EQ); SearchBuilder virtualNetworkVlanSB = _vlanDao.createSearchBuilder(); virtualNetworkVlanSB.and("vlanType", virtualNetworkVlanSB.entity().getVlanType(), Op.EQ); - IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), JoinBuilder.JoinType.INNER); + IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), + JoinBuilder.JoinType.INNER); IpAddressSearch.done(); return true; @@ -299,7 +300,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @Override @ActionEvent(eventType = EventTypes.EVENT_VPC_OFFERING_CREATE, eventDescription = "creating vpc offering", create = true) - public VpcOffering createVpcOffering(String name, String displayText, List supportedServices, Map> serviceProviders, Long serviceOfferingId) { + public VpcOffering createVpcOffering(String name, String displayText, List supportedServices, Map> serviceProviders, + Long serviceOfferingId) { Map> svcProviderMap = new HashMap>(); Set defaultProviders = new HashSet(); defaultProviders.add(Provider.VPCVirtualRouter); @@ -364,7 +366,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } svcProviderMap.put(service, providers); } else { - throw new InvalidParameterValueException("Service " + serviceEntry.getKey() + " is not enabled for the network " + "offering, can't add a provider to it"); + throw new InvalidParameterValueException("Service " + serviceEntry.getKey() + " is not enabled for the network " + + "offering, can't add a provider to it"); } } } @@ -376,8 +379,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } @DB - protected VpcOffering createVpcOffering(final String name, final String displayText, final Map> svcProviderMap, final boolean isDefault, - final State state, final Long serviceOfferingId) { + protected VpcOffering createVpcOffering(final String name, final String displayText, final Map> svcProviderMap, + final boolean isDefault, final State state, final Long serviceOfferingId) { return Transaction.execute(new TransactionCallback() { @Override public VpcOffering doInTransaction(TransactionStatus status) { @@ -527,7 +530,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis int vpcCount = _vpcDao.getVpcCountByOfferingId(offId); if (vpcCount > 0) { throw new InvalidParameterValueException("Can't delete vpc offering " + offId + " as its used by " + vpcCount + " vpcs. " + - "To make the network offering unavaiable, disable it"); + "To make the network offering unavaiable, disable it"); } if (_vpcOffDao.remove(offId)) { @@ -581,7 +584,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @Override @ActionEvent(eventType = EventTypes.EVENT_VPC_CREATE, eventDescription = "creating vpc", create = true) - public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) throws ResourceAllocationException { + public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain) + throws ResourceAllocationException { Account caller = CallContext.current().getCallingAccount(); Account owner = _accountMgr.getAccount(vpcOwnerId); @@ -646,8 +650,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis // validate network domain if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException("Invalid network domain. Total length shouldn't exceed 190 chars. Each domain " - + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', " - + "the digits '0' through '9', " + "and the hyphen ('-'); can't start or end with \"-\""); + + "label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', " + "the digits '0' through '9', " + + "and the hyphen ('-'); can't start or end with \"-\""); } return Transaction.execute(new TransactionCallback() { @@ -802,7 +806,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -1036,7 +1041,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @DB @Override - public void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, Long aclId) { + public void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, String newCidr, String newNetworkDomain, Vpc vpc, String gateway, Account networkOwner, + Long aclId) { NetworkOffering guestNtwkOff = _entityMgr.findById(NetworkOffering.class, newNtwkOffId); @@ -1101,7 +1107,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if (!(guestNtwkOff.getGuestType() == GuestType.Isolated && supportedSvcs.contains(Service.SourceNat))) { throw new InvalidParameterValueException("Only network offerings of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName() + - " are valid for vpc "); + " are valid for vpc "); } //3) No redundant router support @@ -1135,7 +1141,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis try { //check number of active networks in vpc if (_ntwkDao.countVpcNetworks(vpc.getId()) >= _maxNetworks) { - throw new CloudRuntimeException("Number of networks per VPC can't extend " + _maxNetworks + "; increase it using global config " + Config.VpcMaxNetworks); + throw new CloudRuntimeException("Number of networks per VPC can't extend " + _maxNetworks + "; increase it using global config " + + Config.VpcMaxNetworks); } //1) CIDR is required @@ -1367,7 +1374,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis try { gatewayVO = Transaction.execute(new TransactionCallbackWithException() { @Override - public VpcGatewayVO doInTransaction(TransactionStatus status) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException { + public VpcGatewayVO doInTransaction(TransactionStatus status) throws ResourceAllocationException, ConcurrentOperationException, + InsufficientCapacityException { s_logger.debug("Creating Private gateway for VPC " + vpc); //1) create private network unless it is existing and lswitch'd Network privateNtwk = null; @@ -1379,8 +1387,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if (privateNtwk == null) { s_logger.info("creating new network for vpc " + vpc + " using broadcast uri: " + broadcastUri); String networkName = "vpc-" + vpc.getName() + "-privateNetwork"; - privateNtwk = _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal, broadcastUri, ipAddress, null, gateway, netmask, - gatewayOwnerId, vpcId, isSourceNat, networkOfferingId); + privateNtwk = + _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal, broadcastUri, ipAddress, null, gateway, netmask, + gatewayOwnerId, vpcId, isSourceNat, networkOfferingId); } else { // create the nic/ip as createPrivateNetwork doesn''t do that work for us now s_logger.info("found and using existing network for vpc " + vpc + ": " + broadcastUri); DataCenterVO dc = _dcDao.lockRow(physNetFinal.getDataCenterId(), true); @@ -1389,7 +1398,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis PrivateIpVO privateIp = _privateIpDao.findByIpAndSourceNetworkId(privateNtwk.getId(), ipAddress); if (privateIp != null) { throw new InvalidParameterValueException("Private ip address " + ipAddress + " already used for private gateway" + " in zone " + - _entityMgr.findById(DataCenter.class, dcId).getName()); + _entityMgr.findById(DataCenter.class, dcId).getName()); } Long mac = dc.getMacAddress(); @@ -1416,8 +1425,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } //2) create gateway entry - VpcGatewayVO gatewayVO = new VpcGatewayVO(ipAddress, VpcGateway.Type.Private, vpcId, privateNtwk.getDataCenterId(), privateNtwk.getId(), broadcastUri, gateway, - netmask, vpc.getAccountId(), vpc.getDomainId(), isSourceNat, networkAclId); + VpcGatewayVO gatewayVO = + new VpcGatewayVO(ipAddress, VpcGateway.Type.Private, vpcId, privateNtwk.getDataCenterId(), privateNtwk.getId(), broadcastUri, gateway, netmask, + vpc.getAccountId(), vpc.getDomainId(), isSourceNat, networkAclId); _vpcGatewayDao.persist(gatewayVO); s_logger.debug("Created vpc gateway entry " + gatewayVO); @@ -1492,7 +1502,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis long routeCount = _staticRouteDao.countRoutesByGateway(gatewayVO.getId()); if (routeCount > 0) { throw new CloudRuntimeException("Can't delete private gateway " + gatewayVO + " as it has " + routeCount + - " static routes applied. Remove the routes first"); + " static routes applied. Remove the routes first"); } gatewayVO.setState(VpcGateway.State.Deleting); @@ -1578,7 +1588,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis Long projectId = cmd.getProjectId(); Filter searchFilter = new Filter(VpcGatewayVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal()); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -1827,7 +1838,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis Map tags = cmd.getTags(); Long projectId = cmd.getProjectId(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -1887,7 +1899,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis //and not just the gateway List routes = _staticRouteDao.listByVpcIdAndNotRevoked(newRoute.getVpcId()); assert (routes.size() >= 1) : "For static routes, we now always first persist the route and then check for " - + "network conflicts so we should at least have one rule at this point."; + + "network conflicts so we should at least have one rule at this point."; for (StaticRoute route : routes) { if (route.getId() == newRoute.getId()) { @@ -1960,8 +1972,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @DB @Override @ActionEvent(eventType = EventTypes.EVENT_NET_IP_ASSIGN, eventDescription = "associating Ip", async = true) - public IpAddress associateIPToVpc(final long ipId, final long vpcId) throws ResourceAllocationException, ResourceUnavailableException, InsufficientAddressCapacityException, - ConcurrentOperationException { + public IpAddress associateIPToVpc(final long ipId, final long vpcId) throws ResourceAllocationException, ResourceUnavailableException, + InsufficientAddressCapacityException, ConcurrentOperationException { Account caller = CallContext.current().getCallingAccount(); Account owner = null; @@ -2048,9 +2060,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @DB @Override - public Network createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner, - Long domainId, PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller, Boolean isDisplayNetworkEnabled) - throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { + public Network createVpcGuestNetwork(long ntwkOffId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, + Account owner, Long domainId, PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, long vpcId, Long aclId, Account caller, + Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { Vpc vpc = getActiveVpc(vpcId); @@ -2073,8 +2085,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis validateNtwkOffForNtwkInVpc(null, ntwkOffId, cidr, networkDomain, vpc, gateway, owner, aclId); //2) Create network - Network guestNetwork = _ntwkMgr.createGuestNetwork(ntwkOffId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, domainId, pNtwk, zoneId, aclType, - subdomainAccess, vpcId, null, null, isDisplayNetworkEnabled, null); + Network guestNetwork = + _ntwkMgr.createGuestNetwork(ntwkOffId, name, displayText, gateway, cidr, vlanId, networkDomain, owner, domainId, pNtwk, zoneId, aclType, subdomainAccess, + vpcId, null, null, isDisplayNetworkEnabled, null); if (guestNetwork != null) { guestNetwork.setNetworkACLId(aclId); diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 8c72183d4ec..9fe3ad64bcf 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -25,13 +25,14 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd; import org.apache.cloudstack.api.command.user.vpn.ListVpnUsersCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; import com.cloud.configuration.Config; import com.cloud.domain.DomainVO; @@ -172,7 +173,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc if (networkId == null && vpcId == null) { throw new InvalidParameterValueException("Unable to create remote access vpn for the ipAddress: " + ipAddr.getAddress().addr() + - " as ip is not associated with any network or VPC"); + " as ip is not associated with any network or VPC"); } RemoteAccessVpnVO vpnVO = _remoteAccessVpnDao.findByPublicIpAddress(publicIpId); @@ -239,10 +240,12 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc @Override public RemoteAccessVpn doInTransaction(TransactionStatus status) throws NetworkRuleConflictException { if (vpcId == null) { - _rulesMgr.reservePorts(ipAddr, NetUtils.UDP_PROTO, Purpose.Vpn, openFirewallFinal, caller, NetUtils.VPN_PORT, NetUtils.VPN_L2TP_PORT, NetUtils.VPN_NATT_PORT); + _rulesMgr.reservePorts(ipAddr, NetUtils.UDP_PROTO, Purpose.Vpn, openFirewallFinal, caller, NetUtils.VPN_PORT, NetUtils.VPN_L2TP_PORT, + NetUtils.VPN_NATT_PORT); } - RemoteAccessVpnVO vpnVO = new RemoteAccessVpnVO(ipAddr.getAccountId(), ipAddr.getDomainId(), ipAddr.getAssociatedWithNetworkId(), publicIpId, vpcId, range[0], - newIpRange, sharedSecret); + RemoteAccessVpnVO vpnVO = + new RemoteAccessVpnVO(ipAddr.getAccountId(), ipAddr.getDomainId(), ipAddr.getAssociatedWithNetworkId(), publicIpId, vpcId, range[0], newIpRange, + sharedSecret); return _remoteAccessVpnDao.persist(vpnVO); } }); @@ -346,7 +349,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc for (FirewallRule vpnFwRule : vpnFwRules) { _rulesDao.remove(vpnFwRule.getId()); s_logger.debug("Successfully removed firewall rule with ip id=" + vpnFwRule.getSourceIpAddressId() + " and port " + - vpnFwRule.getSourcePortStart() + " as a part of vpn cleanup"); + vpnFwRule.getSourcePortStart() + " as a part of vpn cleanup"); } } } @@ -475,8 +478,8 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc List vpnUsers = _vpnUsersDao.listByAccount(vpn.getAccountId()); for (VpnUserVO user : vpnUsers) { if (user.getState() != VpnUser.State.Revoke) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VPN_USER_ADD, user.getAccountId(), 0, user.getId(), user.getUsername(), user.getClass() - .getName(), user.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VPN_USER_ADD, user.getAccountId(), 0, user.getId(), user.getUsername(), + user.getClass().getName(), user.getUuid()); } } } @@ -552,8 +555,8 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc @Override public void doInTransactionWithoutResult(TransactionStatus status) { _vpnUsersDao.remove(user.getId()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VPN_USER_REMOVE, user.getAccountId(), 0, user.getId(), user.getUsername(), - user.getClass().getName(), user.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VPN_USER_REMOVE, user.getAccountId(), 0, user.getId(), user.getUsername(), user.getClass() + .getName(), user.getUuid()); } }); } @@ -571,8 +574,8 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -625,9 +628,10 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc _accountMgr.checkAccess(caller, null, true, publicIp); } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); - _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); + _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), + false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index cb79a5af0d3..d068ca0d189 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -24,6 +24,9 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd; import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd; import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd; @@ -37,8 +40,6 @@ import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd; import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.event.ActionEvent; @@ -69,7 +70,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; @@ -157,7 +157,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn for (int j = i + 1; j < cidrList.length; j++) { if (NetUtils.isNetworksOverlap(cidrList[i], cidrList[j])) { throw new InvalidParameterValueException("The subnet of customer gateway " + cidrList[i] + " is overlapped with another subnet " + cidrList[j] + - " of customer gateway!"); + " of customer gateway!"); } } } @@ -225,8 +225,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn checkCustomerGatewayCidrList(guestCidrList); - Site2SiteCustomerGatewayVO gw = new Site2SiteCustomerGatewayVO(name, accountId, owner.getDomainId(), gatewayIp, guestCidrList, ipsecPsk, ikePolicy, espPolicy, ikeLifetime, - espLifetime, dpd); + Site2SiteCustomerGatewayVO gw = + new Site2SiteCustomerGatewayVO(name, accountId, owner.getDomainId(), gatewayIp, guestCidrList, ipsecPsk, ikePolicy, espPolicy, ikeLifetime, espLifetime, dpd); _customerGatewayDao.persist(gw); return gw; } @@ -260,7 +260,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn if (_vpnConnectionDao.findByVpnGatewayIdAndCustomerGatewayId(vpnGatewayId, customerGatewayId) != null) { throw new InvalidParameterValueException("The vpn connection with customer gateway id " + customerGatewayId + " or vpn gateway id " + vpnGatewayId + - " already existed!"); + " already existed!"); } if (_vpnConnectionDao.findByCustomerGatewayId(customerGatewayId) != null) { throw new InvalidParameterValueException("The vpn connection with specified customer gateway id " + customerGatewayId + " already exists!"); @@ -272,8 +272,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn String vpcCidr = _vpcDao.findById(vpnGateway.getVpcId()).getCidr(); for (String cidr : cidrList) { if (NetUtils.isNetworksOverlap(vpcCidr, cidr)) { - throw new InvalidParameterValueException("The subnets of customer gateway " + customerGatewayId + "'s subnet " + cidr + " is overlapped with VPC cidr " + vpcCidr + - "!"); + throw new InvalidParameterValueException("The subnets of customer gateway " + customerGatewayId + "'s subnet " + cidr + " is overlapped with VPC cidr " + + vpcCidr + "!"); } } @@ -291,8 +291,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn for (String oldCidr : oldCidrList) { for (String cidr : cidrList) { if (NetUtils.isNetworksOverlap(cidr, oldCidr)) { - throw new InvalidParameterValueException("The new connection's remote subnet " + cidr + " is overlapped with existed VPN connection to customer gateway " + - gw.getName() + "'s subnet " + oldCidr); + throw new InvalidParameterValueException("The new connection's remote subnet " + cidr + + " is overlapped with existed VPN connection to customer gateway " + gw.getName() + "'s subnet " + oldCidr); } } } @@ -313,7 +313,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn } try { if (conn.getState() != State.Pending && conn.getState() != State.Disconnected) { - throw new InvalidParameterValueException("Site to site VPN connection with specified connectionId not in correct state(pending or disconnected) to process!"); + throw new InvalidParameterValueException( + "Site to site VPN connection with specified connectionId not in correct state(pending or disconnected) to process!"); } conn.setState(State.Pending); @@ -574,7 +575,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -612,7 +614,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); @@ -655,7 +658,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(domainId, isRecursive, null); + Ternary domainIdRecursiveListProject = + new Ternary(domainId, isRecursive, null); _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index 97b37b9bdd4..5e7d9a96617 100755 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -39,12 +39,17 @@ import javax.mail.URLName; import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.sun.mail.smtp.SMTPMessage; +import com.sun.mail.smtp.SMTPSSLTransport; +import com.sun.mail.smtp.SMTPTransport; + import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.query.dao.ProjectAccountJoinDao; @@ -77,7 +82,6 @@ import com.cloud.user.User; import com.cloud.user.dao.AccountDao; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; @@ -87,9 +91,6 @@ import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; -import com.sun.mail.smtp.SMTPMessage; -import com.sun.mail.smtp.SMTPSSLTransport; -import com.sun.mail.smtp.SMTPTransport; @Component @Local(value = {ProjectService.class, ProjectManager.class}) @@ -483,7 +484,7 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager { ProjectAccountVO futureOwner = _projectAccountDao.findByProjectIdAccountId(projectId, futureOwnerAccount.getAccountId()); if (futureOwner == null) { throw new InvalidParameterValueException("Account " + newOwnerName + - " doesn't belong to the project. Add it to the project first and then change the project's ownership"); + " doesn't belong to the project. Add it to the project first and then change the project's ownership"); } //do resource limit check @@ -527,8 +528,8 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager { //User can be added to Active project only if (project.getState() != Project.State.Active) { - InvalidParameterValueException ex = new InvalidParameterValueException("Can't add account to the specified project id in state=" + project.getState() + - " as it's no longer active"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Can't add account to the specified project id in state=" + project.getState() + " as it's no longer active"); ex.addProxyObject(project.getUuid(), "projectId"); throw ex; } @@ -615,7 +616,8 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager { //check that account-to-remove exists Account account = _accountMgr.getActiveAccountByName(accountName, project.getDomainId()); if (account == null) { - InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find account name=" + accountName + " in domain id=" + project.getDomainId()); + InvalidParameterValueException ex = + new InvalidParameterValueException("Unable to find account name=" + accountName + " in domain id=" + project.getDomainId()); DomainVO domain = ApiDBUtils.findDomainById(project.getDomainId()); String domainUuid = String.valueOf(project.getDomainId()); if (domain != null) { @@ -638,8 +640,9 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager { //can't remove the owner of the project if (projectAccount.getAccountRole() == Role.Admin) { - InvalidParameterValueException ex = new InvalidParameterValueException("Unable to delete account " + accountName + - " from the project with specified id as the account is the owner of the project"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Unable to delete account " + accountName + + " from the project with specified id as the account is the owner of the project"); ex.addProxyObject(project.getUuid(), "projectId"); throw ex; } diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index bdeb729c896..7579b8f4ef0 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -120,6 +120,7 @@ import com.cloud.org.Grouping.AllocationState; import com.cloud.org.Managed; import com.cloud.serializer.GsonHelper; import com.cloud.storage.GuestOSCategoryVO; +import com.cloud.storage.GuestOsCategory; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolHostVO; @@ -143,12 +144,12 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionCallbackNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.NoTransitionException; import com.cloud.utils.net.Ip; @@ -314,7 +315,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, String eventName; for (ResourceListener l : lst) { if (event == ResourceListener.EVENT_DISCOVER_BEFORE) { - l.processDiscoverEventBefore((Long)params[0], (Long)params[1], (Long)params[2], (URI)params[3], (String)params[4], (String)params[5], (List)params[6]); + l.processDiscoverEventBefore((Long)params[0], (Long)params[1], (Long)params[2], (URI)params[3], (String)params[4], (String)params[5], + (List)params[6]); eventName = "EVENT_DISCOVER_BEFORE"; } else if (event == ResourceListener.EVENT_DISCOVER_AFTER) { l.processDiscoverEventAfter((Map>)params[0]); @@ -563,8 +565,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (cluster.getGuid() == null) { List hosts = listAllHostsInCluster(clusterId); if (!hosts.isEmpty()) { - CloudRuntimeException ex = new CloudRuntimeException( - "Guid is not updated for cluster with specified cluster id; need to wait for hosts in this cluster to come up"); + CloudRuntimeException ex = + new CloudRuntimeException("Guid is not updated for cluster with specified cluster id; need to wait for hosts in this cluster to come up"); ex.addProxyObject(cluster.getUuid(), "clusterId"); throw ex; } @@ -582,8 +584,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return discoverHostsFull(dcId, null, null, null, url, null, null, "SecondaryStorage", null, null, false); } - private List discoverHostsFull(Long dcId, Long podId, Long clusterId, String clusterName, String url, String username, String password, String hypervisorType, - List hostTags, Map params, boolean deferAgentCreation) throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException { + private List discoverHostsFull(Long dcId, Long podId, Long clusterId, String clusterName, String url, String username, String password, + String hypervisorType, List hostTags, Map params, boolean deferAgentCreation) throws IllegalArgumentException, DiscoveryException, + InvalidParameterValueException { URI uri = null; // Check if the zone exists in the system @@ -607,8 +610,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } // check if pod belongs to the zone if (!Long.valueOf(pod.getDataCenterId()).equals(dcId)) { - InvalidParameterValueException ex = new InvalidParameterValueException("Pod with specified podId" + podId + " doesn't belong to the zone with specified zoneId" + - dcId); + InvalidParameterValueException ex = + new InvalidParameterValueException("Pod with specified podId" + podId + " doesn't belong to the zone with specified zoneId" + dcId); ex.addProxyObject(pod.getUuid(), "podId"); ex.addProxyObject(zone.getUuid(), "dcId"); throw ex; @@ -667,8 +670,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } catch (Exception e) { cluster = _clusterDao.findBy(clusterName, podId); if (cluster == null) { - CloudRuntimeException ex = new CloudRuntimeException("Unable to create cluster " + clusterName + - " in pod with specified podId and data center with specified dcID", e); + CloudRuntimeException ex = + new CloudRuntimeException("Unable to create cluster " + clusterName + " in pod with specified podId and data center with specified dcID", e); ex.addProxyObject(pod.getUuid(), "podId"); ex.addProxyObject(zone.getUuid(), "dcId"); throw ex; @@ -796,19 +799,20 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (!isForced && host.getResourceState() != ResourceState.Maintenance) { throw new CloudRuntimeException("Host " + host.getUuid() + - " cannot be deleted as it is not in maintenance mode. Either put the host into maintenance or perform a forced deletion."); + " cannot be deleted as it is not in maintenance mode. Either put the host into maintenance or perform a forced deletion."); } // Get storage pool host mappings here because they can be removed as a // part of handleDisconnect later // TODO: find out the bad boy, what's a buggy logic! final List pools = _storagePoolHostDao.listByHostIdIncludingRemoved(hostId); - ResourceStateAdapter.DeleteHostAnswer answer = (ResourceStateAdapter.DeleteHostAnswer)dispatchToStateAdapters(ResourceStateAdapter.Event.DELETE_HOST, false, host, - new Boolean(isForced), new Boolean(isForceDeleteStorage)); + ResourceStateAdapter.DeleteHostAnswer answer = + (ResourceStateAdapter.DeleteHostAnswer)dispatchToStateAdapters(ResourceStateAdapter.Event.DELETE_HOST, false, host, new Boolean(isForced), new Boolean( + isForceDeleteStorage)); if (answer == null) { throw new CloudRuntimeException("No resource adapter respond to DELETE_HOST event for " + host.getName() + " id = " + hostId + ", hypervisorType is " + - host.getHypervisorType() + ", host type is " + host.getType()); + host.getHypervisorType() + ", host type is " + host.getType()); } if (answer.getIsException()) { @@ -1260,7 +1264,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId); Map hostDetails = _hostDetailsDao.findDetails(hostId); - if (guestOSCategory != null && !GuestOSCategoryVO.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())) { + if (guestOSCategory != null && !GuestOsCategory.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())) { // Save a new entry for guest.os.category.id hostDetails.put("guest.os.category.id", String.valueOf(guestOSCategory.getId())); } else { @@ -1421,8 +1425,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, break; } } else if (event == ResourceStateAdapter.Event.CREATE_HOST_VO_FOR_DIRECT_CONNECT) { - result = adapter.createHostVOForDirectConnectAgent((HostVO)args[0], (StartupCommand[])args[1], (ServerResource)args[2], (Map)args[3], - (List)args[4]); + result = + adapter.createHostVOForDirectConnectAgent((HostVO)args[0], (StartupCommand[])args[1], (ServerResource)args[2], (Map)args[3], + (List)args[4]); if (result != null && singleTaker) { break; } @@ -1459,9 +1464,10 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, String cidrSubnet = NetUtils.getCidrSubNet(cidrAddress, cidrSize); String serverSubnet = NetUtils.getSubNet(serverPrivateIP, serverPrivateNetmask); if (!cidrSubnet.equals(serverSubnet)) { - s_logger.warn("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + " and zone: " + dc.getName()); + s_logger.warn("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + " and zone: " + + dc.getName()); throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + - " and zone: " + dc.getName()); + " and zone: " + dc.getName()); } // If the server's private netmask is less inclusive than the pod's CIDR @@ -1471,7 +1477,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, long serverNetmaskNumeric = NetUtils.ip2Long(serverPrivateNetmask); if (serverNetmaskNumeric > cidrNetmaskNumeric) { throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + - " and zone: " + dc.getName()); + " and zone: " + dc.getName()); } } @@ -1503,7 +1509,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return true; } - protected HostVO createHostVO(StartupCommand[] cmds, ServerResource resource, Map details, List hostTags, ResourceStateAdapter.Event stateEvent) { + protected HostVO createHostVO(StartupCommand[] cmds, ServerResource resource, Map details, List hostTags, + ResourceStateAdapter.Event stateEvent) { StartupCommand startup = cmds[0]; HostVO host = findHostByGuid(startup.getGuid()); boolean isNew = false; @@ -1874,14 +1881,14 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, assert existingPrivateIPs.size() <= 1 : " How can we get more than one ip address with " + serverPrivateIP; if (existingPrivateIPs.size() > 1) { - throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is already in use in pod: " + pod.getName() + " and zone: " + - dc.getName()); + throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is already in use in pod: " + pod.getName() + + " and zone: " + dc.getName()); } if (existingPrivateIPs.size() == 1) { DataCenterIpAddressVO vo = existingPrivateIPs.get(0); if (vo.getInstanceId() != null) { throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is already in use in pod: " + pod.getName() + - " and zone: " + dc.getName()); + " and zone: " + dc.getName()); } } } @@ -1906,8 +1913,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, ClusterVO clusterVO = _clusterDao.findById(host.getClusterId()); if (clusterVO.getHypervisorType() != hyType) { - throw new IllegalArgumentException("Can't add host whose hypervisor type is: " + hyType + " into cluster: " + clusterVO.getId() + " whose hypervisor type is: " + - clusterVO.getHypervisorType()); + throw new IllegalArgumentException("Can't add host whose hypervisor type is: " + hyType + " into cluster: " + clusterVO.getId() + + " whose hypervisor type is: " + clusterVO.getHypervisorType()); } final Map hostDetails = ssCmd.getHostDetails(); @@ -1998,7 +2005,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } else { throw new UnableDeleteHostException("Unable to delete the host as there are vms in " + vms.get(0).getState() + - " state using this host and isForced=false specified"); + " state using this host and isForced=false specified"); } } } @@ -2235,7 +2242,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return resourceStateTransitTo(host, ResourceState.Event.UnableToMigrate, _nodeId); } catch (NoTransitionException e) { s_logger.debug("No next resource state for host " + host.getId() + " while current state is " + host.getResourceState() + " with event " + - ResourceState.Event.UnableToMigrate, e); + ResourceState.Event.UnableToMigrate, e); return false; } } @@ -2314,7 +2321,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId); } sc.and(sc.entity().getType(), Op.EQ, type); - sc.and(sc.entity().getResourceState(), Op.NIN, ResourceState.Maintenance, ResourceState.ErrorInMaintenance, ResourceState.PrepareForMaintenance, ResourceState.Error); + sc.and(sc.entity().getResourceState(), Op.NIN, ResourceState.Maintenance, ResourceState.ErrorInMaintenance, ResourceState.PrepareForMaintenance, + ResourceState.Error); return sc.list(); } diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index 779f6eab7f0..9b46627bf5e 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -17,6 +17,7 @@ package com.cloud.resourcelimit; import java.util.ArrayList; +import java.util.Arrays; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -29,14 +30,15 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.alert.AlertManager; import com.cloud.configuration.Config; @@ -67,12 +69,10 @@ import com.cloud.projects.dao.ProjectAccountDao; import com.cloud.projects.dao.ProjectDao; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; -import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; -import com.cloud.storage.dao.VMTemplateHostDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeDaoImpl.SumCount; import com.cloud.user.Account; @@ -90,12 +90,12 @@ import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; @@ -103,8 +103,6 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -import java.util.Arrays; - @Component @Local(value = {ResourceLimitService.class}) public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService { @@ -255,8 +253,9 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim long numToDecrement = (delta.length == 0) ? 1 : delta[0].longValue(); if (!updateResourceCountForAccount(accountId, type, false, numToDecrement)) { - _alertMgr.sendAlert(AlertManager.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, "Failed to decrement resource count of type " + type + " for account id=" + accountId, - "Failed to decrement resource count of type " + type + " for account id=" + accountId + "; use updateResourceCount API to recalculate/fix the problem"); + _alertMgr.sendAlert(AlertManager.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, "Failed to decrement resource count of type " + type + " for account id=" + + accountId, "Failed to decrement resource count of type " + type + " for account id=" + accountId + + "; use updateResourceCount API to recalculate/fix the problem"); } } @@ -390,11 +389,13 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim long accountLimit = findCorrectResourceLimitForAccount(account, type); long potentialCount = _resourceCountDao.getResourceCount(account.getId(), ResourceOwnerType.Account, type) + numResources; if (accountLimit != Resource.RESOURCE_UNLIMITED && potentialCount > accountLimit) { - String message = "Maximum number of resources of type '" + type + "' for account name=" + account.getAccountName() + " in domain id=" + account.getDomainId() + - " has been exceeded."; + String message = + "Maximum number of resources of type '" + type + "' for account name=" + account.getAccountName() + " in domain id=" + account.getDomainId() + + " has been exceeded."; if (projectFinal != null) { - message = "Maximum number of resources of type '" + type + "' for project name=" + projectFinal.getName() + " in domain id=" + account.getDomainId() + - " has been exceeded."; + message = + "Maximum number of resources of type '" + type + "' for project name=" + projectFinal.getName() + " in domain id=" + account.getDomainId() + + " has been exceeded."; } throw new ResourceAllocationException(message, type); } @@ -415,7 +416,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim if (domainLimit != null && domainLimit.getMax().longValue() != Resource.RESOURCE_UNLIMITED) { long domainCount = _resourceCountDao.getResourceCount(domainId, ResourceOwnerType.Domain, type); if ((domainCount + numResources) > domainLimit.getMax().longValue()) { - throw new ResourceAllocationException("Maximum number of resources of type '" + type + "' for domain id=" + domainId + " has been exceeded.", type); + throw new ResourceAllocationException("Maximum number of resources of type '" + type + "' for domain id=" + domainId + + " has been exceeded.", type); } } } @@ -524,7 +526,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), resourceType), accountId, ResourceOwnerType.Account)); } else { - limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), resourceType), domainId, ResourceOwnerType.Domain)); + limits.add(new ResourceLimitVO(resourceType, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), resourceType), domainId, + ResourceOwnerType.Domain)); } } else { limits.addAll(foundLimits); @@ -550,7 +553,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim if (accountLimitStr.size() < resourceTypes.length) { for (ResourceType rt : resourceTypes) { if (!accountLimitStr.contains(rt.toString()) && rt.supportsOwner(ResourceOwnerType.Account)) { - limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), rt), accountId, ResourceOwnerType.Account)); + limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForAccount(_accountMgr.getAccount(accountId), rt), accountId, + ResourceOwnerType.Account)); } } } @@ -559,7 +563,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim if (domainLimitStr.size() < resourceTypes.length) { for (ResourceType rt : resourceTypes) { if (!domainLimitStr.contains(rt.toString()) && rt.supportsOwner(ResourceOwnerType.Domain)) { - limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), rt), domainId, ResourceOwnerType.Domain)); + limits.add(new ResourceLimitVO(rt, findCorrectResourceLimitForDomain(_domainDao.findById(domainId), rt), domainId, + ResourceOwnerType.Domain)); } } } @@ -608,8 +613,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim } //only Unlimited value is accepted if account is Root Admin - if (_accountMgr.isRootAdmin(account.getType()) && max.shortValue() != ResourceLimit.RESOURCE_UNLIMITED) { - throw new InvalidParameterValueException("Only " + ResourceLimit.RESOURCE_UNLIMITED + " limit is supported for Root Admin accounts"); + if (_accountMgr.isRootAdmin(account.getType()) && max.shortValue() != Resource.RESOURCE_UNLIMITED) { + throw new InvalidParameterValueException("Only " + Resource.RESOURCE_UNLIMITED + " limit is supported for Root Admin accounts"); } if ((caller.getAccountId() == accountId.longValue()) && @@ -647,7 +652,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim long parentMaximum = findCorrectResourceLimitForDomain(parentDomain, resourceType); if ((parentMaximum >= 0) && (max.longValue() > parentMaximum)) { throw new InvalidParameterValueException("Domain " + domain.getName() + "(id: " + parentDomain.getId() + ") has maximum allowed resource limit " + - parentMaximum + " for " + resourceType + ", please specify a value less that or equal to " + parentMaximum); + parentMaximum + " for " + resourceType + ", please specify a value less that or equal to " + parentMaximum); } } ownerType = ResourceOwnerType.Domain; @@ -790,8 +795,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim _resourceCountDao.setResourceCount(domainId, ResourceOwnerType.Domain, type, newCount); if (oldCount != newCount) { - s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + " for domain ID " + - domainId + " is fixed during resource count recalculation."); + s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + + " for domain ID " + domainId + " is fixed during resource count recalculation."); } return newCount; @@ -851,7 +856,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim if (oldCount != newCount) { s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + - " for account ID " + accountId + " is fixed during resource count recalculation."); + " for account ID " + accountId + " is fixed during resource count recalculation."); } return newCount; @@ -951,7 +956,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim @Override protected void runInContext() { s_logger.info("Running resource count check periodic task"); - List domains = _domainDao.findImmediateChildrenForParent(DomainVO.ROOT_DOMAIN); + List domains = _domainDao.findImmediateChildrenForParent(Domain.ROOT_DOMAIN); // recalculateDomainResourceCount will take care of re-calculation of resource counts for sub-domains // and accounts of the sub-domains also. so just loop through immediate children of root domain @@ -964,7 +969,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim } // run through the accounts in the root domain - List accounts = _accountDao.findActiveAccountsForDomain(DomainVO.ROOT_DOMAIN); + List accounts = _accountDao.findActiveAccountsForDomain(Domain.ROOT_DOMAIN); for (AccountVO account : accounts) { for (ResourceType type : ResourceCount.ResourceType.values()) { if (type.supportsOwner(ResourceOwnerType.Account)) { diff --git a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java index 8eae8000ddf..ec2af2ae1cf 100755 --- a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java @@ -110,13 +110,13 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI } } - List alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, - State.Migrating, State.Starting); + List alreadyRunning = + _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, State.Starting); if (alreadyRunning.size() == 0) { s_logger.info("No running secondary storage vms found in datacenter id=" + dataCenterId + ", starting one"); - List stopped = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Stopped, - State.Stopping); + List stopped = + _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Stopped, State.Stopping); if (stopped.size() == 0 || !suspendAutoLoading) { List stopping = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, State.Stopping); if (stopping.size() > 0) { @@ -140,7 +140,7 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI List activeCmds = listActiveCommands(dataCenterId, cutTime); if (alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() < _standbyCapacity) { s_logger.info("secondary storage command execution standby capactiy low (running VMs: " + alreadyRunning.size() + ", active cmds: " + activeCmds.size() + - "), starting a new one"); + "), starting a new one"); return new Pair(AfterScanAction.expand, SecondaryStorageVm.Role.commandExecutor); } } diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 4beb4735d41..cfc95ca973e 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -42,14 +42,15 @@ import javax.crypto.SecretKey; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; + import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigDepotAdmin; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; import com.cloud.cluster.ClusterManager; import com.cloud.configuration.Config; @@ -455,8 +456,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } catch (SQLException ex) { } // insert system user - insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)" - + " VALUES (1, UUID(), 'system', RAND(), 1, 'system', 'cloud', now(), 1)"; + insertSql = + "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)" + + " VALUES (1, UUID(), 'system', RAND(), 1, 'system', 'cloud', now(), 1)"; txn = TransactionLegacy.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -472,7 +474,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio String lastname = "cloud"; // create an account for the admin user first - insertSql = "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, account.default) VALUES (" + id + ", UUID(), '" + username + "', '1', '1', 1)"; + insertSql = + "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, account.default) VALUES (" + id + ", UUID(), '" + username + "', '1', '1', 1)"; txn = TransactionLegacy.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -481,8 +484,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } // now insert the user - insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, state, user.default) " + "VALUES (" + id + ", UUID(), '" + - username + "', RAND(), 2, '" + firstname + "','" + lastname + "',now(), 'disabled', 1)"; + insertSql = + "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, state, user.default) " + "VALUES (" + id + + ", UUID(), '" + username + "', RAND(), 2, '" + firstname + "','" + lastname + "',now(), 'disabled', 1)"; txn = TransactionLegacy.currentTxn(); try { @@ -508,10 +512,12 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if (!rs.next()) { // save default security group if (tableName.equals("security_group")) { - insertSql = "INSERT INTO " + tableName + " (uuid, name, description, account_id, domain_id) " + "VALUES (UUID(), 'default', 'Default Security Group', 2, 1)"; + insertSql = + "INSERT INTO " + tableName + " (uuid, name, description, account_id, domain_id) " + "VALUES (UUID(), 'default', 'Default Security Group', 2, 1)"; } else { - insertSql = "INSERT INTO " + tableName + " (name, description, account_id, domain_id, account_name) " + - "VALUES ('default', 'Default Security Group', 2, 1, 'admin')"; + insertSql = + "INSERT INTO " + tableName + " (name, description, account_id, domain_id, account_name) " + + "VALUES ('default', 'Default Security Group', 2, 1, 'admin')"; } txn = TransactionLegacy.currentTxn(); @@ -606,8 +612,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio s_logger.info("Generated SSL keystore."); } String base64Keystore = getBase64Keystore(keystorePath); - ConfigurationVO configVO = new ConfigurationVO("Hidden", "DEFAULT", "management-server", "ssl.keystore", DBEncryptionUtil.encrypt(base64Keystore), - "SSL Keystore for the management servers"); + ConfigurationVO configVO = + new ConfigurationVO("Hidden", "DEFAULT", "management-server", "ssl.keystore", DBEncryptionUtil.encrypt(base64Keystore), + "SSL Keystore for the management servers"); _configDao.persist(configVO); s_logger.info("Stored SSL keystore to database."); } else if (keystoreFile.exists()) { // and dbExisted @@ -658,9 +665,10 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio TransactionLegacy txn = TransactionLegacy.currentTxn(); try { String rpassword = PasswordGenerator.generatePresharedKey(8); - String wSql = "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + - "VALUES ('Secure','DEFAULT', 'management-server','system.vm.password', '" + DBEncryptionUtil.encrypt(rpassword) + - "','randmon password generated each management server starts for system vm')"; + String wSql = + "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + + "VALUES ('Secure','DEFAULT', 'management-server','system.vm.password', '" + DBEncryptionUtil.encrypt(rpassword) + + "','randmon password generated each management server starts for system vm')"; PreparedStatement stmt = txn.prepareAutoCloseStatement(wSql); stmt.executeUpdate(wSql); s_logger.info("Updated systemvm password in database"); @@ -734,12 +742,14 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } String publicKey = new String(arr2).trim(); - String insertSql1 = "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + - "VALUES ('Hidden','DEFAULT', 'management-server','ssh.privatekey', '" + DBEncryptionUtil.encrypt(privateKey) + - "','Private key for the entire CloudStack')"; - String insertSql2 = "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + - "VALUES ('Hidden','DEFAULT', 'management-server','ssh.publickey', '" + DBEncryptionUtil.encrypt(publicKey) + - "','Public key for the entire CloudStack')"; + String insertSql1 = + "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + + "VALUES ('Hidden','DEFAULT', 'management-server','ssh.privatekey', '" + DBEncryptionUtil.encrypt(privateKey) + + "','Private key for the entire CloudStack')"; + String insertSql2 = + "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + + "VALUES ('Hidden','DEFAULT', 'management-server','ssh.publickey', '" + DBEncryptionUtil.encrypt(publicKey) + + "','Public key for the entire CloudStack')"; TransactionLegacy txn = TransactionLegacy.currentTxn(); try { @@ -871,9 +881,10 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio s_logger.info("Need to store secondary storage vm copy password in the database"); String password = PasswordGenerator.generateRandomPassword(12); - String insertSql1 = "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + - "VALUES ('Hidden','DEFAULT', 'management-server','secstorage.copy.password', '" + DBEncryptionUtil.encrypt(password) + - "','Password used to authenticate zone-to-zone template copy requests')"; + String insertSql1 = + "INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " + + "VALUES ('Hidden','DEFAULT', 'management-server','secstorage.copy.password', '" + DBEncryptionUtil.encrypt(password) + + "','Password used to authenticate zone-to-zone template copy requests')"; TransactionLegacy txn = TransactionLegacy.currentTxn(); try { @@ -903,7 +914,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } @DB - protected HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp) throws InternalErrorException { + protected HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp) + throws InternalErrorException { String[] cidrPair = cidr.split("\\/"); String cidrAddress = cidrPair[0]; int cidrSize = Integer.parseInt(cidrPair[1]); @@ -961,7 +973,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio return pod; } - private DiskOfferingVO createdefaultDiskOffering(Long domainId, String name, String description, int numGibibytes, String tags, boolean isCustomized, boolean isSystemUse) { + private DiskOfferingVO createdefaultDiskOffering(Long domainId, String name, String description, int numGibibytes, String tags, boolean isCustomized, + boolean isSystemUse) { long diskSize = numGibibytes; diskSize = diskSize * 1024 * 1024 * 1024; tags = cleanupTags(tags); @@ -973,10 +986,11 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio return newDiskOffering; } - private ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, - String tags) { + private ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, + boolean offerHA, String tags) { tags = cleanupTags(tags); - ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, offerHA, displayText, localStorageRequired, false, tags, false, null, false); + ServiceOfferingVO offering = + new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, offerHA, displayText, localStorageRequired, false, tags, false, null, false); offering.setUniqueName("Cloud.Com-" + name); offering = _serviceOfferingDao.persistSystemServiceOffering(offering); return offering; @@ -999,15 +1013,15 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio @DB protected void createDefaultNetworkOfferings() { - NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemPublicNetwork, TrafficType.Public, true); + NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPublicNetwork, TrafficType.Public, true); publicNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(publicNetworkOffering); - NetworkOfferingVO managementNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemManagementNetwork, TrafficType.Management, false); + NetworkOfferingVO managementNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemManagementNetwork, TrafficType.Management, false); managementNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(managementNetworkOffering); - NetworkOfferingVO controlNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemControlNetwork, TrafficType.Control, false); + NetworkOfferingVO controlNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemControlNetwork, TrafficType.Control, false); controlNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(controlNetworkOffering); - NetworkOfferingVO storageNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemStorageNetwork, TrafficType.Storage, true); + NetworkOfferingVO storageNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemStorageNetwork, TrafficType.Storage, true); storageNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(storageNetworkOffering); - NetworkOfferingVO privateGatewayNetworkOffering = new NetworkOfferingVO(NetworkOfferingVO.SystemPrivateGatewayNetworkOffering, GuestType.Isolated); + NetworkOfferingVO privateGatewayNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPrivateGatewayNetworkOffering, GuestType.Isolated); privateGatewayNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(privateGatewayNetworkOffering); //populate providers @@ -1050,83 +1064,88 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio @Override public void doInTransactionWithoutResult(TransactionStatus status) { // Offering #1 - NetworkOfferingVO defaultSharedSGNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, - "Offering for Shared Security group enabled networks", TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, Network.GuestType.Shared, - true, true, false, false, false); + NetworkOfferingVO defaultSharedSGNetworkOffering = + new NetworkOfferingVO(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "Offering for Shared Security group enabled networks", + TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, Network.GuestType.Shared, true, true, false, false, false); defaultSharedSGNetworkOffering.setState(NetworkOffering.State.Enabled); defaultSharedSGNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultSharedSGNetworkOffering); for (Service service : defaultSharedSGNetworkOfferingProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultSharedSGNetworkOffering.getId(), service, - defaultSharedSGNetworkOfferingProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultSharedSGNetworkOffering.getId(), service, defaultSharedSGNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #2 - NetworkOfferingVO defaultSharedNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", - TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, Network.GuestType.Shared, true, true, false, false, false); + NetworkOfferingVO defaultSharedNetworkOffering = + new NetworkOfferingVO(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, false, true, null, null, true, + Availability.Optional, null, Network.GuestType.Shared, true, true, false, false, false); defaultSharedNetworkOffering.setState(NetworkOffering.State.Enabled); defaultSharedNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultSharedNetworkOffering); for (Service service : defaultSharedNetworkOfferingProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultSharedNetworkOffering.getId(), service, - defaultSharedNetworkOfferingProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultSharedNetworkOffering.getId(), service, defaultSharedNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #3 - NetworkOfferingVO defaultIsolatedSourceNatEnabledNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService, - "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Required, null, - Network.GuestType.Isolated, true, false, false, false, true); + NetworkOfferingVO defaultIsolatedSourceNatEnabledNetworkOffering = + new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService, + "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Required, null, + Network.GuestType.Isolated, true, false, false, false, true); defaultIsolatedSourceNatEnabledNetworkOffering.setState(NetworkOffering.State.Enabled); defaultIsolatedSourceNatEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedSourceNatEnabledNetworkOffering); for (Service service : defaultIsolatedSourceNatEnabledNetworkOfferingProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultIsolatedSourceNatEnabledNetworkOffering.getId(), service, - defaultIsolatedSourceNatEnabledNetworkOfferingProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultIsolatedSourceNatEnabledNetworkOffering.getId(), service, + defaultIsolatedSourceNatEnabledNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #4 - NetworkOfferingVO defaultIsolatedEnabledNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOffering, - "Offering for Isolated networks with no Source Nat service", TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, - Network.GuestType.Isolated, true, true, false, false, false); + NetworkOfferingVO defaultIsolatedEnabledNetworkOffering = + new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service", TrafficType.Guest, + false, true, null, null, true, Availability.Optional, null, Network.GuestType.Isolated, true, true, false, false, false); defaultIsolatedEnabledNetworkOffering.setState(NetworkOffering.State.Enabled); defaultIsolatedEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedEnabledNetworkOffering); for (Service service : defaultIsolatedNetworkOfferingProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultIsolatedEnabledNetworkOffering.getId(), service, - defaultIsolatedNetworkOfferingProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultIsolatedEnabledNetworkOffering.getId(), service, defaultIsolatedNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #5 - NetworkOfferingVO defaultNetscalerNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultSharedEIPandELBNetworkOffering, - "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, - Network.GuestType.Shared, true, false, false, false, true, true, true, false, false, true, true, false, false); + NetworkOfferingVO defaultNetscalerNetworkOffering = + new NetworkOfferingVO(NetworkOffering.DefaultSharedEIPandELBNetworkOffering, + "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, false, true, null, null, true, + Availability.Optional, null, Network.GuestType.Shared, true, false, false, false, true, true, true, false, false, true, true, false, false); defaultNetscalerNetworkOffering.setState(NetworkOffering.State.Enabled); defaultNetscalerNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultNetscalerNetworkOffering); for (Service service : netscalerServiceProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetscalerNetworkOffering.getId(), service, - netscalerServiceProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultNetscalerNetworkOffering.getId(), service, netscalerServiceProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #6 - NetworkOfferingVO defaultNetworkOfferingForVpcNetworks = new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, - "Offering for Isolated Vpc networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Optional, null, - Network.GuestType.Isolated, false, false, false, false, true); + NetworkOfferingVO defaultNetworkOfferingForVpcNetworks = + new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, + "Offering for Isolated Vpc networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Optional, + null, Network.GuestType.Isolated, false, false, false, false, true); defaultNetworkOfferingForVpcNetworks.setState(NetworkOffering.State.Enabled); defaultNetworkOfferingForVpcNetworks = _networkOfferingDao.persistDefaultNetworkOffering(defaultNetworkOfferingForVpcNetworks); @@ -1144,16 +1163,17 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio defaultVpcNetworkOfferingProviders.put(Service.Vpn, Provider.VPCVirtualRouter); for (Service service : defaultVpcNetworkOfferingProviders.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworks.getId(), service, - defaultVpcNetworkOfferingProviders.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworks.getId(), service, defaultVpcNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } // Offering #7 - NetworkOfferingVO defaultNetworkOfferingForVpcNetworksNoLB = new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, - "Offering for Isolated Vpc networks with Source Nat service enabled and LB service Disabled", TrafficType.Guest, false, false, null, null, true, - Availability.Optional, null, Network.GuestType.Isolated, false, false, false, false, false); + NetworkOfferingVO defaultNetworkOfferingForVpcNetworksNoLB = + new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, + "Offering for Isolated Vpc networks with Source Nat service enabled and LB service Disabled", TrafficType.Guest, false, false, null, null, true, + Availability.Optional, null, Network.GuestType.Isolated, false, false, false, false, false); defaultNetworkOfferingForVpcNetworksNoLB.setState(NetworkOffering.State.Enabled); defaultNetworkOfferingForVpcNetworksNoLB = _networkOfferingDao.persistDefaultNetworkOffering(defaultNetworkOfferingForVpcNetworksNoLB); @@ -1170,16 +1190,17 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio defaultVpcNetworkOfferingProvidersNoLB.put(Service.Vpn, Provider.VPCVirtualRouter); for (Service service : defaultVpcNetworkOfferingProvidersNoLB.keySet()) { - NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworksNoLB.getId(), service, - defaultVpcNetworkOfferingProvidersNoLB.get(service)); + NetworkOfferingServiceMapVO offService = + new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworksNoLB.getId(), service, defaultVpcNetworkOfferingProvidersNoLB.get(service)); _ntwkOfferingServiceMapDao.persist(offService); s_logger.trace("Added service for the network offering: " + offService); } //offering #8 - network offering with internal lb service - NetworkOfferingVO internalLbOff = new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, - "Offering for Isolated Vpc networks with Internal LB support", TrafficType.Guest, false, false, null, null, true, Availability.Optional, null, - Network.GuestType.Isolated, false, false, false, true, false); + NetworkOfferingVO internalLbOff = + new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, + "Offering for Isolated Vpc networks with Internal LB support", TrafficType.Guest, false, false, null, null, true, Availability.Optional, null, + Network.GuestType.Isolated, false, false, false, true, false); internalLbOff.setState(NetworkOffering.State.Enabled); internalLbOff = _networkOfferingDao.persistDefaultNetworkOffering(internalLbOff); @@ -1253,8 +1274,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } if (broadcastDomainType != null) { - NetworkVO network = new NetworkVO(id, trafficType, mode, broadcastDomainType, networkOfferingId, domainId, accountId, related, null, null, networkDomain, - Network.GuestType.Shared, zoneId, null, null, specifyIpRanges, null); + NetworkVO network = + new NetworkVO(id, trafficType, mode, broadcastDomainType, networkOfferingId, domainId, accountId, related, null, null, networkDomain, + Network.GuestType.Shared, zoneId, null, null, specifyIpRanges, null); network.setGuruName(guruNames.get(network.getTrafficType())); network.setDns1(zone.getDns1()); network.setDns2(zone.getDns2()); diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 42fb4ed4964..d34da4f07a4 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1032,8 +1032,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe Object resourceState = cmd.getResourceState(); Object haHosts = cmd.getHaHost(); - Pair, Integer> result = searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, state, zoneId, pod, cluster, id, keyword, resourceState, - haHosts, null, null); + Pair, Integer> result = + searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, state, zoneId, pod, cluster, id, keyword, resourceState, haHosts, null, null); return new Pair, Integer>(result.first(), result.second()); } @@ -1087,7 +1087,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe boolean canMigrateWithStorage = false; if (vm.getType() == VirtualMachine.Type.User) { - HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); + HypervisorCapabilitiesVO capabilities = + _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); if (capabilities != null) { canMigrateWithStorage = capabilities.isStorageMotionSupported(); } @@ -1117,8 +1118,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe DataCenterDeployment plan = null; boolean zoneWideStoragePool = false; if (canMigrateWithStorage) { - allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), null, null, null, null, null, null, srcHost.getHypervisorType(), - srcHost.getHypervisorVersion()); + allHostsPair = + searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), null, null, null, null, null, null, srcHost.getHypervisorType(), + srcHost.getHypervisorVersion()); allHosts = allHostsPair.first(); allHosts.remove(srcHost); @@ -1812,8 +1814,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe throw new PermissionDeniedException("Parameter isrouting can only be specified by a Root Admin, permission denied"); } } - boolean updateNeeded = !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null && - isDynamicallyScalable == null && isRoutingTemplate == null); + boolean updateNeeded = + !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null && + isDynamicallyScalable == null && isRoutingTemplate == null); if (!updateNeeded) { return template; } @@ -1908,10 +1911,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe if (isAllocated) { Account caller = CallContext.current().getCallingAccount(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); - _accountMgr.buildACLSearchParameters(caller, cmd.getId(), cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), - false); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); + _accountMgr.buildACLSearchParameters(caller, cmd.getId(), cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, + cmd.listAll(), false); domainId = domainIdRecursiveListProject.first(); isRecursive = domainIdRecursiveListProject.second(); listProjectResourcesCriteria = domainIdRecursiveListProject.third(); @@ -2091,7 +2094,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe return _consoleProxyMgr.startProxy(instanceId); } - private ConsoleProxyVO stopConsoleProxy(VMInstanceVO systemVm, boolean isForced) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException { + private ConsoleProxyVO stopConsoleProxy(VMInstanceVO systemVm, boolean isForced) throws ResourceUnavailableException, OperationTimedoutException, + ConcurrentOperationException { _itMgr.advanceStop(systemVm.getUuid(), isForced); return _consoleProxyDao.findById(systemVm.getId()); @@ -2175,8 +2179,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe boolean sameDomain = (domains.size() == 1 && domains.get(0).getId() == domainId); if (!domains.isEmpty() && !sameDomain) { - InvalidParameterValueException ex = new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + - "' since it already exists in the system"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + "' since it already exists in the system"); ex.addProxyObject(domain.getUuid(), "domainId"); throw ex; } @@ -2187,7 +2191,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -2298,17 +2302,20 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe List summedCapacities = new ArrayList(); if (zoneId == null && podId == null) {// Group by Zone, capacity type - List summedCapacitiesAtZone = _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 1, cmd.getPageSizeVal()); + List summedCapacitiesAtZone = + _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 1, cmd.getPageSizeVal()); if (summedCapacitiesAtZone != null) { summedCapacities.addAll(summedCapacitiesAtZone); } } else if (podId == null) {// Group by Pod, capacity type - List summedCapacitiesAtPod = _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 2, cmd.getPageSizeVal()); + List summedCapacitiesAtPod = + _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 2, cmd.getPageSizeVal()); if (summedCapacitiesAtPod != null) { summedCapacities.addAll(summedCapacitiesAtPod); } } else { // Group by Cluster, capacity type - List summedCapacitiesAtCluster = _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 3, cmd.getPageSizeVal()); + List summedCapacitiesAtCluster = + _capacityDao.listCapacitiesGroupedByLevelAndType(capacityType, zoneId, podId, clusterId, 3, cmd.getPageSizeVal()); if (summedCapacitiesAtCluster != null) { summedCapacities.addAll(summedCapacitiesAtCluster); } @@ -2343,8 +2350,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe summedCapacities = summedCapacities.subList(0, summedCapacities.size() < cmd.getPageSizeVal() ? summedCapacities.size() : pageSize); for (SummedCapacity summedCapacity : summedCapacities) { - CapacityVO capacity = new CapacityVO(summedCapacity.getDataCenterId(), summedCapacity.getPodId(), summedCapacity.getClusterId(), summedCapacity.getCapacityType(), - summedCapacity.getPercentUsed()); + CapacityVO capacity = + new CapacityVO(summedCapacity.getDataCenterId(), summedCapacity.getPodId(), summedCapacity.getClusterId(), summedCapacity.getCapacityType(), + summedCapacity.getPercentUsed()); capacity.setUsedCapacity(summedCapacity.getUsedCapacity() + summedCapacity.getReservedCapacity()); capacity.setTotalCapacity(summedCapacity.getTotalCapacity()); capacities.add(capacity); @@ -2366,8 +2374,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } else { capacity.setUsedPercentage(0); } - SummedCapacity summedCapacity = new SummedCapacity(capacity.getUsedCapacity(), capacity.getTotalCapacity(), capacity.getUsedPercentage(), - capacity.getCapacityType(), capacity.getDataCenterId(), capacity.getPodId(), capacity.getClusterId()); + SummedCapacity summedCapacity = + new SummedCapacity(capacity.getUsedCapacity(), capacity.getTotalCapacity(), capacity.getUsedPercentage(), capacity.getCapacityType(), + capacity.getDataCenterId(), capacity.getPodId(), capacity.getClusterId()); list.add(summedCapacity); } else { List dcList = _dcDao.listEnabledZones(); @@ -2378,8 +2387,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } else { capacity.setUsedPercentage(0); } - SummedCapacity summedCapacity = new SummedCapacity(capacity.getUsedCapacity(), capacity.getTotalCapacity(), capacity.getUsedPercentage(), - capacity.getCapacityType(), capacity.getDataCenterId(), capacity.getPodId(), capacity.getClusterId()); + SummedCapacity summedCapacity = + new SummedCapacity(capacity.getUsedCapacity(), capacity.getTotalCapacity(), capacity.getUsedPercentage(), capacity.getCapacityType(), + capacity.getDataCenterId(), capacity.getPodId(), capacity.getClusterId()); list.add(summedCapacity); }// End of for } @@ -2406,8 +2416,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe List capacities = new ArrayList(); for (SummedCapacity summedCapacity : summedCapacities) { - CapacityVO capacity = new CapacityVO(null, summedCapacity.getDataCenterId(), podId, clusterId, summedCapacity.getUsedCapacity() + summedCapacity.getReservedCapacity(), - summedCapacity.getTotalCapacity(), summedCapacity.getCapacityType()); + CapacityVO capacity = + new CapacityVO(null, summedCapacity.getDataCenterId(), podId, clusterId, summedCapacity.getUsedCapacity() + summedCapacity.getReservedCapacity(), + summedCapacity.getTotalCapacity(), summedCapacity.getCapacityType()); capacities.add(capacity); } @@ -2451,7 +2462,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } public static boolean isAdmin(short accountType) { - return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); } @Override @@ -3416,7 +3428,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe // although we may have race conditioning here, database transaction serialization should // give us the same key if (_hashKey == null) { - _hashKey = _configDao.getValueAndInitIfNotExist(Config.HashKey.key(), Config.HashKey.getCategory(), getBase64EncodedRandomKey(128), Config.HashKey.getDescription()); + _hashKey = + _configDao.getValueAndInitIfNotExist(Config.HashKey.key(), Config.HashKey.getCategory(), getBase64EncodedRandomKey(128), Config.HashKey.getDescription()); } return _hashKey; } @@ -3424,8 +3437,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Override public String getEncryptionKey() { if (_encryptionKey == null) { - _encryptionKey = _configDao.getValueAndInitIfNotExist(Config.EncryptionKey.key(), Config.EncryptionKey.getCategory(), getBase64EncodedRandomKey(128), - Config.EncryptionKey.getDescription()); + _encryptionKey = + _configDao.getValueAndInitIfNotExist(Config.EncryptionKey.key(), Config.EncryptionKey.getCategory(), getBase64EncodedRandomKey(128), + Config.EncryptionKey.getDescription()); } return _encryptionKey; } @@ -3433,8 +3447,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Override public String getEncryptionIV() { if (_encryptionIV == null) { - _encryptionIV = _configDao.getValueAndInitIfNotExist(Config.EncryptionIV.key(), Config.EncryptionIV.getCategory(), getBase64EncodedRandomKey(128), - Config.EncryptionIV.getDescription()); + _encryptionIV = + _configDao.getValueAndInitIfNotExist(Config.EncryptionIV.key(), Config.EncryptionIV.getCategory(), getBase64EncodedRandomKey(128), + Config.EncryptionIV.getDescription()); } return _encryptionIV; } @@ -3505,8 +3520,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe SSHKeyPairVO s = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName()); if (s == null) { - InvalidParameterValueException ex = new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' does not exist for account " + - owner.getAccountName() + " in specified domain id"); + InvalidParameterValueException ex = + new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' does not exist for account " + owner.getAccountName() + + " in specified domain id"); DomainVO domain = ApiDBUtils.findDomainById(owner.getDomainId()); String domainUuid = String.valueOf(owner.getDomainId()); if (domain != null) { @@ -3527,9 +3543,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); - _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); + _accountMgr.buildACLSearchParameters(caller, null, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), + false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third(); @@ -3608,9 +3625,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe _userVmDao.loadDetails(vm); String password = vm.getDetail("Encrypted.Password"); if (password == null || password.equals("")) { - InvalidParameterValueException ex = new InvalidParameterValueException( - "No password for VM with specified id found. " - + "If VM is created from password enabled template and SSH keypair is assigned to VM then only password can be retrieved."); + InvalidParameterValueException ex = + new InvalidParameterValueException("No password for VM with specified id found. " + + "If VM is created from password enabled template and SSH keypair is assigned to VM then only password can be retrieved."); ex.addProxyObject(vm.getUuid(), "vmId"); throw ex; } diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index bb4d0af4e20..470c37d6d1e 100755 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,6 +31,9 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; @@ -39,27 +41,17 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; -import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import com.cloud.resource.ResourceManager; - -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; -import com.cloud.agent.api.Command.OnError; -import com.cloud.agent.api.GetFileStatsCommand; import com.cloud.agent.api.GetStorageStatsCommand; import com.cloud.agent.api.HostStatsEntry; import com.cloud.agent.api.VmDiskStatsEntry; import com.cloud.agent.api.VmStatsEntry; -import com.cloud.agent.manager.Commands; import com.cloud.cluster.ManagementServerHostVO; import com.cloud.cluster.dao.ManagementServerHostDao; -import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; import com.cloud.host.HostStats; @@ -67,9 +59,9 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceState; import com.cloud.storage.StorageManager; -import com.cloud.storage.StoragePoolHostVO; import com.cloud.storage.StorageStats; import com.cloud.storage.VolumeStats; import com.cloud.storage.VolumeVO; @@ -90,8 +82,8 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.net.MacAddress; import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmVO; -import com.cloud.vm.VmStats; import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VmStats; import com.cloud.vm.dao.UserVmDao; /** @@ -413,7 +405,8 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc public void doInTransactionWithoutResult(TransactionStatus status) { SearchCriteria sc = _hostDao.createSearchCriteria(); sc.addAnd("status", SearchCriteria.Op.EQ, Status.Up.toString()); - sc.addAnd("resourceState", SearchCriteria.Op.NIN, ResourceState.Maintenance, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance); + sc.addAnd("resourceState", SearchCriteria.Op.NIN, ResourceState.Maintenance, ResourceState.PrepareForMaintenance, + ResourceState.ErrorInMaintenance); sc.addAnd("type", SearchCriteria.Op.EQ, Host.Type.Routing.toString()); sc.addAnd("hypervisorType", SearchCriteria.Op.EQ, HypervisorType.KVM); // support KVM only util 2013.06.25 List hosts = _hostDao.search(sc, null); @@ -441,44 +434,46 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc SearchCriteria sc_volume = _volsDao.createSearchCriteria(); sc_volume.addAnd("path", SearchCriteria.Op.EQ, vmDiskStat.getPath()); VolumeVO volume = _volsDao.search(sc_volume, null).get(0); - VmDiskStatisticsVO previousVmDiskStats = _vmDiskStatsDao.findBy(userVm.getAccountId(), userVm.getDataCenterId(), vmId, volume.getId()); + VmDiskStatisticsVO previousVmDiskStats = + _vmDiskStatsDao.findBy(userVm.getAccountId(), userVm.getDataCenterId(), vmId, volume.getId()); VmDiskStatisticsVO vmDiskStat_lock = _vmDiskStatsDao.lock(userVm.getAccountId(), userVm.getDataCenterId(), vmId, volume.getId()); - if ((vmDiskStat.getBytesRead() == 0) && (vmDiskStat.getBytesWrite() == 0) && (vmDiskStat.getIORead() == 0) && (vmDiskStat.getIOWrite() == 0)) { + if ((vmDiskStat.getBytesRead() == 0) && (vmDiskStat.getBytesWrite() == 0) && (vmDiskStat.getIORead() == 0) && + (vmDiskStat.getIOWrite() == 0)) { s_logger.debug("IO/bytes read and write are all 0. Not updating vm_disk_statistics"); continue; } if (vmDiskStat_lock == null) { s_logger.warn("unable to find vm disk stats from host for account: " + userVm.getAccountId() + " with vmId: " + userVm.getId() + - " and volumeId:" + volume.getId()); + " and volumeId:" + volume.getId()); continue; } if (previousVmDiskStats != null && ((previousVmDiskStats.getCurrentBytesRead() != vmDiskStat_lock.getCurrentBytesRead()) || - (previousVmDiskStats.getCurrentBytesWrite() != vmDiskStat_lock.getCurrentBytesWrite()) || - (previousVmDiskStats.getCurrentIORead() != vmDiskStat_lock.getCurrentIORead()) || (previousVmDiskStats.getCurrentIOWrite() != vmDiskStat_lock.getCurrentIOWrite()))) { - s_logger.debug("vm disk stats changed from the time GetVmDiskStatsCommand was sent. " + "Ignoring current answer. Host: " + host.getName() + - " . VM: " + vmDiskStat.getVmName() + " Read(Bytes): " + vmDiskStat.getBytesRead() + " write(Bytes): " + - vmDiskStat.getBytesWrite() + " Read(IO): " + vmDiskStat.getIORead() + " write(IO): " + vmDiskStat.getIOWrite()); + (previousVmDiskStats.getCurrentBytesWrite() != vmDiskStat_lock.getCurrentBytesWrite()) || + (previousVmDiskStats.getCurrentIORead() != vmDiskStat_lock.getCurrentIORead()) || (previousVmDiskStats.getCurrentIOWrite() != vmDiskStat_lock.getCurrentIOWrite()))) { + s_logger.debug("vm disk stats changed from the time GetVmDiskStatsCommand was sent. " + "Ignoring current answer. Host: " + + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Read(Bytes): " + vmDiskStat.getBytesRead() + " write(Bytes): " + + vmDiskStat.getBytesWrite() + " Read(IO): " + vmDiskStat.getIORead() + " write(IO): " + vmDiskStat.getIOWrite()); continue; } if (vmDiskStat_lock.getCurrentBytesRead() > vmDiskStat.getBytesRead()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Read # of bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + - host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesRead() + " Stored: " + - vmDiskStat_lock.getCurrentBytesRead()); + s_logger.debug("Read # of bytes that's less than the last one. " + + "Assuming something went wrong and persisting it. Host: " + host.getName() + " . VM: " + vmDiskStat.getVmName() + + " Reported: " + vmDiskStat.getBytesRead() + " Stored: " + vmDiskStat_lock.getCurrentBytesRead()); } vmDiskStat_lock.setNetBytesRead(vmDiskStat_lock.getNetBytesRead() + vmDiskStat_lock.getCurrentBytesRead()); } vmDiskStat_lock.setCurrentBytesRead(vmDiskStat.getBytesRead()); if (vmDiskStat_lock.getCurrentBytesWrite() > vmDiskStat.getBytesWrite()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Write # of bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + - host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesWrite() + " Stored: " + - vmDiskStat_lock.getCurrentBytesWrite()); + s_logger.debug("Write # of bytes that's less than the last one. " + + "Assuming something went wrong and persisting it. Host: " + host.getName() + " . VM: " + vmDiskStat.getVmName() + + " Reported: " + vmDiskStat.getBytesWrite() + " Stored: " + vmDiskStat_lock.getCurrentBytesWrite()); } vmDiskStat_lock.setNetBytesWrite(vmDiskStat_lock.getNetBytesWrite() + vmDiskStat_lock.getCurrentBytesWrite()); } @@ -486,8 +481,8 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc if (vmDiskStat_lock.getCurrentIORead() > vmDiskStat.getIORead()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Read # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + - host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIORead() + " Stored: " + - vmDiskStat_lock.getCurrentIORead()); + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIORead() + " Stored: " + + vmDiskStat_lock.getCurrentIORead()); } vmDiskStat_lock.setNetIORead(vmDiskStat_lock.getNetIORead() + vmDiskStat_lock.getCurrentIORead()); } @@ -495,8 +490,8 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc if (vmDiskStat_lock.getCurrentIOWrite() > vmDiskStat.getIOWrite()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Write # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + - host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIOWrite() + " Stored: " + - vmDiskStat_lock.getCurrentIOWrite()); + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIOWrite() + " Stored: " + + vmDiskStat_lock.getCurrentIOWrite()); } vmDiskStat_lock.setNetIOWrite(vmDiskStat_lock.getNetIOWrite() + vmDiskStat_lock.getCurrentIOWrite()); } @@ -547,7 +542,8 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc Answer answer = ssAhost.sendMessage(command); if (answer != null && answer.getResult()) { storageStats.put(storeId, (StorageStats)answer); - s_logger.trace("HostId: " + storeId + " Used: " + ((StorageStats)answer).getByteUsed() + " Total Available: " + ((StorageStats)answer).getCapacityBytes()); + s_logger.trace("HostId: " + storeId + " Used: " + ((StorageStats)answer).getByteUsed() + " Total Available: " + + ((StorageStats)answer).getCapacityBytes()); } } _storageStats = storageStats; diff --git a/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java b/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java index 3a5ef80bc2d..b8f0a445200 100644 --- a/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java +++ b/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response; -import org.apache.cloudstack.api.BaseResponse; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; + +import com.cloud.serializer.Param; + public class BaremetalTemplateResponse extends BaseResponse { @SerializedName("id") @Param(description = "the template ID") diff --git a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java index d9edf5b498d..fa689fdde4e 100644 --- a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java +++ b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java @@ -16,11 +16,13 @@ // under the License. package com.cloud.server.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.response.NetworkDeviceResponse; +import com.cloud.serializer.Param; + public class NwDeviceDhcpResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ZONE_ID) @Param(description = "Zone where to add PXE server") diff --git a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java index de46212263a..48501368321 100644 --- a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java +++ b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java @@ -16,11 +16,13 @@ // under the License. package com.cloud.server.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; + +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.response.NetworkDeviceResponse; +import com.cloud.serializer.Param; + public class NwDevicePxeServerResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ZONE_ID) diff --git a/server/src/com/cloud/server/api/response/PxePingResponse.java b/server/src/com/cloud/server/api/response/PxePingResponse.java index f8276b80b7c..34bc522a9c7 100644 --- a/server/src/com/cloud/server/api/response/PxePingResponse.java +++ b/server/src/com/cloud/server/api/response/PxePingResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response; -import org.apache.cloudstack.api.ApiConstants; -import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.ApiConstants; + +import com.cloud.serializer.Param; + public class PxePingResponse extends NwDevicePxeServerResponse { @SerializedName(ApiConstants.PING_STORAGE_SERVER_IP) @Param(description = "IP of PING storage server") diff --git a/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java index df1812bbfa1..254dc184c69 100644 --- a/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response.netapp; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; + import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class AssociateLunCmdResponse extends BaseResponse { diff --git a/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java index ad6529dfa3c..06be87bd24c 100644 --- a/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response.netapp; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; + import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class CreateLunCmdResponse extends BaseResponse { diff --git a/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java index 6cf2932e5f8..480d5cc47c3 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response.netapp; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; + import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ListLunsCmdResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java index 7f82a6cde7c..5167260cce5 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response.netapp; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; + import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ListVolumePoolsCmdResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java index e8b13910eb4..1a1b6074b96 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java @@ -16,10 +16,12 @@ // under the License. package com.cloud.server.api.response.netapp; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; + import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; public class ListVolumesOnFilerCmdResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/server/src/com/cloud/servlet/CloudStartupServlet.java b/server/src/com/cloud/servlet/CloudStartupServlet.java index 0afe1104392..5840f3d8c84 100755 --- a/server/src/com/cloud/servlet/CloudStartupServlet.java +++ b/server/src/com/cloud/servlet/CloudStartupServlet.java @@ -29,7 +29,6 @@ import org.springframework.web.context.support.SpringBeanAutowiringSupport; import com.cloud.utils.LogUtils; import com.cloud.utils.SerialVersionUID; import com.cloud.utils.component.ComponentContext; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class CloudStartupServlet extends HttpServlet { diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java index 0a7f8fea000..06e542d110e 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java @@ -56,7 +56,6 @@ import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; import com.cloud.utils.db.EntityManager; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineManager; @@ -479,13 +478,13 @@ public class ConsoleProxyServlet extends HttpServlet { } catch (PermissionDeniedException ex) { if (accountObj.getType() == Account.ACCOUNT_TYPE_NORMAL) { if (s_logger.isDebugEnabled()) { - s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() + " does not match the account id in session " + accountObj.getId() + - " and caller is a normal user"); + s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() + " does not match the account id in session " + + accountObj.getId() + " and caller is a normal user"); } } else if (accountObj.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN || accountObj.getType() == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN) { if (s_logger.isDebugEnabled()) { - s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() + " does not match the account id in session " + accountObj.getId() + - " and the domain-admin caller does not manage the target domain"); + s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() + " does not match the account id in session " + + accountObj.getId() + " and the domain-admin caller does not manage the target domain"); } } return false; @@ -590,7 +589,7 @@ public class ConsoleProxyServlet extends HttpServlet { if (!user.getState().equals(Account.State.enabled) || !account.getState().equals(Account.State.enabled)) { s_logger.debug("disabled or locked user accessing the api, userid = " + user.getId() + "; name = " + user.getUsername() + "; state: " + user.getState() + - "; accountState: " + account.getState()); + "; accountState: " + account.getState()); return false; } diff --git a/server/src/com/cloud/storage/LocalStoragePoolListener.java b/server/src/com/cloud/storage/LocalStoragePoolListener.java index e00720967f3..a66515ebdc9 100755 --- a/server/src/com/cloud/storage/LocalStoragePoolListener.java +++ b/server/src/com/cloud/storage/LocalStoragePoolListener.java @@ -18,9 +18,10 @@ package com.cloud.storage; import javax.inject.Inject; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.log4j.Logger; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; + import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.AgentControlCommand; diff --git a/server/src/com/cloud/storage/OCFS2Manager.java b/server/src/com/cloud/storage/OCFS2Manager.java index 1a7b57eefd8..1577ccdec1d 100755 --- a/server/src/com/cloud/storage/OCFS2Manager.java +++ b/server/src/com/cloud/storage/OCFS2Manager.java @@ -17,7 +17,6 @@ package com.cloud.storage; import java.util.List; -import java.util.Map; import com.cloud.host.HostVO; import com.cloud.utils.component.Manager; diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java index ea3efe3197a..017ce7fac83 100755 --- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java +++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java @@ -181,8 +181,9 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou @Override public void processDeletHostEventAfter(Host host) { - String errMsg = String.format("Prepare OCFS2 nodes failed after delete host %1$s (zone:%2$s, pod:%3$s, cluster:%4$s", host.getId(), host.getDataCenterId(), - host.getPodId(), host.getClusterId()); + String errMsg = + String.format("Prepare OCFS2 nodes failed after delete host %1$s (zone:%2$s, pod:%3$s, cluster:%4$s", host.getId(), host.getDataCenterId(), host.getPodId(), + host.getClusterId()); if (host.getHypervisorType() != HypervisorType.Ovm) { return; diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 1f070100afa..7a7f6b7dc75 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -451,7 +451,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C String time = configs.get("storage.cleanup.interval"); _storageCleanupInterval = NumbersUtil.parseInt(time, 86400); - s_logger.info("Storage cleanup enabled: " + _storageCleanupEnabled + ", interval: " + _storageCleanupInterval + ", template cleanup enabled: " + _templateCleanupEnabled); + s_logger.info("Storage cleanup enabled: " + _storageCleanupEnabled + ", interval: " + _storageCleanupInterval + ", template cleanup enabled: " + + _templateCleanupEnabled); String workers = configs.get("expunge.workers"); int wrks = NumbersUtil.parseInt(workers, 10); @@ -569,7 +570,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } @Override - public PrimaryDataStoreInfo createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException, UnknownHostException, ResourceUnavailableException { + public PrimaryDataStoreInfo createPool(CreateStoragePoolCmd cmd) throws ResourceInUseException, IllegalArgumentException, UnknownHostException, + ResourceUnavailableException { String providerName = cmd.getStorageProviderName(); DataStoreProvider storeProvider = dataStoreProviderMgr.getDataStoreProvider(providerName); @@ -725,7 +727,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C String existingValueToKeep = existingDetailsToKeep.get(existingKeyToKeep); if (details.containsKey(existingKeyToKeep)) { - throw new CloudRuntimeException("Storage tag '" + existingKeyToKeep + "' conflicts with a stored property of this primary storage. No changes were made."); + throw new CloudRuntimeException("Storage tag '" + existingKeyToKeep + + "' conflicts with a stored property of this primary storage. No changes were made."); } details.put(existingKeyToKeep, existingValueToKeep); @@ -873,8 +876,9 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } if (capacities.size() == 0) { - CapacityVO capacity = new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, - totalOverProvCapacity, capacityType); + CapacityVO capacity = + new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, totalOverProvCapacity, + capacityType); if (storagePool.getScope() == ScopeType.ZONE) { DataCenterVO dc = ApiDBUtils.findZoneById(storagePool.getDataCenterId()); @@ -907,8 +911,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C _capacityDao.update(capacity.getId(), capacity); } } - s_logger.debug("Successfully set Capacity - " + totalOverProvCapacity + " for capacity type - " + capacityType + " , DataCenterId - " + storagePool.getDataCenterId() + - ", HostOrPoolId - " + storagePool.getId() + ", PodId " + storagePool.getPodId()); + s_logger.debug("Successfully set Capacity - " + totalOverProvCapacity + " for capacity type - " + capacityType + " , DataCenterId - " + + storagePool.getDataCenterId() + ", HostOrPoolId - " + storagePool.getId() + ", PodId " + storagePool.getPodId()); } @Override @@ -936,7 +940,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C hostIds.removeAll(hostIdsToAvoid); } if (hostIds == null || hostIds.isEmpty()) { - throw new StorageUnavailableException("Unable to send command to the pool " + pool.getId() + " due to there is no enabled hosts up in this cluster", pool.getId()); + throw new StorageUnavailableException("Unable to send command to the pool " + pool.getId() + " due to there is no enabled hosts up in this cluster", + pool.getId()); } for (Long hostId : hostIds) { try { @@ -979,18 +984,20 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { List unusedTemplatesInPool = _tmpltMgr.getUnusedTemplatesInPool(pool); - s_logger.debug("Storage pool garbage collector found " + unusedTemplatesInPool.size() + " templates to clean up in storage pool: " + pool.getName()); + s_logger.debug("Storage pool garbage collector found " + unusedTemplatesInPool.size() + " templates to clean up in storage pool: " + + pool.getName()); for (VMTemplateStoragePoolVO templatePoolVO : unusedTemplatesInPool) { if (templatePoolVO.getDownloadState() != VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { s_logger.debug("Storage pool garbage collector is skipping templatePoolVO with ID: " + templatePoolVO.getId() + - " because it is not completely downloaded."); + " because it is not completely downloaded."); continue; } if (!templatePoolVO.getMarkedForGC()) { templatePoolVO.setMarkedForGC(true); _vmTemplatePoolDao.update(templatePoolVO.getId(), templatePoolVO); - s_logger.debug("Storage pool garbage collector has marked templatePoolVO with ID: " + templatePoolVO.getId() + " for garbage collection."); + s_logger.debug("Storage pool garbage collector has marked templatePoolVO with ID: " + templatePoolVO.getId() + + " for garbage collection."); continue; } @@ -1092,8 +1099,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { long storeId = store.getId(); List destroyedTemplateStoreVOs = _templateStoreDao.listDestroyed(storeId); - s_logger.debug("Secondary storage garbage collector found " + destroyedTemplateStoreVOs.size() + " templates to cleanup on template_store_ref for store: " + - store.getName()); + s_logger.debug("Secondary storage garbage collector found " + destroyedTemplateStoreVOs.size() + + " templates to cleanup on template_store_ref for store: " + store.getName()); for (TemplateDataStoreVO destroyedTemplateStoreVO : destroyedTemplateStoreVOs) { if (s_logger.isDebugEnabled()) { s_logger.debug("Deleting template store DB entry: " + destroyedTemplateStoreVO); @@ -1109,8 +1116,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C for (DataStore store : imageStores) { try { List destroyedSnapshotStoreVOs = _snapshotStoreDao.listDestroyed(store.getId()); - s_logger.debug("Secondary storage garbage collector found " + destroyedSnapshotStoreVOs.size() + " snapshots to cleanup on snapshot_store_ref for store: " + - store.getName()); + s_logger.debug("Secondary storage garbage collector found " + destroyedSnapshotStoreVOs.size() + + " snapshots to cleanup on snapshot_store_ref for store: " + store.getName()); for (SnapshotDataStoreVO destroyedSnapshotStoreVO : destroyedSnapshotStoreVOs) { // check if this snapshot has child SnapshotInfo snap = snapshotFactory.getSnapshot(destroyedSnapshotStoreVO.getSnapshotId(), store); @@ -1138,7 +1145,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { List destroyedStoreVOs = _volumeStoreDao.listDestroyed(store.getId()); s_logger.debug("Secondary storage garbage collector found " + destroyedStoreVOs.size() + " volumes to cleanup on volume_store_ref for store: " + - store.getName()); + store.getName()); for (VolumeDataStoreVO destroyedStoreVO : destroyedStoreVOs) { if (s_logger.isDebugEnabled()) { s_logger.debug("Deleting volume store DB entry: " + destroyedStoreVO); @@ -1181,7 +1188,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C if (!primaryStorage.getStatus().equals(StoragePoolStatus.Up) && !primaryStorage.getStatus().equals(StoragePoolStatus.ErrorInMaintenance)) { throw new InvalidParameterValueException("Primary storage with id " + primaryStorageId + " is not ready for migration, as the status is:" + - primaryStorage.getStatus().toString()); + primaryStorage.getStatus().toString()); } DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider(primaryStorage.getStorageProviderName()); @@ -1208,7 +1215,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C if (primaryStorage.getStatus().equals(StoragePoolStatus.Up) || primaryStorage.getStatus().equals(StoragePoolStatus.PrepareForMaintenance)) { throw new StorageUnavailableException("Primary storage with id " + primaryStorageId + " is not ready to complete migration, as the status is:" + - primaryStorage.getStatus().toString(), primaryStorageId); + primaryStorage.getStatus().toString(), primaryStorageId); } DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider(primaryStorage.getStorageProviderName()); @@ -1313,7 +1320,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } } - CapacityVO capacity = new CapacityVO(hostId, zoneId, null, null, 0, 0, CapacityVO.CAPACITY_TYPE_SECONDARY_STORAGE); + CapacityVO capacity = new CapacityVO(hostId, zoneId, null, null, 0, 0, Capacity.CAPACITY_TYPE_SECONDARY_STORAGE); for (Long id : hosts) { StorageStats stats = ApiDBUtils.getSecondaryStorageStatistics(id); if (stats == null) { @@ -1352,7 +1359,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C pools = _storagePoolDao.search(sc, null); } - CapacityVO capacity = new CapacityVO(poolId, zoneId, podId, clusterId, 0, 0, CapacityVO.CAPACITY_TYPE_STORAGE); + CapacityVO capacity = new CapacityVO(poolId, zoneId, podId, clusterId, 0, 0, Capacity.CAPACITY_TYPE_STORAGE); for (StoragePoolVO PrimaryDataStoreVO : pools) { StorageStats stats = ApiDBUtils.getStoragePoolStatistics(PrimaryDataStoreVO.getId()); if (stats == null) { @@ -1478,13 +1485,13 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C if (stats != null) { double usedPercentage = ((double)stats.getByteUsed() / (double)totalSize); if (s_logger.isDebugEnabled()) { - s_logger.debug("Checking pool " + pool.getId() + " for storage, totalSize: " + pool.getCapacityBytes() + ", usedBytes: " + stats.getByteUsed() + ", usedPct: " + - usedPercentage + ", disable threshold: " + storageUsedThreshold); + s_logger.debug("Checking pool " + pool.getId() + " for storage, totalSize: " + pool.getCapacityBytes() + ", usedBytes: " + stats.getByteUsed() + + ", usedPct: " + usedPercentage + ", disable threshold: " + storageUsedThreshold); } if (usedPercentage >= storageUsedThreshold) { if (s_logger.isDebugEnabled()) { s_logger.debug("Insufficient space on pool: " + pool.getId() + " since its usage percentage: " + usedPercentage + - " has crossed the pool.storage.capacity.disablethreshold: " + storageUsedThreshold); + " has crossed the pool.storage.capacity.disablethreshold: " + storageUsedThreshold); } return false; } @@ -1571,24 +1578,26 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C double storageAllocatedThreshold = CapacityManager.StorageAllocatedCapacityDisableThreshold.valueIn(pool.getDataCenterId()); if (s_logger.isDebugEnabled()) { - s_logger.debug("Checking pool: " + pool.getId() + " for volume allocation " + volumes.toString() + ", maxSize : " + totalOverProvCapacity + ", totalAllocatedSize : " + - allocatedSizeWithtemplate + ", askingSize : " + totalAskingSize + ", allocated disable threshold: " + storageAllocatedThreshold); + s_logger.debug("Checking pool: " + pool.getId() + " for volume allocation " + volumes.toString() + ", maxSize : " + totalOverProvCapacity + + ", totalAllocatedSize : " + allocatedSizeWithtemplate + ", askingSize : " + totalAskingSize + ", allocated disable threshold: " + + storageAllocatedThreshold); } double usedPercentage = (allocatedSizeWithtemplate + totalAskingSize) / (double)(totalOverProvCapacity); if (usedPercentage > storageAllocatedThreshold) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Insufficient un-allocated capacity on: " + pool.getId() + " for volume allocation: " + volumes.toString() + " since its allocated percentage: " + - usedPercentage + " has crossed the allocated pool.storage.allocated.capacity.disablethreshold: " + storageAllocatedThreshold + - ", skipping this pool"); + s_logger.debug("Insufficient un-allocated capacity on: " + pool.getId() + " for volume allocation: " + volumes.toString() + + " since its allocated percentage: " + usedPercentage + " has crossed the allocated pool.storage.allocated.capacity.disablethreshold: " + + storageAllocatedThreshold + ", skipping this pool"); } return false; } if (totalOverProvCapacity < (allocatedSizeWithtemplate + totalAskingSize)) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Insufficient un-allocated capacity on: " + pool.getId() + " for volume allocation: " + volumes.toString() + ", not enough storage, maxSize : " + - totalOverProvCapacity + ", totalAllocatedSize : " + allocatedSizeWithtemplate + ", askingSize : " + totalAskingSize); + s_logger.debug("Insufficient un-allocated capacity on: " + pool.getId() + " for volume allocation: " + volumes.toString() + + ", not enough storage, maxSize : " + totalOverProvCapacity + ", totalAllocatedSize : " + allocatedSizeWithtemplate + ", askingSize : " + + totalAskingSize); } return false; } diff --git a/server/src/com/cloud/storage/StoragePoolAutomationImpl.java b/server/src/com/cloud/storage/StoragePoolAutomationImpl.java index 9e45ee13c6b..c76c6477418 100644 --- a/server/src/com/cloud/storage/StoragePoolAutomationImpl.java +++ b/server/src/com/cloud/storage/StoragePoolAutomationImpl.java @@ -119,7 +119,7 @@ public class StoragePoolAutomationImpl implements StoragePoolAutomation { for (StoragePoolVO sp : spes) { if (sp.getStatus() == StoragePoolStatus.PrepareForMaintenance) { throw new CloudRuntimeException("Only one storage pool in a cluster can be in PrepareForMaintenance mode, " + sp.getId() + - " is already in PrepareForMaintenance mode "); + " is already in PrepareForMaintenance mode "); } } StoragePool storagePool = (StoragePool)store; diff --git a/server/src/com/cloud/storage/TemplateProfile.java b/server/src/com/cloud/storage/TemplateProfile.java index 991bce5e3c7..81e34f3c121 100755 --- a/server/src/com/cloud/storage/TemplateProfile.java +++ b/server/src/com/cloud/storage/TemplateProfile.java @@ -50,9 +50,9 @@ public class TemplateProfile { Boolean isDynamicallyScalable; TemplateType templateType; - public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url, Boolean isPublic, - Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId, HypervisorType hypervisorType, String accountName, Long domainId, - Long accountId, String chksum, Boolean bootable, Map details, Boolean sshKeyEnabled) { + public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url, + Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId, HypervisorType hypervisorType, + String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, Map details, Boolean sshKeyEnabled) { this.templateId = templateId; this.userId = userId; this.name = name; @@ -83,8 +83,8 @@ public class TemplateProfile { this.zoneId = zoneId; } - public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url, Boolean isPublic, - Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId, + public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url, + Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, Long zoneId, HypervisorType hypervisorType, String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, String templateTag, Map details, Boolean sshKeyEnabled, Long imageStoreId, Boolean isDynamicallyScalable, TemplateType templateType) { diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 33ed1aefc75..c6935276935 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -18,9 +18,9 @@ package com.cloud.storage; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -388,8 +388,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic if ((format.equalsIgnoreCase("vhd") && (!url.toLowerCase().endsWith(".vhd") && !url.toLowerCase().endsWith("vhd.zip") && !url.toLowerCase().endsWith("vhd.bz2") && !url.toLowerCase() .endsWith("vhd.gz"))) || - (format.equalsIgnoreCase("qcow2") && (!url.toLowerCase().endsWith(".qcow2") && !url.toLowerCase().endsWith("qcow2.zip") && !url.toLowerCase().endsWith("qcow2.bz2") && !url.toLowerCase() - .endsWith("qcow2.gz"))) || + (format.equalsIgnoreCase("qcow2") && (!url.toLowerCase().endsWith(".qcow2") && !url.toLowerCase().endsWith("qcow2.zip") && + !url.toLowerCase().endsWith("qcow2.bz2") && !url.toLowerCase().endsWith("qcow2.gz"))) || (format.equalsIgnoreCase("ova") && (!url.toLowerCase().endsWith(".ova") && !url.toLowerCase().endsWith("ova.zip") && !url.toLowerCase().endsWith("ova.bz2") && !url.toLowerCase() .endsWith("ova.gz"))) || (format.equalsIgnoreCase("raw") && (!url.toLowerCase().endsWith(".img") && !url.toLowerCase().endsWith("raw")))) { throw new InvalidParameterValueException("Please specify a valid URL. URL:" + url + " is an invalid for the format " + format.toLowerCase()); @@ -497,7 +497,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } if ((sizeInGB < _customDiskOfferingMinSize) || (sizeInGB > _customDiskOfferingMaxSize)) { throw new InvalidParameterValueException("Volume size: " + sizeInGB + "GB is out of allowed range. Max: " + _customDiskOfferingMaxSize + " Min:" + - _customDiskOfferingMinSize); + _customDiskOfferingMinSize); } } @@ -556,7 +556,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } if (snapshotCheck.getState() != Snapshot.State.BackedUp) { - throw new InvalidParameterValueException("Snapshot id=" + snapshotId + " is not in " + Snapshot.State.BackedUp + " state yet and can't be used for volume creation"); + throw new InvalidParameterValueException("Snapshot id=" + snapshotId + " is not in " + Snapshot.State.BackedUp + + " state yet and can't be used for volume creation"); } parentVolume = _volsDao.findByIdIncludingRemoved(snapshotCheck.getVolumeId()); @@ -813,7 +814,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic */ if (currentSize > newSize && !shrinkOk) { throw new InvalidParameterValueException("Going from existing size of " + currentSize + " to size of " + newSize + - " would shrink the volume, need to sign off by supplying the shrinkok parameter with value of true"); + " would shrink the volume, need to sign off by supplying the shrinkok parameter with value of true"); } if (!shrinkOk) { @@ -1022,7 +1023,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic List existingDataVolumes = _volsDao.findByInstanceAndType(vmId, Volume.Type.DATADISK); int maxDataVolumesSupported = getMaxDataVolumesSupported(vm); if (existingDataVolumes.size() >= maxDataVolumesSupported) { - throw new InvalidParameterValueException("The specified VM already has the maximum number of data disks (" + maxDataVolumesSupported + "). Please specify another VM."); + throw new InvalidParameterValueException("The specified VM already has the maximum number of data disks (" + maxDataVolumesSupported + + "). Please specify another VM."); } // Check that the VM and the volume are in the same zone @@ -1095,13 +1097,14 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)volumeOnPrimaryStorage.getDataStore(); if (primaryStore.isLocal()) { throw new CloudRuntimeException("Failed to attach local data volume " + volume.getName() + " to VM " + vm.getDisplayName() + - " as migration of local data volume is not allowed"); + " as migration of local data volume is not allowed"); } StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(rootVolumeOfVm.getPoolId()); try { - volumeOnPrimaryStorage = _volumeMgr.moveVolume(volumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), - vmRootVolumePool.getClusterId(), dataDiskHyperType); + volumeOnPrimaryStorage = + _volumeMgr.moveVolume(volumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), vmRootVolumePool.getClusterId(), + dataDiskHyperType); } catch (ConcurrentOperationException e) { s_logger.debug("move volume failed", e); throw new CloudRuntimeException("move volume failed", e); @@ -1386,7 +1389,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } if (volume.getState() != Volume.State.Ready) { - throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + ". Cannot take snapshot."); + throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + + ". Cannot take snapshot."); } CreateSnapshotPayload payload = new CreateSnapshotPayload(); @@ -1416,7 +1420,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } if (volume.getState() != Volume.State.Ready) { - throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + ". Cannot take snapshot."); + throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + + ". Cannot take snapshot."); } if (volume.getTemplateId() != null) { @@ -1466,8 +1471,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic // instance is stopped if (volume.getInstanceId() != null && ApiDBUtils.findVMInstanceById(volume.getInstanceId()).getState() != State.Stopped) { s_logger.debug("Invalid state of the volume with ID: " + volumeId + ". It should be either detached or the VM should be in stopped state."); - PermissionDeniedException ex = new PermissionDeniedException( - "Invalid state of the volume with specified ID. It should be either detached or the VM should be in stopped state."); + PermissionDeniedException ex = + new PermissionDeniedException("Invalid state of the volume with specified ID. It should be either detached or the VM should be in stopped state."); ex.addProxyObject(volume.getUuid(), "volumeId"); throw ex; } @@ -1594,7 +1599,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic return false; } } else if (storeForDataStoreScope.getScopeType() == ScopeType.HOST && - (storeForRootStoreScope.getScopeType() == ScopeType.CLUSTER || storeForRootStoreScope.getScopeType() == ScopeType.ZONE)) { + (storeForRootStoreScope.getScopeType() == ScopeType.CLUSTER || storeForRootStoreScope.getScopeType() == ScopeType.ZONE)) { Long hostId = _vmInstanceDao.findById(rootVolumeOfVm.getInstanceId()).getHostId(); if (storeForDataStoreScope.getScopeId().equals(hostId)) { return false; diff --git a/server/src/com/cloud/storage/download/DownloadActiveState.java b/server/src/com/cloud/storage/download/DownloadActiveState.java index a0f496072f1..59709f26c04 100644 --- a/server/src/com/cloud/storage/download/DownloadActiveState.java +++ b/server/src/com/cloud/storage/download/DownloadActiveState.java @@ -16,9 +16,10 @@ // under the License. package com.cloud.storage.download; -import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType; import org.apache.log4j.Level; +import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType; + import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; diff --git a/server/src/com/cloud/storage/download/DownloadErrorState.java b/server/src/com/cloud/storage/download/DownloadErrorState.java index 20e3dd938ed..1591a341735 100644 --- a/server/src/com/cloud/storage/download/DownloadErrorState.java +++ b/server/src/com/cloud/storage/download/DownloadErrorState.java @@ -16,9 +16,10 @@ // under the License. package com.cloud.storage.download; -import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType; import org.apache.log4j.Level; +import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType; + import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java index bbb86395c67..2941b6e2f35 100755 --- a/server/src/com/cloud/storage/download/DownloadListener.java +++ b/server/src/com/cloud/storage/download/DownloadListener.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Timer; -import java.util.TimerTask; import javax.inject.Inject; import org.apache.log4j.Level; import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index f18384dda8d..86e5792b0a2 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -136,7 +136,8 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor } public boolean isTemplateUpdateable(Long templateId, Long storeId) { - List downloadsInProgress = _vmTemplateStoreDao.listByTemplateStoreDownloadStatus(templateId, storeId, Status.DOWNLOAD_IN_PROGRESS, Status.DOWNLOADED); + List downloadsInProgress = + _vmTemplateStoreDao.listByTemplateStoreDownloadStatus(templateId, storeId, Status.DOWNLOAD_IN_PROGRESS, Status.DOWNLOADED); return (downloadsInProgress.size() == 0); } @@ -147,7 +148,8 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor vmTemplateStore = _vmTemplateStoreDao.findByStoreTemplate(store.getId(), template.getId()); if (vmTemplateStore == null) { - vmTemplateStore = new TemplateDataStoreVO(store.getId(), template.getId(), new Date(), 0, Status.NOT_DOWNLOADED, null, null, "jobid0000", null, template.getUri()); + vmTemplateStore = + new TemplateDataStoreVO(store.getId(), template.getId(), new Date(), 0, Status.NOT_DOWNLOADED, null, null, "jobid0000", null, template.getUri()); vmTemplateStore.setDataStoreRole(store.getRole()); vmTemplateStore = _vmTemplateStoreDao.persist(vmTemplateStore); } else if ((vmTemplateStore.getJobId() != null) && (vmTemplateStore.getJobId().length() > 2)) { @@ -203,12 +205,13 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor initiateTemplateDownload(template, callback); } else { s_logger.info("Template url is null, cannot download"); - DownloadAnswer ans = new DownloadAnswer("Template url is null", VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR.UNKNOWN); + DownloadAnswer ans = new DownloadAnswer("Template url is null", Status.UNKNOWN); callback.complete(ans); } } else { s_logger.info("Template download is already in progress or already downloaded"); - DownloadAnswer ans = new DownloadAnswer("Template download is already in progress or already downloaded", VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR.UNKNOWN); + DownloadAnswer ans = + new DownloadAnswer("Template download is already in progress or already downloaded", Status.UNKNOWN); callback.complete(ans); } } diff --git a/server/src/com/cloud/storage/listener/SnapshotStateListener.java b/server/src/com/cloud/storage/listener/SnapshotStateListener.java index 864ddddbedb..649aeff4256 100644 --- a/server/src/com/cloud/storage/listener/SnapshotStateListener.java +++ b/server/src/com/cloud/storage/listener/SnapshotStateListener.java @@ -17,28 +17,27 @@ package com.cloud.storage.listener; -import javax.inject.Inject; - -import org.apache.cloudstack.framework.events.EventBus; -import org.apache.cloudstack.framework.events.EventBusException; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; - -import com.cloud.event.EventCategory; -import com.cloud.server.ManagementServer; -import com.cloud.storage.Snapshot; -import com.cloud.storage.Snapshot.State; -import com.cloud.storage.Snapshot.Event; -import com.cloud.storage.Snapshot.State; -import com.cloud.storage.SnapshotVO; -import com.cloud.utils.fsm.StateListener; -import com.cloud.utils.component.ComponentContext; - import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; + +import org.apache.cloudstack.framework.events.EventBus; +import org.apache.cloudstack.framework.events.EventBusException; + +import com.cloud.event.EventCategory; +import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; +import com.cloud.storage.Snapshot; +import com.cloud.storage.Snapshot.Event; +import com.cloud.storage.Snapshot.State; +import com.cloud.storage.SnapshotVO; +import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.fsm.StateListener; + public class SnapshotStateListener implements StateListener { protected static EventBus _eventBus = null; @@ -70,8 +69,9 @@ public class SnapshotStateListener implements StateListener eventDescription = new HashMap(); eventDescription.put("resource", resourceName); eventDescription.put("id", vo.getUuid()); diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java index 5242656a198..0c5d8f086e2 100755 --- a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java +++ b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java @@ -20,9 +20,10 @@ import java.util.List; import javax.inject.Inject; +import org.apache.log4j.Logger; + import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; import com.cloud.agent.Listener; import com.cloud.agent.api.AgentControlAnswer; @@ -36,8 +37,8 @@ import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.OCFS2Manager; -import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.ScopeType; +import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageManagerImpl; import com.cloud.storage.StoragePoolStatus; @@ -73,8 +74,9 @@ public class StoragePoolMonitor implements Listener { public void processConnect(Host host, StartupCommand cmd, boolean forRebalance) throws ConnectionException { if (cmd instanceof StartupRoutingCommand) { StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd; - if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() == HypervisorType.KVM || scCmd.getHypervisorType() == HypervisorType.VMware || - scCmd.getHypervisorType() == HypervisorType.Simulator || scCmd.getHypervisorType() == HypervisorType.Ovm) { + if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() == HypervisorType.KVM || + scCmd.getHypervisorType() == HypervisorType.VMware || scCmd.getHypervisorType() == HypervisorType.Simulator || + scCmd.getHypervisorType() == HypervisorType.Ovm) { List pools = _poolDao.listBy(host.getDataCenterId(), host.getPodId(), host.getClusterId(), ScopeType.CLUSTER); List zoneStoragePoolsByTags = _poolDao.findZoneWideStoragePoolsByTags(host.getDataCenterId(), null); List zoneStoragePoolsByHypervisor = _poolDao.findZoneWideStoragePoolsByHypervisor(host.getDataCenterId(), scCmd.getHypervisorType()); diff --git a/server/src/com/cloud/storage/listener/VolumeStateListener.java b/server/src/com/cloud/storage/listener/VolumeStateListener.java index d806faf0c5a..cd78d4ec600 100644 --- a/server/src/com/cloud/storage/listener/VolumeStateListener.java +++ b/server/src/com/cloud/storage/listener/VolumeStateListener.java @@ -17,22 +17,25 @@ package com.cloud.storage.listener; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; + +import org.apache.cloudstack.framework.events.EventBus; +import org.apache.cloudstack.framework.events.EventBusException; + import com.cloud.event.EventCategory; import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; import com.cloud.storage.Volume; import com.cloud.storage.Volume.Event; import com.cloud.storage.Volume.State; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.fsm.StateListener; -import org.apache.cloudstack.framework.events.EventBus; -import org.apache.cloudstack.framework.events.EventBusException; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; public class VolumeStateListener implements StateListener { @@ -65,8 +68,9 @@ public class VolumeStateListener implements StateListener } String resourceName = getEntityFromClassName(Volume.class.getName()); - org.apache.cloudstack.framework.events.Event eventMsg = new org.apache.cloudstack.framework.events.Event(ManagementServer.Name, - EventCategory.RESOURCE_STATE_CHANGE_EVENT.getName(), event, resourceName, vo.getUuid()); + org.apache.cloudstack.framework.events.Event eventMsg = + new org.apache.cloudstack.framework.events.Event(ManagementService.Name, EventCategory.RESOURCE_STATE_CHANGE_EVENT.getName(), event, resourceName, + vo.getUuid()); Map eventDescription = new HashMap(); eventDescription.put("resource", resourceName); eventDescription.put("id", vo.getUuid()); diff --git a/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java b/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java index 73f61b9795d..583ad9b8def 100644 --- a/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java +++ b/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java @@ -24,9 +24,10 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.storage.command.DownloadCommand; import org.apache.cloudstack.storage.command.DownloadProgressCommand; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthAnswer; @@ -46,8 +47,8 @@ import com.cloud.host.Host.Type; import com.cloud.resource.ServerResource; import com.cloud.resource.ServerResourceBase; import com.cloud.storage.Storage; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.template.TemplateConstants; import com.cloud.storage.template.TemplateProp; @@ -105,7 +106,8 @@ public class DummySecondaryStorageResource extends ServerResourceBase implements @Override public StartupCommand[] initialize() { - final StartupStorageCommand cmd = new StartupStorageCommand("dummy", StoragePoolType.NetworkFilesystem, 1024 * 1024 * 1024 * 100L, new HashMap()); + final StartupStorageCommand cmd = + new StartupStorageCommand("dummy", StoragePoolType.NetworkFilesystem, 1024 * 1024 * 1024 * 100L, new HashMap()); cmd.setResourceType(Storage.StorageResourceType.SECONDARY_STORAGE); cmd.setIqn(null); @@ -170,7 +172,8 @@ public class DummySecondaryStorageResource extends ServerResourceBase implements Map tmpltInfo = new HashMap(); if (tmplts != null) { for (VMTemplateVO tmplt : tmplts) { - TemplateProp routingInfo = new TemplateProp(tmplt.getUniqueName(), TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + File.separator, false, false); + TemplateProp routingInfo = + new TemplateProp(tmplt.getUniqueName(), TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + File.separator, false, false); tmpltInfo.put(tmplt.getUniqueName(), routingInfo); } } diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 0e5b0c8852a..5c7557f8865 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -157,7 +157,8 @@ import com.cloud.vm.dao.VMInstanceDao; // because sooner or later, it will be driven into Running state // @Local(value = {SecondaryStorageVmManager.class}) -public class SecondaryStorageManagerImpl extends ManagerBase implements SecondaryStorageVmManager, VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { +public class SecondaryStorageManagerImpl extends ManagerBase implements SecondaryStorageVmManager, VirtualMachineGuru, SystemVmLoadScanHandler, + ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(SecondaryStorageManagerImpl.class); private static final int DEFAULT_CAPACITY_SCAN_INTERVAL = 30000; // 30 @@ -502,7 +503,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar return secStorageVm; } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to allocate secondary storage vm storage, remove the secondary storage vm record from DB, secondary storage vm id: " + secStorageVmId); + s_logger.debug("Unable to allocate secondary storage vm storage, remove the secondary storage vm record from DB, secondary storage vm id: " + + secStorageVmId); } SubscriptionMgr.getInstance().notifySubscribers(ALERT_SUBJECT, this, @@ -547,14 +549,16 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar defaultNetwork = defaultNetworks.get(0); } - List offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOfferingVO.SystemControlNetwork, - NetworkOfferingVO.SystemManagementNetwork, NetworkOfferingVO.SystemStorageNetwork); + List offerings = + _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork, + NetworkOffering.SystemStorageNetwork); LinkedHashMap networks = new LinkedHashMap(offerings.size() + 1); NicProfile defaultNic = new NicProfile(); defaultNic.setDefaultNic(true); defaultNic.setDeviceId(2); try { - networks.put(_networkMgr.setupNetwork(systemAcct, _networkOfferingDao.findById(defaultNetwork.getNetworkOfferingId()), plan, null, null, false).get(0), defaultNic); + networks.put(_networkMgr.setupNetwork(systemAcct, _networkOfferingDao.findById(defaultNetwork.getNetworkOfferingId()), plan, null, null, false).get(0), + defaultNic); for (NetworkOffering offering : offerings) { networks.put(_networkMgr.setupNetwork(systemAcct, offering, plan, null, null, false).get(0), null); } @@ -570,8 +574,9 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar throw new CloudRuntimeException("Not able to find the System templates or not downloaded in zone " + dataCenterId); } - SecondaryStorageVmVO secStorageVm = new SecondaryStorageVmVO(id, _serviceOffering.getId(), name, template.getId(), template.getHypervisorType(), template.getGuestOSId(), - dataCenterId, systemAcct.getDomainId(), systemAcct.getId(), role, _serviceOffering.getOfferHA()); + SecondaryStorageVmVO secStorageVm = + new SecondaryStorageVmVO(id, _serviceOffering.getId(), name, template.getId(), template.getHypervisorType(), template.getGuestOSId(), dataCenterId, + systemAcct.getDomainId(), systemAcct.getId(), role, _serviceOffering.getOfferHA()); secStorageVm.setDynamicallyScalable(template.isDynamicallyScalable()); secStorageVm = _secStorageVmDao.persist(secStorageVm); try { @@ -701,7 +706,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar if (secStorageVm == null) { if (s_logger.isInfoEnabled()) { - s_logger.info("Unable to start secondary storage vm for standby capacity, secStorageVm vm Id : " + secStorageVmId + ", will recycle it and start a new one"); + s_logger.info("Unable to start secondary storage vm for standby capacity, secStorageVm vm Id : " + secStorageVmId + + ", will recycle it and start a new one"); } if (secStorageVmFromStoppedPool) { @@ -745,8 +751,9 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar return true; } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Primary storage is not ready, wait until it is ready to launch secondary storage vm. dcId: " + dataCenterId + " system.vm.use.local.storage: " + - _useLocalStorage + "If you want to use local storage to start ssvm, need to set system.vm.use.local.storage to true"); + s_logger.debug("Primary storage is not ready, wait until it is ready to launch secondary storage vm. dcId: " + dataCenterId + + " system.vm.use.local.storage: " + _useLocalStorage + + "If you want to use local storage to start ssvm, need to set system.vm.use.local.storage to true"); } } @@ -839,8 +846,9 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar int ramSize = NumbersUtil.parseInt(_configDao.getValue("ssvm.ram.size"), DEFAULT_SS_VM_RAMSIZE); int cpuFreq = NumbersUtil.parseInt(_configDao.getValue("ssvm.cpu.mhz"), DEFAULT_SS_VM_CPUMHZ); _useLocalStorage = Boolean.parseBoolean(configs.get(Config.SystemVMUseLocalStorage.key())); - _serviceOffering = new ServiceOfferingVO("System Offering For Secondary Storage VM", 1, ramSize, cpuFreq, null, null, false, null, _useLocalStorage, true, null, true, - VirtualMachine.Type.SecondaryStorageVm, true); + _serviceOffering = + new ServiceOfferingVO("System Offering For Secondary Storage VM", 1, ramSize, cpuFreq, null, null, false, null, _useLocalStorage, true, null, true, + VirtualMachine.Type.SecondaryStorageVm, true); _serviceOffering.setUniqueName(ServiceOffering.ssvmDefaultOffUniqueName); _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); @@ -1175,7 +1183,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar try { _rulesMgr.disableStaticNat(ip.getId(), ctx.getCallingAccount(), ctx.getCallingUserId(), true); } catch (Exception ex) { - s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", ex); + s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", + ex); } } } @@ -1240,8 +1249,9 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar public Pair scanPool(Long pool) { long dataCenterId = pool.longValue(); - List ssVms = _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, - State.Starting, State.Stopped, State.Stopping); + List ssVms = + _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, State.Starting, + State.Stopped, State.Stopping); int vmSize = (ssVms == null) ? 0 : ssVms.size(); List ssStores = _dataStoreMgr.getImageStoresByScope(new ZoneScope(dataCenterId)); int storeSize = (ssStores == null) ? 0 : ssStores.size(); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java index 66f2d6b4c63..28f6dc4d507 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Random; import javax.ejb.Local; -import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/com/cloud/storage/snapshot/SnapshotManager.java index eea1e04f98c..0bbc03585e3 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManager.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManager.java @@ -16,22 +16,15 @@ // under the License. package com.cloud.storage.snapshot; -import java.util.List; - import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.exception.ResourceAllocationException; -import com.cloud.host.HostVO; import com.cloud.storage.Snapshot; -import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.SnapshotVO; import com.cloud.storage.Volume; -import com.cloud.storage.VolumeVO; -import com.cloud.utils.db.Filter; -import com.cloud.utils.fsm.NoTransitionException; /** * diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 7bee4ba8feb..3c5e6a4d753 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -319,8 +319,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, //Check if the snapshot was removed while backingUp. If yes, do not log snapshot create usage event SnapshotVO freshSnapshot = _snapshotDao.findById(snapshot.getId()); if ((freshSnapshot != null) && backedUp) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), null, - null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), + null, null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); } _resourceLimitMgr.incrementResourceCount(snapshotOwner.getId(), ResourceType.snapshot); @@ -478,8 +478,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, } } - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -629,8 +629,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, } // Log event after successful deletion - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_DELETE, snapshot.getAccountId(), volume.getDataCenterId(), snapshot.getId(), snapshot.getName(), - null, null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_DELETE, snapshot.getAccountId(), volume.getDataCenterId(), snapshot.getId(), + snapshot.getName(), null, null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); } } } @@ -651,7 +651,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, true, volume); if (volume.getState() != Volume.State.Ready) { - throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + ". Cannot take snapshot."); + throw new InvalidParameterValueException("VolumeId: " + volumeId + " is not in " + Volume.State.Ready + " state but " + volume.getState() + + ". Cannot take snapshot."); } if (volume.getTemplateId() != null) { @@ -907,20 +908,20 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, UserVmVO userVm = _vmDao.findById(volume.getInstanceId()); if (userVm != null) { if (userVm.getState().equals(State.Destroyed) || userVm.getState().equals(State.Expunging)) { - throw new CloudRuntimeException("Creating snapshot failed due to volume:" + volume.getId() + " is associated with vm:" + userVm.getInstanceName() + " is in " + - userVm.getState().toString() + " state"); + throw new CloudRuntimeException("Creating snapshot failed due to volume:" + volume.getId() + " is associated with vm:" + userVm.getInstanceName() + + " is in " + userVm.getState().toString() + " state"); } if (userVm.getHypervisorType() == HypervisorType.VMware || userVm.getHypervisorType() == HypervisorType.KVM) { - List activeSnapshots = _snapshotDao.listByInstanceId(volume.getInstanceId(), Snapshot.State.Creating, Snapshot.State.CreatedOnPrimary, - Snapshot.State.BackingUp); + List activeSnapshots = + _snapshotDao.listByInstanceId(volume.getInstanceId(), Snapshot.State.Creating, Snapshot.State.CreatedOnPrimary, Snapshot.State.BackingUp); if (activeSnapshots.size() > 1) { throw new CloudRuntimeException("There is other active snapshot tasks on the instance to which the volume is attached, please try again later"); } } - List activeVMSnapshots = _vmSnapshotDao.listByInstanceId(userVm.getId(), VMSnapshot.State.Creating, VMSnapshot.State.Reverting, - VMSnapshot.State.Expunging); + List activeVMSnapshots = + _vmSnapshotDao.listByInstanceId(userVm.getId(), VMSnapshot.State.Creating, VMSnapshot.State.Reverting, VMSnapshot.State.Expunging); if (activeVMSnapshots.size() > 0) { throw new CloudRuntimeException("There is other active vm snapshot tasks on the instance to which the volume is attached, please try again later"); } @@ -950,8 +951,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, try { postCreateSnapshot(volume.getId(), snapshotId, payload.getSnapshotPolicyId()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), null, - null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), + null, null, volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); _resourceLimitMgr.incrementResourceCount(snapshotOwner.getId(), ResourceType.snapshot); } catch (Exception e) { s_logger.debug("post process snapshot failed", e); @@ -1077,7 +1078,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, String msg = "Snapshot resource limit exceeded for account id : " + owner.getId() + ". Failed to create recurring snapshots"; s_logger.warn(msg); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, msg, "Snapshot resource limit exceeded for account id : " + owner.getId() + - ". Failed to create recurring snapshots; please use updateResourceLimit to increase the limit"); + ". Failed to create recurring snapshots; please use updateResourceLimit to increase the limit"); } throw e; } @@ -1101,8 +1102,9 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, hypervisorType = volume.getHypervisorType(); } - SnapshotVO snapshotVO = new SnapshotVO(volume.getDataCenterId(), volume.getAccountId(), volume.getDomainId(), volume.getId(), volume.getDiskOfferingId(), snapshotName, - (short)snapshotType.ordinal(), snapshotType.name(), volume.getSize(), hypervisorType); + SnapshotVO snapshotVO = + new SnapshotVO(volume.getDataCenterId(), volume.getAccountId(), volume.getDomainId(), volume.getId(), volume.getDiskOfferingId(), snapshotName, + (short)snapshotType.ordinal(), snapshotType.name(), volume.getSize(), hypervisorType); SnapshotVO snapshot = _snapshotDao.persist(snapshotVO); if (snapshot == null) { diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index 9f9f6e09038..2b9e1e2ad13 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -233,8 +233,9 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu } tmpSnapshotScheduleVO = _snapshotScheduleDao.acquireInLockTable(snapshotScheId); - Long eventId = ActionEventUtils.onScheduledActionEvent(User.UID_SYSTEM, volume.getAccountId(), EventTypes.EVENT_SNAPSHOT_CREATE, - "creating snapshot for volume Id:" + volumeId, 0); + Long eventId = + ActionEventUtils.onScheduledActionEvent(User.UID_SYSTEM, volume.getAccountId(), EventTypes.EVENT_SNAPSHOT_CREATE, "creating snapshot for volume Id:" + + volumeId, 0); Map params = new HashMap(); params.put(ApiConstants.VOLUME_ID, "" + volumeId); @@ -249,9 +250,10 @@ public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotSchedu params.put("id", "" + cmd.getEntityId()); params.put("ctxStartEventId", "1"); - AsyncJobVO job = new AsyncJobVO(UUID.randomUUID().toString(), User.UID_SYSTEM, volume.getAccountId(), CreateSnapshotCmd.class.getName(), ApiGsonHelper.getBuilder() - .create() - .toJson(params), cmd.getEntityId(), cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); + AsyncJobVO job = + new AsyncJobVO(UUID.randomUUID().toString(), User.UID_SYSTEM, volume.getAccountId(), CreateSnapshotCmd.class.getName(), ApiGsonHelper.getBuilder() + .create() + .toJson(params), cmd.getEntityId(), cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null); long jobId = _asyncMgr.submitAsyncJob(job); diff --git a/server/src/com/cloud/storage/upload/UploadActiveState.java b/server/src/com/cloud/storage/upload/UploadActiveState.java index 6c7b99ee2b1..53bbb754e91 100644 --- a/server/src/com/cloud/storage/upload/UploadActiveState.java +++ b/server/src/com/cloud/storage/upload/UploadActiveState.java @@ -18,12 +18,9 @@ package com.cloud.storage.upload; import org.apache.log4j.Level; -import com.cloud.agent.api.storage.DownloadAnswer; -import com.cloud.agent.api.storage.UploadAnswer; import com.cloud.agent.api.storage.UploadAnswer; import com.cloud.agent.api.storage.UploadProgressCommand.RequestType; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; -import com.cloud.storage.download.DownloadState.DownloadEvent; public abstract class UploadActiveState extends UploadState { diff --git a/server/src/com/cloud/storage/upload/UploadInactiveState.java b/server/src/com/cloud/storage/upload/UploadInactiveState.java index eeb04c379c0..cf8bf5890fb 100644 --- a/server/src/com/cloud/storage/upload/UploadInactiveState.java +++ b/server/src/com/cloud/storage/upload/UploadInactiveState.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.upload; -import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.agent.api.storage.UploadAnswer; public abstract class UploadInactiveState extends UploadState { diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java index af28885880d..1fa89468b85 100755 --- a/server/src/com/cloud/storage/upload/UploadListener.java +++ b/server/src/com/cloud/storage/upload/UploadListener.java @@ -190,8 +190,9 @@ public class UploadListener implements Listener { } else { extractId = ApiDBUtils.findTemplateById(uploadObj.getTypeId()).getUuid(); } - resultObj = new ExtractResponse(extractId, typeName, ApiDBUtils.findAccountById(accountId).getUuid(), Status.NOT_UPLOADED.toString(), ApiDBUtils.findUploadById(uploadId) - .getUuid()); + resultObj = + new ExtractResponse(extractId, typeName, ApiDBUtils.findAccountById(accountId).getUuid(), Status.NOT_UPLOADED.toString(), ApiDBUtils.findUploadById(uploadId) + .getUuid()); resultObj.setResponseName(responseNameMap.get(type.toString())); updateDatabase(Status.NOT_UPLOADED, cmd.getUrl(), ""); } diff --git a/server/src/com/cloud/storage/upload/UploadMonitor.java b/server/src/com/cloud/storage/upload/UploadMonitor.java index 4de36d130b3..ea90dd86983 100755 --- a/server/src/com/cloud/storage/upload/UploadMonitor.java +++ b/server/src/com/cloud/storage/upload/UploadMonitor.java @@ -37,7 +37,8 @@ public interface UploadMonitor extends Manager { public void cancelAllUploads(Long templateId); - public Long extractTemplate(VMTemplateVO template, String url, TemplateDataStoreVO tmpltStoreRef, Long dataCenterId, long eventId, long asyncJobId, AsyncJobManager asyncMgr); + public Long extractTemplate(VMTemplateVO template, String url, TemplateDataStoreVO tmpltStoreRef, Long dataCenterId, long eventId, long asyncJobId, + AsyncJobManager asyncMgr); boolean isTypeUploadInProgress(Long typeId, Type type); diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java index 8455fb889f8..5d491c3b733 100755 --- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java +++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java @@ -151,16 +151,17 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { } @Override - public void extractVolume(UploadVO uploadVolumeObj, DataStore secStore, VolumeVO volume, String url, Long dataCenterId, String installPath, long eventId, long asyncJobId, - AsyncJobManager asyncMgr) { + public void extractVolume(UploadVO uploadVolumeObj, DataStore secStore, VolumeVO volume, String url, Long dataCenterId, String installPath, long eventId, + long asyncJobId, AsyncJobManager asyncMgr) { uploadVolumeObj.setUploadState(Upload.Status.NOT_UPLOADED); _uploadDao.update(uploadVolumeObj.getId(), uploadVolumeObj); start(); UploadCommand ucmd = new UploadCommand(url, volume.getId(), volume.getSize(), installPath, Type.VOLUME); - UploadListener ul = new UploadListener(secStore, _timer, _uploadDao, uploadVolumeObj, this, ucmd, volume.getAccountId(), volume.getName(), Type.VOLUME, eventId, - asyncJobId, asyncMgr); + UploadListener ul = + new UploadListener(secStore, _timer, _uploadDao, uploadVolumeObj, this, ucmd, volume.getAccountId(), volume.getName(), Type.VOLUME, eventId, asyncJobId, + asyncMgr); _listenerMap.put(uploadVolumeObj, ul); try { @@ -179,7 +180,8 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { } @Override - public Long extractTemplate(VMTemplateVO template, String url, TemplateDataStoreVO vmTemplateHost, Long dataCenterId, long eventId, long asyncJobId, AsyncJobManager asyncMgr) { + public Long extractTemplate(VMTemplateVO template, String url, TemplateDataStoreVO vmTemplateHost, Long dataCenterId, long eventId, long asyncJobId, + AsyncJobManager asyncMgr) { Type type = (template.getFormat() == ImageFormat.ISO) ? Type.ISO : Type.TEMPLATE; @@ -191,8 +193,9 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { if (vmTemplateHost != null) { start(); UploadCommand ucmd = new UploadCommand(template, url, vmTemplateHost.getInstallPath(), vmTemplateHost.getSize()); - UploadListener ul = new UploadListener(secStore, _timer, _uploadDao, uploadTemplateObj, this, ucmd, template.getAccountId(), template.getName(), type, eventId, - asyncJobId, asyncMgr); + UploadListener ul = + new UploadListener(secStore, _timer, _uploadDao, uploadTemplateObj, this, ucmd, template.getAccountId(), template.getName(), type, eventId, asyncJobId, + asyncMgr); _listenerMap.put(uploadTemplateObj, ul); try { EndPoint ep = _epSelector.select(secStore); @@ -254,7 +257,8 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { } // It doesn't exist so create a DB entry. - UploadVO uploadTemplateObj = new UploadVO(vmTemplateHost.getDataStoreId(), template.getId(), new Date(), Status.DOWNLOAD_URL_NOT_CREATED, 0, type, Mode.HTTP_DOWNLOAD); + UploadVO uploadTemplateObj = + new UploadVO(vmTemplateHost.getDataStoreId(), template.getId(), new Date(), Status.DOWNLOAD_URL_NOT_CREATED, 0, type, Mode.HTTP_DOWNLOAD); uploadTemplateObj.setInstallPath(vmTemplateHost.getInstallPath()); _uploadDao.persist(uploadTemplateObj); @@ -493,7 +497,8 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { DataStore secStore = storeMgr.getDataStore(extractJob.getDataStoreId(), DataStoreRole.Image); // Would delete the symlink for the Type and if Type == VOLUME then also the volume - DeleteEntityDownloadURLCommand cmd = new DeleteEntityDownloadURLCommand(path, extractJob.getType(), extractJob.getUploadUrl(), ((ImageStoreVO)secStore).getParent()); + DeleteEntityDownloadURLCommand cmd = + new DeleteEntityDownloadURLCommand(path, extractJob.getType(), extractJob.getUploadUrl(), ((ImageStoreVO)secStore).getParent()); EndPoint ep = _epSelector.select(secStore); if (ep == null) { s_logger.warn("UploadMonitor cleanup: There is no secondary storage VM for secondary storage host " + extractJob.getDataStoreId()); @@ -507,7 +512,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { _uploadDao.remove(extractJob.getId()); } else { s_logger.warn("UploadMonitor cleanup: Unable to delete the link for " + extractJob.getType() + " id=" + extractJob.getTypeId() + " url=" + - extractJob.getUploadUrl() + " on ssvm " + ep.getHostAddr()); + extractJob.getUploadUrl() + " on ssvm " + ep.getHostAddr()); } } } diff --git a/server/src/com/cloud/storage/upload/UploadState.java b/server/src/com/cloud/storage/upload/UploadState.java index e5e3b13231c..ea27ad7ec97 100644 --- a/server/src/com/cloud/storage/upload/UploadState.java +++ b/server/src/com/cloud/storage/upload/UploadState.java @@ -22,7 +22,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import com.cloud.agent.api.storage.UploadAnswer; -import com.cloud.storage.upload.UploadState.UploadEvent; public abstract class UploadState { diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 6b097e48916..f6529b2eba0 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -25,11 +25,12 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; + import com.cloud.api.query.dao.ResourceTagJoinDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.domain.Domain; @@ -286,7 +287,8 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso throw new InvalidParameterValueException("Value for the key " + key + " is either null or empty"); } - ResourceTagVO resourceTag = new ResourceTagVO(key, value, accountDomainPair.first(), accountDomainPair.second(), id, resourceType, customer, resourceUuid); + ResourceTagVO resourceTag = + new ResourceTagVO(key, value, accountDomainPair.first(), accountDomainPair.second(), id, resourceType, customer, resourceUuid); resourceTag = _resourceTagDao.persist(resourceTag); resourceTags.add(resourceTag); } diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index 050f434de14..32da8230163 100755 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -106,7 +106,8 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { TemplateProfile profile = super.prepare(cmd); String url = profile.getUrl(); - if ((!url.toLowerCase().endsWith("iso")) && (!url.toLowerCase().endsWith("iso.zip")) && (!url.toLowerCase().endsWith("iso.bz2")) && (!url.toLowerCase().endsWith("iso.gz"))) { + if ((!url.toLowerCase().endsWith("iso")) && (!url.toLowerCase().endsWith("iso.zip")) && (!url.toLowerCase().endsWith("iso.bz2")) && + (!url.toLowerCase().endsWith("iso.gz"))) { throw new InvalidParameterValueException("Please specify a valid iso"); } @@ -154,8 +155,8 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { if ((format.equalsIgnoreCase("vhd") && (!url.toLowerCase().endsWith("vhd") && !url.toLowerCase().endsWith("vhd.zip") && !url.toLowerCase().endsWith("vhd.bz2") && !url.toLowerCase() .endsWith("vhd.gz"))) || - (format.equalsIgnoreCase("qcow2") && (!url.toLowerCase().endsWith("qcow2") && !url.toLowerCase().endsWith("qcow2.zip") && !url.toLowerCase().endsWith("qcow2.bz2") && !url.toLowerCase() - .endsWith("qcow2.gz"))) || + (format.equalsIgnoreCase("qcow2") && (!url.toLowerCase().endsWith("qcow2") && !url.toLowerCase().endsWith("qcow2.zip") && + !url.toLowerCase().endsWith("qcow2.bz2") && !url.toLowerCase().endsWith("qcow2.gz"))) || (format.equalsIgnoreCase("ova") && (!url.toLowerCase().endsWith("ova") && !url.toLowerCase().endsWith("ova.zip") && !url.toLowerCase().endsWith("ova.bz2") && !url.toLowerCase() .endsWith("ova.gz"))) || (format.equalsIgnoreCase("tar") && (!url.toLowerCase().endsWith("tar") && !url.toLowerCase().endsWith("tar.zip") && !url.toLowerCase().endsWith("tar.bz2") && !url.toLowerCase() @@ -222,7 +223,8 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { } } - protected Void createTemplateAsyncCallBack(AsyncCallbackDispatcher callback, CreateTemplateContext context) { + protected Void createTemplateAsyncCallBack(AsyncCallbackDispatcher callback, + CreateTemplateContext context) { TemplateApiResult result = callback.getResult(); TemplateInfo template = context.template; if (result.isSuccess()) { @@ -242,20 +244,20 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { physicalSize = tmpltStore.getPhysicalSize(); } else { s_logger.warn("No entry found in template_store_ref for template id: " + template.getId() + " and image store id: " + ds.getId() + - " at the end of registering template!"); + " at the end of registering template!"); } Scope dsScope = ds.getScope(); if (dsScope.getScopeType() == ScopeType.ZONE) { if (dsScope.getScopeId() != null) { - UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), dsScope.getScopeId(), template.getId(), template.getName(), null, null, physicalSize, - template.getSize(), VirtualMachineTemplate.class.getName(), template.getUuid()); + UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), dsScope.getScopeId(), template.getId(), template.getName(), null, null, + physicalSize, template.getSize(), VirtualMachineTemplate.class.getName(), template.getUuid()); } else { s_logger.warn("Zone scope image store " + ds.getId() + " has a null scope id"); } } else if (dsScope.getScopeType() == ScopeType.REGION) { // publish usage event for region-wide image store using a -1 zoneId for 4.2, need to revisit post-4.2 - UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), -1, template.getId(), template.getName(), null, null, physicalSize, template.getSize(), - VirtualMachineTemplate.class.getName(), template.getUuid()); + UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), -1, template.getId(), template.getName(), null, null, physicalSize, + template.getSize(), VirtualMachineTemplate.class.getName(), template.getUuid()); } _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.secondary_storage, template.getSize()); } @@ -284,7 +286,8 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { for (TemplateDataStoreVO templateStore : templateStores) { if (templateStore.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) { String errorMsg = "Please specify a template that is not currently being downloaded."; - s_logger.debug("Template: " + template.getName() + " is currently being downloaded to secondary storage host: " + store.getName() + "; cant' delete it."); + s_logger.debug("Template: " + template.getName() + " is currently being downloaded to secondary storage host: " + store.getName() + + "; cant' delete it."); throw new CloudRuntimeException(errorMsg); } } diff --git a/server/src/com/cloud/template/TemplateAdapter.java b/server/src/com/cloud/template/TemplateAdapter.java index 71757f03e08..a85e3379834 100755 --- a/server/src/com/cloud/template/TemplateAdapter.java +++ b/server/src/com/cloud/template/TemplateAdapter.java @@ -21,14 +21,14 @@ import java.util.Map; import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; -import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import com.cloud.exception.ResourceAllocationException; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.TemplateProfile; import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.Storage.TemplateType; import com.cloud.user.Account; import com.cloud.utils.component.Adapter; @@ -63,12 +63,12 @@ public interface TemplateAdapter extends Adapter { public boolean delete(TemplateProfile profile); public TemplateProfile prepare(boolean isIso, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, - Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String accountName, Long domainId, - String chksum, Boolean bootable, Map details) throws ResourceAllocationException; + Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String accountName, + Long domainId, String chksum, Boolean bootable, Map details) throws ResourceAllocationException; public TemplateProfile prepare(boolean isIso, long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, - Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String chksum, Boolean bootable, - String templateTag, Account templateOwner, Map details, Boolean sshKeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, TemplateType templateType) - throws ResourceAllocationException; + Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String chksum, + Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshKeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, + TemplateType templateType) throws ResourceAllocationException; } diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java index 2199dea164f..59aab3b64b7 100755 --- a/server/src/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/com/cloud/template/TemplateAdapterBase.java @@ -16,9 +16,9 @@ // under the License. package com.cloud.template; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import javax.inject.Inject; @@ -117,22 +117,23 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat } private static boolean isAdmin(short accountType) { - return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); } @Override public TemplateProfile prepare(boolean isIso, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, - Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String accountName, Long domainId, - String chksum, Boolean bootable, Map details) throws ResourceAllocationException { - return prepare(isIso, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, format, guestOSId, zoneId, hypervisorType, - chksum, bootable, null, null, details, false, null, false, TemplateType.USER); + Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String accountName, + Long domainId, String chksum, Boolean bootable, Map details) throws ResourceAllocationException { + return prepare(isIso, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, format, guestOSId, zoneId, + hypervisorType, chksum, bootable, null, null, details, false, null, false, TemplateType.USER); } @Override public TemplateProfile prepare(boolean isIso, long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, - Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String chksum, Boolean bootable, - String templateTag, Account templateOwner, Map details, Boolean sshkeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, TemplateType templateType) - throws ResourceAllocationException { + Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, Long zoneId, HypervisorType hypervisorType, String chksum, + Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshkeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, + TemplateType templateType) throws ResourceAllocationException { //Long accountId = null; // parameters verification @@ -246,8 +247,8 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat Long id = _tmpltDao.getNextInSequence(Long.class, "id"); CallContext.current().setEventDetails("Id: " + id + " name: " + name); return new TemplateProfile(id, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, imgfmt, guestOSId, zoneId, - hypervisorType, templateOwner.getAccountName(), templateOwner.getDomainId(), templateOwner.getAccountId(), chksum, bootable, templateTag, details, sshkeyEnabled, null, - isDynamicallyScalable, templateType); + hypervisorType, templateOwner.getAccountName(), templateOwner.getDomainId(), templateOwner.getAccountId(), chksum, bootable, templateTag, details, + sshkeyEnabled, null, isDynamicallyScalable, templateType); } @@ -267,10 +268,10 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat zoneId = -1L; } - return prepare(false, CallContext.current().getCallingUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getBits(), cmd.isPasswordEnabled(), cmd.getRequiresHvm(), - cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneId, HypervisorType.getType(cmd.getHypervisor()), - cmd.getChecksum(), true, cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING - : TemplateType.USER); + return prepare(false, CallContext.current().getCallingUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getBits(), cmd.isPasswordEnabled(), + cmd.getRequiresHvm(), cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneId, + HypervisorType.getType(cmd.getHypervisor()), cmd.getChecksum(), true, cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null, + cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING : TemplateType.USER); } @@ -288,17 +289,18 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat zoneId = -1L; } - return prepare(true, CallContext.current().getCallingUserId(), cmd.getIsoName(), cmd.getDisplayText(), 64, false, true, cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), - cmd.isExtractable(), ImageFormat.ISO.toString(), cmd.getOsTypeId(), zoneId, HypervisorType.None, cmd.getChecksum(), cmd.isBootable(), null, owner, null, false, - cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER); + return prepare(true, CallContext.current().getCallingUserId(), cmd.getIsoName(), cmd.getDisplayText(), 64, false, true, cmd.getUrl(), cmd.isPublic(), + cmd.isFeatured(), cmd.isExtractable(), ImageFormat.ISO.toString(), cmd.getOsTypeId(), zoneId, HypervisorType.None, cmd.getChecksum(), cmd.isBootable(), null, + owner, null, false, cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER); } protected VMTemplateVO persistTemplate(TemplateProfile profile) { Long zoneId = profile.getZoneId(); - VMTemplateVO template = new VMTemplateVO(profile.getTemplateId(), profile.getName(), profile.getFormat(), profile.getIsPublic(), profile.getFeatured(), - profile.getIsExtractable(), profile.getTemplateType(), profile.getUrl(), profile.getRequiresHVM(), profile.getBits(), profile.getAccountId(), profile.getCheckSum(), - profile.getDisplayText(), profile.getPasswordEnabled(), profile.getGuestOsId(), profile.getBootable(), profile.getHypervisorType(), profile.getTemplateTag(), - profile.getDetails(), profile.getSshKeyEnabled(), profile.IsDynamicallyScalable()); + VMTemplateVO template = + new VMTemplateVO(profile.getTemplateId(), profile.getName(), profile.getFormat(), profile.getIsPublic(), profile.getFeatured(), profile.getIsExtractable(), + profile.getTemplateType(), profile.getUrl(), profile.getRequiresHVM(), profile.getBits(), profile.getAccountId(), profile.getCheckSum(), + profile.getDisplayText(), profile.getPasswordEnabled(), profile.getGuestOsId(), profile.getBootable(), profile.getHypervisorType(), + profile.getTemplateTag(), profile.getDetails(), profile.getSshKeyEnabled(), profile.IsDynamicallyScalable()); if (zoneId == null || zoneId.longValue() == -1) { List dcs = _dcDao.listAll(); @@ -326,7 +328,8 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat throw new PermissionDeniedException(msg + ". Permission denied."); } - if ((template != null) && (!template.isPublicTemplate() && (account.getId() != template.getAccountId()) && (template.getTemplateType() != TemplateType.PERHOST))) { + if ((template != null) && + (!template.isPublicTemplate() && (account.getId() != template.getAccountId()) && (template.getTemplateType() != TemplateType.PERHOST))) { //special handling for the project case Account owner = _accountMgr.getAccount(template.getAccountId()); if (owner.getType() == Account.ACCOUNT_TYPE_PROJECT) { diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 5b1ab7b0f65..b3da060f9ed 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -511,7 +511,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, }); } else { s_logger.info("Skip loading template " + template.getId() + " into primary storage " + pool.getId() + " as pool zone " + pool.getDataCenterId() + - " is different from the requested zone " + zoneId); + " is different from the requested zone " + zoneId); } } } @@ -858,7 +858,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, List nonExpungedVms = _vmInstanceDao.listNonExpungedByZoneAndTemplate(zoneId, templateId); if (!nonExpungedVms.isEmpty()) { - s_logger.debug("Template " + template.getName() + " in zone " + zone.getName() + " is not deleteable because there are non-expunged VMs deployed from this template."); + s_logger.debug("Template " + template.getName() + " in zone " + zone.getName() + + " is not deleteable because there are non-expunged VMs deployed from this template."); return false; } List userVmUsingIso = _userVmDao.listByIsoId(templateId); @@ -873,7 +874,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, for (VolumeVO volume : volumes) { List snapshots = _snapshotDao.listByVolumeIdVersion(volume.getId(), "2.1"); if (!snapshots.isEmpty()) { - s_logger.debug("Template " + template.getName() + " in zone " + zone.getName() + " is not deleteable because there are 2.1 snapshots using this template."); + s_logger.debug("Template " + template.getName() + " in zone " + zone.getName() + + " is not deleteable because there are 2.1 snapshots using this template."); return false; } } @@ -1238,8 +1240,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, if (accountNames != null) { if ((operation == null) || (!operation.equalsIgnoreCase("add") && !operation.equalsIgnoreCase("remove") && !operation.equalsIgnoreCase("reset"))) { - throw new InvalidParameterValueException("Invalid operation on accounts, the operation must be either 'add' or 'remove' in order to modify launch permissions." + - " Given operation is: '" + operation + "'"); + throw new InvalidParameterValueException( + "Invalid operation on accounts, the operation must be either 'add' or 'remove' in order to modify launch permissions." + " Given operation is: '" + + operation + "'"); } } @@ -1303,8 +1306,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, _launchPermissionDao.persist(launchPermission); } } else { - throw new InvalidParameterValueException("Unable to grant a launch permission to account " + accountName + " in domain id=" + domain.getUuid() + - ", account not found. " + "No permissions updated, please verify the account names and retry."); + throw new InvalidParameterValueException("Unable to grant a launch permission to account " + accountName + " in domain id=" + + domain.getUuid() + ", account not found. " + "No permissions updated, please verify the account names and retry."); } } } @@ -1411,8 +1414,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } } TemplateDataStoreVO srcTmpltStore = _tmplStoreDao.findByStoreTemplate(store.getId(), templateId); - UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, privateTemplate.getAccountId(), zoneId, privateTemplate.getId(), - privateTemplate.getName(), null, privateTemplate.getSourceTemplateId(), srcTmpltStore.getPhysicalSize(), privateTemplate.getSize()); + UsageEventVO usageEvent = + new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, privateTemplate.getAccountId(), zoneId, privateTemplate.getId(), privateTemplate.getName(), null, + privateTemplate.getSourceTemplateId(), srcTmpltStore.getPhysicalSize(), privateTemplate.getSize()); _usageEventDao.persist(usageEvent); } catch (InterruptedException e) { s_logger.debug("Failed to create template", e); @@ -1450,7 +1454,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, if (accountId != null) { _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.template); _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(volumeFinal != null ? volumeFinal.getSize() - : snapshotFinal.getSize())); + : snapshotFinal.getSize())); } } }); @@ -1466,7 +1470,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } private static boolean isAdmin(short accountType) { - return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); } @Override @@ -1515,8 +1520,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, throw new InvalidParameterValueException("Failed to create private template record, neither volume ID nor snapshot ID were specified."); } if ((volumeId != null) && (snapshotId != null)) { - throw new InvalidParameterValueException("Failed to create private template record, please specify only one of volume ID (" + volumeId + ") and snapshot ID (" + - snapshotId + ")"); + throw new InvalidParameterValueException("Failed to create private template record, please specify only one of volume ID (" + volumeId + + ") and snapshot ID (" + snapshotId + ")"); } HypervisorType hyperType; @@ -1556,7 +1561,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, if (snapshot.getState() != Snapshot.State.BackedUp) { throw new InvalidParameterValueException("Snapshot id=" + snapshotId + " is not in " + Snapshot.State.BackedUp + - " state yet and can't be used for template creation"); + " state yet and can't be used for template creation"); } /* @@ -1608,8 +1613,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, s_logger.debug("Adding template tag: " + templateTag); } } - privateTemplate = new VMTemplateVO(nextTemplateId, uniqueName, name, ImageFormat.RAW, isPublic, featured, isExtractable, TemplateType.USER, null, null, requiresHvmValue, - bitsValue, templateOwner.getId(), null, description, passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails()); + privateTemplate = + new VMTemplateVO(nextTemplateId, uniqueName, name, ImageFormat.RAW, isPublic, featured, isExtractable, TemplateType.USER, null, null, requiresHvmValue, + bitsValue, templateOwner.getId(), null, description, passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails()); privateTemplate.setDynamicallyScalable(isDynamicScalingEnabled); if (sourceTemplateId != null) { @@ -1632,7 +1638,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } _resourceLimitMgr.incrementResourceCount(templateOwner.getId(), ResourceType.template); - _resourceLimitMgr.incrementResourceCount(templateOwner.getId(), ResourceType.secondary_storage, new Long(volume != null ? volume.getSize() : snapshot.getSize())); + _resourceLimitMgr.incrementResourceCount(templateOwner.getId(), ResourceType.secondary_storage, + new Long(volume != null ? volume.getSize() : snapshot.getSize())); } if (template != null) { @@ -1751,8 +1758,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } } - boolean updateNeeded = !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null && - isDynamicallyScalable == null && isRoutingTemplate == null); + boolean updateNeeded = + !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null && + isDynamicallyScalable == null && isRoutingTemplate == null); if (!updateNeeded) { return template; } diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java index c4101152032..8d7b42a8e00 100755 --- a/server/src/com/cloud/test/DatabaseConfig.java +++ b/server/src/com/cloud/test/DatabaseConfig.java @@ -57,8 +57,6 @@ import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionCallbackNoReturn; -import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.TransactionStatus; @@ -494,7 +492,8 @@ public class DatabaseConfig { } catch (URISyntaxException e1) { return; } - String insertSql1 = "INSERT INTO `host` (`id`, `name`, `status` , `type` , `private_ip_address`, `private_netmask` ,`private_mac_address` , `storage_ip_address` ,`storage_netmask`, `storage_mac_address`, `data_center_id`, `version`, `dom0_memory`, `last_ping`, `resource`, `guid`, `hypervisor_type`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String insertSql1 = + "INSERT INTO `host` (`id`, `name`, `status` , `type` , `private_ip_address`, `private_netmask` ,`private_mac_address` , `storage_ip_address` ,`storage_netmask`, `storage_mac_address`, `data_center_id`, `version`, `dom0_memory`, `last_ping`, `resource`, `guid`, `hypervisor_type`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; String insertSqlHostDetails = "INSERT INTO `host_details` (`id`, `host_id`, `name`, `value`) VALUES(?,?,?,?)"; String insertSql2 = "INSERT INTO `op_host` (`id`, `sequence`) VALUES(?, ?)"; TransactionLegacy txn = TransactionLegacy.currentTxn(); @@ -572,7 +571,8 @@ public class DatabaseConfig { long dataCenterId = Long.parseLong(_currentObjectParams.get("zoneId")); long podId = Long.parseLong(_currentObjectParams.get("podId")); String hypervisor = _currentObjectParams.get("hypervisorType"); - String insertSql1 = "INSERT INTO `cluster` (`id`, `name`, `data_center_id` , `pod_id`, `hypervisor_type` , `cluster_type`, `allocation_state`) VALUES (?,?,?,?,?,?,?)"; + String insertSql1 = + "INSERT INTO `cluster` (`id`, `name`, `data_center_id` , `pod_id`, `hypervisor_type` , `cluster_type`, `allocation_state`) VALUES (?,?,?,?,?,?,?)"; TransactionLegacy txn = TransactionLegacy.currentTxn(); try { @@ -606,7 +606,8 @@ public class DatabaseConfig { String storageType = _currentObjectParams.get("storageType"); String uuid = UUID.nameUUIDFromBytes(new String(hostAddress + hostPath).getBytes()).toString(); - String insertSql1 = "INSERT INTO `storage_pool` (`id`, `name`, `uuid` , `pool_type` , `port`, `data_center_id` ,`available_bytes` , `capacity_bytes` ,`host_address`, `path`, `created`, `pod_id`,`status` , `cluster_id`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String insertSql1 = + "INSERT INTO `storage_pool` (`id`, `name`, `uuid` , `pool_type` , `port`, `data_center_id` ,`available_bytes` , `capacity_bytes` ,`host_address`, `path`, `created`, `pod_id`,`status` , `cluster_id`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; // String insertSql2 = "INSERT INTO `netfs_storage_pool` VALUES (?,?,?)"; TransactionLegacy txn = TransactionLegacy.currentTxn(); @@ -709,10 +710,11 @@ public class DatabaseConfig { int userData = Integer.parseInt(_currentObjectParams.get("userData")); int securityGroup = Integer.parseInt(_currentObjectParams.get("securityGroup")); - String insertSql1 = "INSERT INTO `physical_network_service_providers` (`id`, `uuid`, `physical_network_id` , `provider_name`, `state` ," - + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," - + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," - + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + String insertSql1 = + "INSERT INTO `physical_network_service_providers` (`id`, `uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; TransactionLegacy txn = TransactionLegacy.currentTxn(); try { @@ -925,7 +927,8 @@ public class DatabaseConfig { useLocalStorage = false; } - ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); + ServiceOfferingVO serviceOffering = + new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); Long bytesReadRate = Long.parseLong(_currentObjectParams.get("bytesReadRate")); if ((bytesReadRate != null) && (bytesReadRate > 0)) @@ -1126,7 +1129,9 @@ public class DatabaseConfig { } // insert system user - insertSql = "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, created)" + " VALUES (1, 'system', RAND(), 1, 'system', 'cloud', now())"; + insertSql = + "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, created)" + + " VALUES (1, 'system', RAND(), 1, 'system', 'cloud', now())"; txn = TransactionLegacy.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -1175,8 +1180,9 @@ public class DatabaseConfig { } // now insert the user - insertSql = "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, email, created) " + "VALUES (" + id + ",'" + username + "','" + - sb.toString() + "', 2, '" + firstname + "','" + lastname + "','" + email + "',now())"; + insertSql = + "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, email, created) " + "VALUES (" + id + ",'" + username + "','" + + sb.toString() + "', 2, '" + firstname + "','" + lastname + "','" + email + "',now())"; txn = TransactionLegacy.currentTxn(); try { @@ -1229,8 +1235,9 @@ public class DatabaseConfig { } } - String insertSql = "INSERT INTO `cloud`.`configuration` (instance, component, name, value, description, category) " + "VALUES ('" + instance + "','" + component + "','" + - name + "','" + value + "','" + description + "','" + category + "')"; + String insertSql = + "INSERT INTO `cloud`.`configuration` (instance, component, name, value, description, category) " + "VALUES ('" + instance + "','" + component + "','" + name + + "','" + value + "','" + description + "','" + category + "')"; String selectSql = "SELECT name FROM cloud.configuration WHERE name = '" + name + "'"; diff --git a/server/src/com/cloud/test/IPRangeConfig.java b/server/src/com/cloud/test/IPRangeConfig.java index 5bd821ba2dc..f4619955f4f 100755 --- a/server/src/com/cloud/test/IPRangeConfig.java +++ b/server/src/com/cloud/test/IPRangeConfig.java @@ -28,7 +28,6 @@ import java.util.Vector; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.NetUtils; @@ -448,7 +447,8 @@ public class IPRangeConfig { } public Vector savePublicIPRange(TransactionLegacy txn, long startIP, long endIP, long zoneId, long vlanDbId, Long sourceNetworkId, long physicalNetworkId) { - String insertSql = "INSERT INTO `cloud`.`user_ip_address` (public_ip_address, data_center_id, vlan_db_id, mac_address, source_network_id, physical_network_id, uuid) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?), ?, ?, ?)"; + String insertSql = + "INSERT INTO `cloud`.`user_ip_address` (public_ip_address, data_center_id, vlan_db_id, mac_address, source_network_id, physical_network_id, uuid) VALUES (?, ?, ?, (select mac_address from `cloud`.`data_center` where id=?), ?, ?, ?)"; String updateSql = "UPDATE `cloud`.`data_center` set mac_address = mac_address+1 where id=?"; Vector problemIPs = new Vector(); PreparedStatement stmt = null; @@ -486,7 +486,8 @@ public class IPRangeConfig { } public List savePrivateIPRange(TransactionLegacy txn, long startIP, long endIP, long podId, long zoneId) { - 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=?"; Vector problemIPs = new Vector(); diff --git a/server/src/com/cloud/test/PodZoneConfig.java b/server/src/com/cloud/test/PodZoneConfig.java index a5d2b72c30b..cfd8bcec503 100644 --- a/server/src/com/cloud/test/PodZoneConfig.java +++ b/server/src/com/cloud/test/PodZoneConfig.java @@ -27,7 +27,6 @@ import java.util.Vector; import com.cloud.network.Networks.TrafficType; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.NetUtils; @@ -51,11 +50,13 @@ public class PodZoneConfig { String sql = null; if (id != -1) - sql = "INSERT INTO `cloud`.`host_pod_ref` (id, name, data_center_id, gateway, cidr_address, cidr_size) " + "VALUES ('" + id + "','" + name + "','" + dcId + "','" + - gateway + "','" + cidrAddress + "','" + cidrSize + "')"; + sql = + "INSERT INTO `cloud`.`host_pod_ref` (id, name, data_center_id, gateway, cidr_address, cidr_size) " + "VALUES ('" + id + "','" + name + "','" + dcId + + "','" + gateway + "','" + cidrAddress + "','" + cidrSize + "')"; else - sql = "INSERT INTO `cloud`.`host_pod_ref` (name, data_center_id, gateway, cidr_address, cidr_size) " + "VALUES ('" + name + "','" + dcId + "','" + gateway + "','" + - cidrAddress + "','" + cidrSize + "')"; + sql = + "INSERT INTO `cloud`.`host_pod_ref` (name, data_center_id, gateway, cidr_address, cidr_size) " + "VALUES ('" + name + "','" + dcId + "','" + gateway + + "','" + cidrAddress + "','" + cidrSize + "')"; DatabaseConfig.saveSQL(sql, "Failed to save pod due to exception. Please contact Cloud Support."); @@ -124,7 +125,7 @@ public class PodZoneConfig { return "The subnet of the pod you are adding conflicts with the subnet of the Guest IP Network. Please specify a different CIDR."; } else { return "Warning: The subnet of pod " + podName + " in zone " + zoneName + - " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management."; + " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management."; } } @@ -150,10 +151,10 @@ public class PodZoneConfig { String otherPodName = PodZoneConfig.getPodName(otherPodId.longValue(), dcId); if (podName.equals("newPod")) { return "The subnet of the pod you are adding conflicts with the subnet of pod " + otherPodName + " in zone " + zoneName + - ". Please specify a different CIDR."; + ". Please specify a different CIDR."; } else { return "Warning: The pods " + podName + " and " + otherPodName + " in zone " + zoneName + - " have conflicting CIDR subnets. Please change the CIDR of one of these pods."; + " have conflicting CIDR subnets. Please change the CIDR of one of these pods."; } } } @@ -201,8 +202,8 @@ public class PodZoneConfig { "Unable to start DB connection to read vlan DB id. Please contact Cloud Support."); } - public List modifyVlan(String zone, boolean add, String vlanId, String vlanGateway, String vlanNetmask, String pod, String vlanType, String ipRange, long networkId, - long physicalNetworkId) { + public List modifyVlan(String zone, boolean add, String vlanId, String vlanGateway, String vlanNetmask, String pod, String vlanType, String ipRange, + long networkId, long physicalNetworkId) { // Check if the zone is valid long zoneId = getZoneId(zone); if (zoneId == -1) @@ -472,10 +473,12 @@ public class PodZoneConfig { DatabaseConfig.saveSQL(sql, "Failed to delete zone due to exception. Please contact Cloud Support."); } - public void saveVlan(long zoneId, Long podId, String vlanId, String vlanGateway, String vlanNetmask, String vlanType, String ipRange, long networkId, long physicalNetworkId) { - String sql = "INSERT INTO `cloud`.`vlan` (vlan_id, vlan_gateway, vlan_netmask, data_center_id, vlan_type, description, network_id, physical_network_id) " + "VALUES ('" + - vlanId + "','" + vlanGateway + "','" + vlanNetmask + "','" + zoneId + "','" + vlanType + "','" + ipRange + "','" + networkId + "','" + physicalNetworkId + - "')"; + public void saveVlan(long zoneId, Long podId, String vlanId, String vlanGateway, String vlanNetmask, String vlanType, String ipRange, long networkId, + long physicalNetworkId) { + String sql = + "INSERT INTO `cloud`.`vlan` (vlan_id, vlan_gateway, vlan_netmask, data_center_id, vlan_type, description, network_id, physical_network_id) " + "VALUES ('" + + vlanId + "','" + vlanGateway + "','" + vlanNetmask + "','" + zoneId + "','" + vlanType + "','" + ipRange + "','" + networkId + "','" + physicalNetworkId + + "')"; DatabaseConfig.saveSQL(sql, "Failed to save vlan due to exception. Please contact Cloud Support."); } diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java index caac2559128..aaf117d4211 100755 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -27,6 +27,9 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd; import org.apache.cloudstack.api.command.admin.usage.GetUsageRecordsCmd; import org.apache.cloudstack.api.response.UsageTypeResponse; @@ -35,8 +38,6 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.usage.Usage; import org.apache.cloudstack.usage.UsageService; import org.apache.cloudstack.usage.UsageTypes; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.domain.DomainVO; @@ -124,7 +125,7 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag Long domainId = cmd.getDomainId(); String accountName = cmd.getAccountName(); Account userAccount = null; - Account caller = (Account)CallContext.current().getCallingAccount(); + Account caller = CallContext.current().getCallingAccount(); Long usageType = cmd.getUsageType(); Long projectId = cmd.getProjectId(); @@ -183,8 +184,8 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag Date adjustedEndDate = computeAdjustedTime(endDate, usageTZ, false); if (s_logger.isDebugEnabled()) { - s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + startDate + " and " + endDate + ", using pageSize: " + - cmd.getPageSizeVal() + " and startIndex: " + cmd.getStartIndex()); + s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + startDate + " and " + endDate + + ", using pageSize: " + cmd.getPageSizeVal() + " and startIndex: " + cmd.getStartIndex()); } Filter usageFilter = new Filter(UsageVO.class, "startDate", false, cmd.getStartIndex(), cmd.getPageSizeVal()); diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 88c8fb172dd..b8646b056c3 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -39,6 +39,7 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.acl.SecurityChecker; @@ -291,12 +292,12 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M @Override public boolean configure(final String name, final Map params) throws ConfigurationException { - _systemAccount = _accountDao.findById(AccountVO.ACCOUNT_ID_SYSTEM); + _systemAccount = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM); if (_systemAccount == null) { throw new ConfigurationException("Unable to find the system account using " + Account.ACCOUNT_ID_SYSTEM); } - _systemUser = _userDao.findById(UserVO.UID_SYSTEM); + _systemUser = _userDao.findById(User.UID_SYSTEM); if (_systemUser == null) { throw new ConfigurationException("Unable to find the system user using " + User.UID_SYSTEM); } @@ -341,7 +342,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M @Override public boolean isAdmin(short accountType) { - return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); + return ((accountType == Account.ACCOUNT_TYPE_ADMIN) || (accountType == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) || + (accountType == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (accountType == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)); } @Override @@ -397,8 +399,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M Account account = ApiDBUtils.findAccountById(entity.getAccountId()); domainId = account != null ? account.getDomainId() : -1; } - if (entity.getAccountId() != -1 && domainId != -1 && !(entity instanceof VirtualMachineTemplate) && !(accessType != null && accessType == AccessType.UseNetwork) && - !(entity instanceof AffinityGroup)) { + if (entity.getAccountId() != -1 && domainId != -1 && !(entity instanceof VirtualMachineTemplate) && + !(accessType != null && accessType == AccessType.UseNetwork) && !(entity instanceof AffinityGroup)) { List toBeChecked = domains.get(entity.getDomainId()); // for templates, we don't have to do cross domains check if (toBeChecked == null) { @@ -854,15 +856,16 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M @Override @DB @ActionEvents({@ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_CREATE, eventDescription = "creating Account"), - @ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating User")}) - public UserAccount createUserAccount(final String userName, final String password, final String firstName, final String lastName, final String email, final String timezone, - String accountName, final short accountType, Long domainId, final String networkDomain, final Map details, String accountUUID, final String userUUID) { + @ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating User")}) + public UserAccount createUserAccount(final String userName, final String password, final String firstName, final String lastName, final String email, + final String timezone, String accountName, final short accountType, Long domainId, final String networkDomain, final Map details, + String accountUUID, final String userUUID) { if (accountName == null) { accountName = userName; } if (domainId == null) { - domainId = DomainVO.ROOT_DOMAIN; + domainId = Domain.ROOT_DOMAIN; } if (userName.isEmpty()) { @@ -894,7 +897,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -936,8 +939,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M @Override @ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating User") - public UserVO - createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID) { + public UserVO createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, + String userUUID) { // default domain to ROOT if not specified if (domainId == null) { @@ -1343,7 +1346,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } if (account == null || account.getType() == Account.ACCOUNT_TYPE_PROJECT) { - throw new InvalidParameterValueException("Unable to find active account by accountId: " + accountId + " OR by name: " + accountName + " in domain " + domainId); + throw new InvalidParameterValueException("Unable to find active account by accountId: " + accountId + " OR by name: " + accountName + " in domain " + + domainId); } if (account.getId() == Account.ACCOUNT_ID_SYSTEM) { @@ -1432,14 +1436,14 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M // update // itself throw new InvalidParameterValueException("There already exists an account with the name:" + newAccountName + " in the domain:" + domainId + - " with existing account id:" + duplicateAcccount.getId()); + " with existing account id:" + duplicateAcccount.getId()); } if (networkDomain != null && !networkDomain.isEmpty()) { if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -1729,7 +1733,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M throw new CloudRuntimeException("The account cannot be created as domain " + domain.getName() + " is being deleted"); } - if ((domainId != DomainVO.ROOT_DOMAIN) && (accountType == Account.ACCOUNT_TYPE_ADMIN)) { + if ((domainId != Domain.ROOT_DOMAIN) && (accountType == Account.ACCOUNT_TYPE_ADMIN)) { throw new InvalidParameterValueException("Invalid account type " + accountType + " given for an account in domain " + domainId + "; unable to create user."); } @@ -1742,7 +1746,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -1928,7 +1932,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } if (NetUtils.isValidIp(loginIpAddress)) { ActionEventUtils.onActionEvent(user.getId(), user.getAccountId(), user.getDomainId(), EventTypes.EVENT_USER_LOGIN, "user has logged in from IP Address " + - loginIpAddress); + loginIpAddress); } else { ActionEventUtils.onActionEvent(user.getId(), user.getAccountId(), user.getDomainId(), EventTypes.EVENT_USER_LOGIN, "user has logged in. The IP Address cannot be determined"); @@ -1968,7 +1972,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M domainName = domain.getName(); } - if (!userAccount.getState().equalsIgnoreCase(Account.State.enabled.toString()) || !userAccount.getAccountState().equalsIgnoreCase(Account.State.enabled.toString())) { + if (!userAccount.getState().equalsIgnoreCase(Account.State.enabled.toString()) || + !userAccount.getAccountState().equalsIgnoreCase(Account.State.enabled.toString())) { if (s_logger.isInfoEnabled()) { s_logger.info("User " + username + " in domain " + domainName + " is disabled/locked (or account is disabled/locked)"); } diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java index bd3df00a4b1..89a918ee68e 100644 --- a/server/src/com/cloud/user/DomainManagerImpl.java +++ b/server/src/com/cloud/user/DomainManagerImpl.java @@ -26,6 +26,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd; import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd; import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; @@ -149,7 +150,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom Account caller = CallContext.current().getCallingAccount(); if (parentId == null) { - parentId = Long.valueOf(DomainVO.ROOT_DOMAIN); + parentId = Long.valueOf(Domain.ROOT_DOMAIN); } DomainVO parentDomain = _domainDao.findById(parentId); @@ -175,7 +176,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } @@ -235,7 +236,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom if (domain == null) { throw new InvalidParameterValueException("Failed to delete domain " + domainId + ", domain not found"); - } else if (domainId == DomainVO.ROOT_DOMAIN) { + } else if (domainId == Domain.ROOT_DOMAIN) { throw new PermissionDeniedException("Can't delete ROOT domain"); } @@ -258,8 +259,9 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom if ((cleanup != null) && cleanup.booleanValue()) { if (!cleanupDomain(domain.getId(), ownerId)) { rollBackState = true; - CloudRuntimeException e = new CloudRuntimeException("Failed to clean up domain resources and sub domains, delete failed on domain " + domain.getName() + - " (id: " + domain.getId() + ")."); + CloudRuntimeException e = + new CloudRuntimeException("Failed to clean up domain resources and sub domains, delete failed on domain " + domain.getName() + " (id: " + + domain.getId() + ")."); e.addProxyObject(domain.getUuid(), "domainId"); throw e; } @@ -275,8 +277,9 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom if (accountsForCleanup.isEmpty() && networkIds.isEmpty() && !hasDedicatedResources) { if (!_domainDao.remove(domain.getId())) { rollBackState = true; - CloudRuntimeException e = new CloudRuntimeException("Delete failed on domain " + domain.getName() + " (id: " + domain.getId() + - "); Please make sure all users and sub domains have been removed from the domain before deleting"); + CloudRuntimeException e = + new CloudRuntimeException("Delete failed on domain " + domain.getName() + " (id: " + domain.getId() + + "); Please make sure all users and sub domains have been removed from the domain before deleting"); e.addProxyObject(domain.getUuid(), "domainId"); throw e; } @@ -309,7 +312,8 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom } finally { //when success is false if (rollBackState) { - s_logger.debug("Changing domain id=" + domain.getId() + " state back to " + Domain.State.Active + " because it can't be removed due to resources referencing to it"); + s_logger.debug("Changing domain id=" + domain.getId() + " state back to " + Domain.State.Active + + " because it can't be removed due to resources referencing to it"); domain.setState(Domain.State.Active); _domainDao.update(domain.getId(), domain); } @@ -528,7 +532,8 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom return new Pair, Integer>(result.first(), result.second()); } - private Pair, Integer> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path, boolean listActiveOnly) { + private Pair, Integer> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path, + boolean listActiveOnly) { SearchCriteria sc = _domainDao.createSearchCriteria(); if (keyword != null) { @@ -590,8 +595,8 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom boolean sameDomain = (domains.size() == 1 && domains.get(0).getId() == domainId); if (!domains.isEmpty() && !sameDomain) { - InvalidParameterValueException ex = new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + - "' since it already exists in the system"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + "' since it already exists in the system"); ex.addProxyObject(domain.getUuid(), "domainId"); throw ex; } @@ -602,7 +607,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom if (!NetUtils.verifyDomainName(networkDomain)) { throw new InvalidParameterValueException( "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'); can't start or end with \"-\""); + + "and the hyphen ('-'); can't start or end with \"-\""); } } diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java index 775ebb7cdf8..039bb318905 100644 --- a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java +++ b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java @@ -16,16 +16,13 @@ // under the License. package com.cloud.uuididentity; -import java.util.Map; - import javax.ejb.Local; import javax.inject.Inject; -import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.IdentityService; import org.springframework.stereotype.Component; -import com.cloud.utils.component.Manager; +import org.apache.cloudstack.api.IdentityService; + import com.cloud.utils.component.ManagerBase; import com.cloud.uuididentity.dao.IdentityDao; diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java index f9cc9b35437..c5d2c434b0b 100644 --- a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java +++ b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java @@ -32,7 +32,6 @@ import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.utils.Pair; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; @Component @@ -43,6 +42,7 @@ public class IdentityDaoImpl extends GenericDaoBase implements public IdentityDaoImpl() { } + @Override @DB public Long getIdentityId(String tableName, String identityString) { assert (tableName != null); @@ -61,9 +61,9 @@ public class IdentityDaoImpl extends GenericDaoBase implements pstmt = txn.prepareAutoCloseStatement(String.format("SELECT id FROM `%s` WHERE id=? OR uuid=?", tableName) - // TODO : after graceful period, use following line turn on more secure check - // String.format("SELECT id FROM %s WHERE (id=? AND uuid IS NULL) OR uuid=?", mapper.entityTableName()) - ); + // TODO : after graceful period, use following line turn on more secure check + // String.format("SELECT id FROM %s WHERE (id=? AND uuid IS NULL) OR uuid=?", mapper.entityTableName()) + ); long id = 0; try { @@ -150,8 +150,8 @@ public class IdentityDaoImpl extends GenericDaoBase implements try { try { pstmt = txn.prepareAutoCloseStatement(String.format("SELECT uuid FROM `%s` WHERE id=? OR uuid=?", tableName) - // String.format("SELECT uuid FROM %s WHERE (id=? AND uuid IS NULL) OR uuid=?", tableName) - ); + // String.format("SELECT uuid FROM %s WHERE (id=? AND uuid IS NULL) OR uuid=?", tableName) + ); long id = 0; try { @@ -181,6 +181,7 @@ public class IdentityDaoImpl extends GenericDaoBase implements return identityString; } + @Override @DB public void initializeDefaultUuid(String tableName) { assert (tableName != null); diff --git a/server/src/com/cloud/vm/SystemVmLoadScanner.java b/server/src/com/cloud/vm/SystemVmLoadScanner.java index dfd5c5316e8..3e9c953aee9 100644 --- a/server/src/com/cloud/vm/SystemVmLoadScanner.java +++ b/server/src/com/cloud/vm/SystemVmLoadScanner.java @@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; + import org.apache.cloudstack.managed.context.ManagedContextRunnable; import com.cloud.utils.Pair; diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/com/cloud/vm/UserVmManager.java index fec24107fd9..b7b4bd5b82a 100755 --- a/server/src/com/cloud/vm/UserVmManager.java +++ b/server/src/com/cloud/vm/UserVmManager.java @@ -115,6 +115,6 @@ public interface UserVmManager extends UserVmService { void collectVmDiskStatistics(UserVmVO userVm); - UserVm updateVirtualMachine(long id, String displayName, String group, Boolean ha, Boolean isDisplayVmEnabled, Long osTypeId, String userData, Boolean isDynamicallyScalable, - HTTPMethod httpMethod) throws ResourceUnavailableException, InsufficientCapacityException; + UserVm updateVirtualMachine(long id, String displayName, String group, Boolean ha, Boolean isDisplayVmEnabled, Long osTypeId, String userData, + Boolean isDynamicallyScalable, HTTPMethod httpMethod) throws ResourceUnavailableException, InsufficientCapacityException; } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index dfcd1c12af3..00d8063da4e 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -555,8 +555,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } Network defaultNetwork = _networkDao.findById(defaultNic.getNetworkId()); - NicProfile defaultNicProfile = new NicProfile(defaultNic, defaultNetwork, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(defaultNetwork), - _networkModel.getNetworkTag(template.getHypervisorType(), defaultNetwork)); + NicProfile defaultNicProfile = + new NicProfile(defaultNic, defaultNetwork, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(defaultNetwork), + _networkModel.getNetworkTag(template.getHypervisorType(), defaultNetwork)); VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vmInstance); vmProfile.setParameter(VirtualMachineProfile.Param.VmPassword, password); @@ -624,7 +625,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir SSHKeyPairVO s = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName()); if (s == null) { throw new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' does not exist for account " + owner.getAccountName() + - " in specified domain id"); + " in specified domain id"); } _accountMgr.checkAccess(caller, null, true, userVm); @@ -662,8 +663,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } Network defaultNetwork = _networkDao.findById(defaultNic.getNetworkId()); - NicProfile defaultNicProfile = new NicProfile(defaultNic, defaultNetwork, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(defaultNetwork), - _networkModel.getNetworkTag(template.getHypervisorType(), defaultNetwork)); + NicProfile defaultNicProfile = + new NicProfile(defaultNic, defaultNetwork, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(defaultNetwork), _networkModel.getNetworkTag( + template.getHypervisorType(), defaultNetwork)); VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vmInstance); @@ -814,8 +816,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } // Generate usage event for VM upgrade - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_UPGRADE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), vmInstance.getHostName(), - vmInstance.getServiceOfferingId(), vmInstance.getTemplateId(), vmInstance.getHypervisorType().toString(), VirtualMachine.class.getName(), vmInstance.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_UPGRADE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), + vmInstance.getHostName(), vmInstance.getServiceOfferingId(), vmInstance.getTemplateId(), vmInstance.getHypervisorType().toString(), + VirtualMachine.class.getName(), vmInstance.getUuid()); return _vmDao.findById(vmInstance.getId()); } @@ -1074,7 +1077,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (existing == null) { s_logger.warn("Failed to update default nic, no nic profile found for existing default network"); - throw new CloudRuntimeException("Failed to find a nic profile for the existing default network. This is bad and probably means some sort of configuration corruption"); + throw new CloudRuntimeException( + "Failed to find a nic profile for the existing default network. This is bad and probably means some sort of configuration corruption"); } Network oldDefaultNetwork = null; @@ -1120,17 +1124,17 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir long newNetworkOfferingId = network.getNetworkOfferingId(); UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), oldNicIdString, oldNetworkOfferingId, null, 1L, VirtualMachine.class.getName(), vmInstance.getUuid()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), nicIdString, - newNetworkOfferingId, null, 1L, VirtualMachine.class.getName(), vmInstance.getUuid()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), nicIdString, - newNetworkOfferingId, null, 0L, VirtualMachine.class.getName(), vmInstance.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), + nicIdString, newNetworkOfferingId, null, 1L, VirtualMachine.class.getName(), vmInstance.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), + nicIdString, newNetworkOfferingId, null, 0L, VirtualMachine.class.getName(), vmInstance.getUuid()); UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), oldNicIdString, oldNetworkOfferingId, null, 0L, VirtualMachine.class.getName(), vmInstance.getUuid()); return _vmDao.findById(vmInstance.getId()); } throw new CloudRuntimeException("something strange happened, new default network(" + newdefault.getId() + ") is not null, and is not equal to the network(" + - nic.getNetworkId() + ") of the chosen nic"); + nic.getNetworkId() + ") of the chosen nic"); } @Override @@ -1200,8 +1204,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } @Override - public boolean upgradeVirtualMachine(Long vmId, Long newServiceOfferingId) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException { + public boolean upgradeVirtualMachine(Long vmId, Long newServiceOfferingId) throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException { // Verify input parameters VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId); @@ -1241,10 +1245,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir int currentSpeed = currentServiceOffering.getSpeed(); // Don't allow to scale when (Any of the new values less than current values) OR (All current and new values are same) - if ((newSpeed < currentSpeed || newMemory < currentMemory || newCpu < currentCpu) || (newSpeed == currentSpeed && newMemory == currentMemory && newCpu == currentCpu)) { - throw new InvalidParameterValueException("Only scaling up the vm is supported, new service offering(speed=" + newSpeed + ",cpu=" + newCpu + ",memory=," + newMemory + - ")" + " should have at least one value(cpu/ram) greater than old value and no resource value less than older(speed=" + - currentSpeed + ",cpu=" + currentCpu + ",memory=," + currentMemory + ")"); + if ((newSpeed < currentSpeed || newMemory < currentMemory || newCpu < currentCpu) || + (newSpeed == currentSpeed && newMemory == currentMemory && newCpu == currentCpu)) { + throw new InvalidParameterValueException("Only scaling up the vm is supported, new service offering(speed=" + newSpeed + ",cpu=" + newCpu + ",memory=," + + newMemory + ")" + " should have at least one value(cpu/ram) greater than old value and no resource value less than older(speed=" + currentSpeed + + ",cpu=" + currentCpu + ",memory=," + currentMemory + ")"); } // Check resource limits @@ -1282,8 +1287,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // #1 Check existing host has capacity if (!excludes.shouldAvoid(ApiDBUtils.findHostById(vmInstance.getHostId()))) { - existingHostHasCapacity = _capacityMgr.checkIfHostHasCapacity(vmInstance.getHostId(), newServiceOffering.getSpeed() - currentServiceOffering.getSpeed(), - (newServiceOffering.getRamSize() - currentServiceOffering.getRamSize()) * 1024L * 1024L, false, ApiDBUtils.getCpuOverprovisioningFactor(), 1f, false); // TO DO fill it with mem. + existingHostHasCapacity = + _capacityMgr.checkIfHostHasCapacity(vmInstance.getHostId(), newServiceOffering.getSpeed() - currentServiceOffering.getSpeed(), + (newServiceOffering.getRamSize() - currentServiceOffering.getRamSize()) * 1024L * 1024L, false, + ApiDBUtils.getCpuOverprovisioningFactor(), 1f, false); // TO DO fill it with mem. excludes.addHost(vmInstance.getHostId()); } @@ -1437,8 +1444,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir offeringId = offering.getId(); } } - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), - offeringId, templateId, volume.getSize(), Volume.class.getName(), volume.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), + volume.getName(), offeringId, templateId, volume.getSize(), Volume.class.getName(), volume.getUuid()); } } @@ -1809,8 +1816,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir for (Nic nic : nics) { Network network = _networkDao.findById(nic.getNetworkId()); - NicProfile nicProfile = new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag( - template.getHypervisorType(), network)); + NicProfile nicProfile = + new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag( + template.getHypervisorType(), network)); VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm); @@ -1829,7 +1837,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override @ActionEvent(eventType = EventTypes.EVENT_VM_START, eventDescription = "starting Vm", async = true) - public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { return startVirtualMachine(cmd.getId(), cmd.getHostId(), null).first(); } @@ -2073,11 +2082,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "deploying Vm", create = true) - public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, - Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List affinityGroupIdList, Integer cpuSpeed, - Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, - StorageUnavailableException, ResourceAllocationException { + public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, + List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, + List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = CallContext.current().getCallingAccount(); List networkList = new ArrayList(); @@ -2112,15 +2121,17 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (s_logger.isDebugEnabled()) { s_logger.debug("Couldn't find default security group for the account " + owner + " so creating a new one"); } - defaultGroup = _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, - owner.getDomainId(), owner.getId(), owner.getAccountName()); + defaultGroup = + _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, + owner.getDomainId(), owner.getId(), owner.getAccountName()); securityGroupIdList.add(defaultGroup.getId()); } } } - return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, - userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, rootDiskSize); + return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, + httpmethod, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, + rootDiskSize); } @@ -2129,8 +2140,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir public UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, - List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { + List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = CallContext.current().getCallingAccount(); List networkList = new ArrayList(); @@ -2219,24 +2230,26 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (s_logger.isDebugEnabled()) { s_logger.debug("Couldn't find default security group for the account " + owner + " so creating a new one"); } - defaultGroup = _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, - owner.getDomainId(), owner.getId(), owner.getAccountName()); + defaultGroup = + _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, + owner.getDomainId(), owner.getId(), owner.getAccountName()); securityGroupIdList.add(defaultGroup.getId()); } } } - return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, - userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, rootDiskSize); + return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, + httpmethod, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, + rootDiskSize); } @Override @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "deploying Vm", create = true) - public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, Account owner, - String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayvm, String keyboard, List affinityGroupIdList, Integer cpuSpeed, - Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, - StorageUnavailableException, ResourceAllocationException { + public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, + Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, + String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, Boolean displayvm, String keyboard, + List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = CallContext.current().getCallingAccount(); List networkList = new ArrayList(); @@ -2259,23 +2272,26 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir List requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (requiredOfferings.size() < 1) { throw new InvalidParameterValueException("Unable to find network offering with availability=" + Availability.Required + - " to automatically create the network as a part of vm creation"); + " to automatically create the network as a part of vm creation"); } if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) { // get Virtual networks List virtualNetworks = _networkModel.listNetworksForAccount(owner.getId(), zone.getId(), Network.GuestType.Isolated); if (virtualNetworks.isEmpty()) { - long physicalNetworkId = _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); + long physicalNetworkId = + _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); // Validate physical network PhysicalNetwork physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); if (physicalNetwork == null) { throw new InvalidParameterValueException("Unable to find physical network with id: " + physicalNetworkId + " and tag: " + - requiredOfferings.get(0).getTags()); + requiredOfferings.get(0).getTags()); } - s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + " as a part of deployVM process"); - Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network", - null, null, null, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null); + s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + + " as a part of deployVM process"); + Network newNetwork = + _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network", null, + null, null, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null); defaultNetwork = _networkDao.findById(newNetwork.getId()); } else if (virtualNetworks.size() > 1) { throw new InvalidParameterValueException("More than 1 default Isolated networks are found for account " + owner + "; please specify networkIds"); @@ -2283,7 +2299,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir defaultNetwork = _networkDao.findById(virtualNetworks.get(0).getId()); } } else { - throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); + throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + + NetworkOffering.State.Enabled); } networkList.add(defaultNetwork); @@ -2298,7 +2315,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // Only ISOs, XenServer, KVM, and VmWare template types are // supported for vpc networks if (template.getFormat() != ImageFormat.ISO && !vpcSupportedHTypes.contains(template.getHypervisorType())) { - throw new InvalidParameterValueException("Can't create vm from template with hypervisor " + template.getHypervisorType() + " in vpc network " + network); + throw new InvalidParameterValueException("Can't create vm from template with hypervisor " + template.getHypervisorType() + " in vpc network " + + network); } else if (template.getFormat() == ImageFormat.ISO && !vpcSupportedHTypes.contains(hypervisor)) { // Only XenServer, KVM, and VMware hypervisors are supported // for vpc networks @@ -2318,24 +2336,23 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } - return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, null, group, httpmethod, userData, - sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayvm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, rootDiskSize); + return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, null, group, httpmethod, + userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, displayvm, keyboard, affinityGroupIdList, cpuSpeed, memory, cpuNumber, rootDiskSize); } public void checkNameForRFCCompliance(String name) { if (!NetUtils.verifyDomainNameLabel(name, true)) { - throw new InvalidParameterValueException( - "Invalid name. Vm name can contain ASCII letters 'a' through 'z', the digits '0' through '9', " - + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit"); + throw new InvalidParameterValueException("Invalid name. Vm name can contain ASCII letters 'a' through 'z', the digits '0' through '9', " + + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit"); } } @DB - protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate tmplt, String hostName, String displayName, Account owner, - Long diskOfferingId, Long diskSize, List networkList, List securityGroupIdList, String group, HTTPMethod httpmethod, String userData, String sshKeyPair, - HypervisorType hypervisor, Account caller, Map requestedIps, IpAddresses defaultIps, Boolean isDisplayVmEnabled, String keyboard, - List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) throws InsufficientCapacityException, ResourceUnavailableException, - ConcurrentOperationException, StorageUnavailableException, ResourceAllocationException { + protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate tmplt, String hostName, String displayName, + Account owner, Long diskOfferingId, Long diskSize, List networkList, List securityGroupIdList, String group, HTTPMethod httpmethod, + String userData, String sshKeyPair, HypervisorType hypervisor, Account caller, Map requestedIps, IpAddresses defaultIps, + Boolean isDisplayVmEnabled, String keyboard, List affinityGroupIdList, Integer cpuSpeed, Integer memory, Integer cpuNumber, Long rootDiskSize) + throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException, ResourceAllocationException { _accountMgr.checkAccess(caller, null, true, owner); @@ -2409,7 +2426,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir throw new InvalidParameterValueException("Unable to find affinity group " + ag); } else if (!_affinityGroupService.isAffinityGroupProcessorAvailable(ag.getType())) { throw new InvalidParameterValueException("Affinity group type is not supported for group: " + ag + " ,type: " + ag.getType() + - " , Please try again after removing the affinity group"); + " , Please try again after removing the affinity group"); } else { // verify permissions if (ag.getAclType() == ACLType.Domain) { @@ -2632,8 +2649,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir List hostNames = _vmInstanceDao.listDistinctHostNames(ntwkId); // * verify that there are no duplicates if (hostNames.contains(hostName)) { - throw new InvalidParameterValueException("The vm with hostName " + hostName + " already exists in the network domain: " + ntwkDomain.getKey() + "; network=" + - _networkModel.getNetwork(ntwkId)); + throw new InvalidParameterValueException("The vm with hostName " + hostName + " already exists in the network domain: " + ntwkDomain.getKey() + + "; network=" + _networkModel.getNetwork(ntwkId)); } } } @@ -2645,8 +2662,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir hypervisorType = template.getHypervisorType(); } - UserVmVO vm = commitUserVm(zone, template, hostName, displayName, owner, diskOfferingId, diskSize, userData, hypervisor, caller, isDisplayVmEnabled, keyboard, accountId, - offering, isIso, sshPublicKey, networkNicMap, id, instanceName, uuidName, hypervisorType, rootDiskSize, details); + UserVmVO vm = + commitUserVm(zone, template, hostName, displayName, owner, diskOfferingId, diskSize, userData, hypervisor, caller, isDisplayVmEnabled, keyboard, accountId, + offering, isIso, sshPublicKey, networkNicMap, id, instanceName, uuidName, hypervisorType, rootDiskSize, details); // Assign instance to the group try { @@ -2681,8 +2699,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir return Transaction.execute(new TransactionCallbackWithException() { @Override public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCapacityException { - UserVmVO vm = new UserVmVO(id, instanceName, displayName, template.getId(), hypervisorType, template.getGuestOSId(), offering.getOfferHA(), - offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(), offering.getId(), userData, hostName, diskOfferingId); + UserVmVO vm = + new UserVmVO(id, instanceName, displayName, template.getId(), hypervisorType, template.getGuestOSId(), offering.getOfferHA(), + offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(), offering.getId(), userData, hostName, diskOfferingId); vm.setUuid(uuidName); vm.setDynamicallyScalable(template.isDynamicallyScalable()); if (sshPublicKey != null) { @@ -2760,8 +2779,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir hypervisor.name(), guestOSCategory.getName(), offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan); } else { - _orchSrvc.createVirtualMachine(vm.getUuid(), Long.toString(owner.getAccountId()), Long.toString(template.getId()), hostName, displayName, hypervisor.name(), - offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan, rootDiskSize); + _orchSrvc.createVirtualMachine(vm.getUuid(), Long.toString(owner.getAccountId()), Long.toString(template.getId()), hostName, displayName, + hypervisor.name(), offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan, + rootDiskSize); } if (s_logger.isDebugEnabled()) { @@ -2770,15 +2790,15 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir CallContext.current().setEventDetails("Vm Id: " + vm.getId()); if (!offering.isDynamic()) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(), - hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), + template.getId(), hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid()); } else { HashMap vmdetailsMap = new HashMap(); for (UserVmDetailVO vmdetail : vmdetails) { vmdetailsMap.put(vmdetail.getName(), vmdetail.getValue()); } - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(), - hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vmdetailsMap); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), + template.getId(), hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vmdetailsMap); } //Update Resource Count for the given account @@ -3085,7 +3105,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir assert (offering.getAssociatePublicIP() == true) : "User VM should not have system owned public IP associated with it when offering configured not to associate public IP."; _rulesMgr.disableStaticNat(ip.getId(), ctx.getCallingAccount(), ctx.getCallingUserId(), true); } catch (Exception ex) { - s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", ex); + s_logger.warn("Failed to disable static nat and release system ip " + ip + " as a part of vm " + profile.getVirtualMachine() + " stop due to exception ", + ex); } } @@ -3106,8 +3127,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } @Override - public Pair> startVirtualMachine(long vmId, Long hostId, Map additionalParams) - throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public Pair> + startVirtualMachine(long vmId, Long hostId, Map additionalParams) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { // Input validation Account callerAccount = CallContext.current().getCallingAccount(); UserVO callerUser = _userDao.findById(CallContext.current().getCallingUserId()); @@ -3304,7 +3326,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } if (diskStatsAnswer != null) { if (!diskStatsAnswer.getResult()) { - s_logger.warn("Error while collecting disk stats vm: " + userVm.getHostName() + " from host: " + host.getName() + "; details: " + diskStatsAnswer.getDetails()); + s_logger.warn("Error while collecting disk stats vm: " + userVm.getHostName() + " from host: " + host.getName() + "; details: " + + diskStatsAnswer.getDetails()); return; } try { @@ -3323,7 +3346,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir SearchCriteria sc_volume = _volsDao.createSearchCriteria(); sc_volume.addAnd("path", SearchCriteria.Op.EQ, vmDiskStat.getPath()); VolumeVO volume = _volsDao.search(sc_volume, null).get(0); - VmDiskStatisticsVO previousVmDiskStats = _vmDiskStatsDao.findBy(userVm.getAccountId(), userVm.getDataCenterId(), userVm.getId(), volume.getId()); + VmDiskStatisticsVO previousVmDiskStats = + _vmDiskStatsDao.findBy(userVm.getAccountId(), userVm.getDataCenterId(), userVm.getId(), volume.getId()); VmDiskStatisticsVO vmDiskStat_lock = _vmDiskStatsDao.lock(userVm.getAccountId(), userVm.getDataCenterId(), userVm.getId(), volume.getId()); if ((vmDiskStat.getIORead() == 0) && (vmDiskStat.getIOWrite() == 0) && (vmDiskStat.getBytesRead() == 0) && (vmDiskStat.getBytesWrite() == 0)) { @@ -3332,41 +3356,43 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } if (vmDiskStat_lock == null) { - s_logger.warn("unable to find vm disk stats from host for account: " + userVm.getAccountId() + " with vmId: " + userVm.getId() + " and volumeId:" + - volume.getId()); + s_logger.warn("unable to find vm disk stats from host for account: " + userVm.getAccountId() + " with vmId: " + userVm.getId() + + " and volumeId:" + volume.getId()); continue; } if (previousVmDiskStats != null && ((previousVmDiskStats.getCurrentIORead() != vmDiskStat_lock.getCurrentIORead()) || ((previousVmDiskStats.getCurrentIOWrite() != vmDiskStat_lock.getCurrentIOWrite()) || - (previousVmDiskStats.getCurrentBytesRead() != vmDiskStat_lock.getCurrentBytesRead()) || (previousVmDiskStats.getCurrentBytesWrite() != vmDiskStat_lock.getCurrentBytesWrite())))) { - s_logger.debug("vm disk stats changed from the time GetVmDiskStatsCommand was sent. " + "Ignoring current answer. Host: " + host.getName() + - " . VM: " + vmDiskStat.getVmName() + " IO Read: " + vmDiskStat.getIORead() + " IO Write: " + vmDiskStat.getIOWrite() + - " Bytes Read: " + vmDiskStat.getBytesRead() + " Bytes Write: " + vmDiskStat.getBytesWrite()); + (previousVmDiskStats.getCurrentBytesRead() != vmDiskStat_lock.getCurrentBytesRead()) || (previousVmDiskStats.getCurrentBytesWrite() != vmDiskStat_lock.getCurrentBytesWrite())))) { + s_logger.debug("vm disk stats changed from the time GetVmDiskStatsCommand was sent. " + "Ignoring current answer. Host: " + + host.getName() + " . VM: " + vmDiskStat.getVmName() + " IO Read: " + vmDiskStat.getIORead() + " IO Write: " + + vmDiskStat.getIOWrite() + " Bytes Read: " + vmDiskStat.getBytesRead() + " Bytes Write: " + vmDiskStat.getBytesWrite()); continue; } if (vmDiskStat_lock.getCurrentIORead() > vmDiskStat.getIORead()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Read # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + host.getName() + - " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIORead() + " Stored: " + vmDiskStat_lock.getCurrentIORead()); + s_logger.debug("Read # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIORead() + " Stored: " + + vmDiskStat_lock.getCurrentIORead()); } vmDiskStat_lock.setNetIORead(vmDiskStat_lock.getNetIORead() + vmDiskStat_lock.getCurrentIORead()); } vmDiskStat_lock.setCurrentIORead(vmDiskStat.getIORead()); if (vmDiskStat_lock.getCurrentIOWrite() > vmDiskStat.getIOWrite()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Write # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + host.getName() + - " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIOWrite() + " Stored: " + vmDiskStat_lock.getCurrentIOWrite()); + s_logger.debug("Write # of IO that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getIOWrite() + " Stored: " + + vmDiskStat_lock.getCurrentIOWrite()); } vmDiskStat_lock.setNetIOWrite(vmDiskStat_lock.getNetIOWrite() + vmDiskStat_lock.getCurrentIOWrite()); } vmDiskStat_lock.setCurrentIOWrite(vmDiskStat.getIOWrite()); if (vmDiskStat_lock.getCurrentBytesRead() > vmDiskStat.getBytesRead()) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Read # of Bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + host.getName() + - " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesRead() + " Stored: " + - vmDiskStat_lock.getCurrentBytesRead()); + s_logger.debug("Read # of Bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesRead() + " Stored: " + + vmDiskStat_lock.getCurrentBytesRead()); } vmDiskStat_lock.setNetBytesRead(vmDiskStat_lock.getNetBytesRead() + vmDiskStat_lock.getCurrentBytesRead()); } @@ -3374,8 +3400,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (vmDiskStat_lock.getCurrentBytesWrite() > vmDiskStat.getBytesWrite()) { if (s_logger.isDebugEnabled()) { s_logger.debug("Write # of Bytes that's less than the last one. " + "Assuming something went wrong and persisting it. Host: " + - host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesWrite() + " Stored: " + - vmDiskStat_lock.getCurrentBytesWrite()); + host.getName() + " . VM: " + vmDiskStat.getVmName() + " Reported: " + vmDiskStat.getBytesWrite() + " Stored: " + + vmDiskStat_lock.getCurrentBytesWrite()); } vmDiskStat_lock.setNetBytesWrite(vmDiskStat_lock.getNetBytesWrite() + vmDiskStat_lock.getCurrentBytesWrite()); } @@ -3439,8 +3465,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } @Override - public Pair, Integer> searchForUserVMs(Criteria c, Account caller, Long domainId, boolean isRecursive, List permittedAccounts, boolean listAll, - ListProjectResourcesCriteria listProjectResourcesCriteria, Map tags) { + public Pair, Integer> searchForUserVMs(Criteria c, Account caller, Long domainId, boolean isRecursive, List permittedAccounts, + boolean listAll, ListProjectResourcesCriteria listProjectResourcesCriteria, Map tags) { Filter searchFilter = new Filter(UserVmJoinVO.class, c.getOrderBy(), c.getAscending(), c.getOffset(), c.getLimit()); //first search distinct vm id by using query criteria and pagination @@ -3673,7 +3699,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir HypervisorType destHypervisorType = _clusterDao.findById(destPool.getClusterId()).getHypervisorType(); if (vm.getHypervisorType() != destHypervisorType) { - throw new InvalidParameterValueException("hypervisor is not compatible: dest: " + destHypervisorType.toString() + ", vm: " + vm.getHypervisorType().toString()); + throw new InvalidParameterValueException("hypervisor is not compatible: dest: " + destHypervisorType.toString() + ", vm: " + + vm.getHypervisorType().toString()); } _itMgr.storageMigration(vm.getUuid(), destPool); return _vmDao.findById(vm.getId()); @@ -3700,8 +3727,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override @ActionEvent(eventType = EventTypes.EVENT_VM_MIGRATE, eventDescription = "migrating VM", async = true) - public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException { + public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException { // access check - only root admin can migrate VM Account caller = CallContext.current().getCallingAccount(); if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { @@ -3725,7 +3752,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir throw ex; } if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && - !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { + !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm) && + !vm.getHypervisorType().equals(HypervisorType.Simulator)) { if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm, cannot migrate this VM."); } @@ -3747,8 +3775,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // check if host is UP if (destinationHost.getState() != com.cloud.host.Status.Up || destinationHost.getResourceState() != ResourceState.Enabled) { - throw new InvalidParameterValueException("Cannot migrate VM, destination host is not in correct state, has status: " + destinationHost.getState() + ", state: " + - destinationHost.getResourceState()); + throw new InvalidParameterValueException("Cannot migrate VM, destination host is not in correct state, has status: " + destinationHost.getState() + + ", state: " + destinationHost.getResourceState()); } if (vm.getType() != VirtualMachine.Type.User) { @@ -3775,10 +3803,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (_capacityMgr.checkIfHostReachMaxGuestLimit(destinationHostVO)) { if (s_logger.isDebugEnabled()) { s_logger.debug("Host name: " + destinationHost.getName() + ", hostId: " + destinationHost.getId() + - " already has max Running VMs(count includes system VMs), cannot migrate to this host"); + " already has max Running VMs(count includes system VMs), cannot migrate to this host"); } throw new VirtualMachineMigrationException("Destination host, hostId: " + destinationHost.getId() + - " already has max Running VMs(count includes system VMs), cannot migrate to this host"); + " already has max Running VMs(count includes system VMs), cannot migrate to this host"); } UserVmVO uservm = _vmDao.findById(vmId); @@ -3858,14 +3886,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir //if hosts are dedicated to different account/domains, raise an alert if (srcExplDedicated && destExplDedicated) { if ((accountOfDedicatedHost(srcHost) != null) && (accountOfDedicatedHost(srcHost) != accountOfDedicatedHost(destHost))) { - String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(srcHost) + " to host " + - destHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(destHost); + String msg = + "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(srcHost) + " to host " + + destHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(destHost); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg); s_logger.warn(msg); } if ((domainOfDedicatedHost(srcHost) != null) && (domainOfDedicatedHost(srcHost) != domainOfDedicatedHost(destHost))) { - String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(srcHost) + " to host " + - destHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(destHost); + String msg = + "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(srcHost) + " to host " + + destHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(destHost); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg); s_logger.warn(msg); } @@ -3889,8 +3919,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (!isServiceOfferingUsingPlannerInPreferredMode(vm.getServiceOfferingId())) { //Check if all vms on destination host are created using strict implicit mode if (!checkIfAllVmsCreatedInStrictMode(accountOfVm, vmsOnDest)) { - msg = "VM of account " + accountOfVm + " with strict implicit deployment planner being migrated to host " + destHost.getName() + - " not having all vms strict implicitly dedicated to account " + accountOfVm; + msg = + "VM of account " + accountOfVm + " with strict implicit deployment planner being migrated to host " + destHost.getName() + + " not having all vms strict implicitly dedicated to account " + accountOfVm; } } else { //If vm is deployed using preferred implicit planner, check if all vms on destination host must be @@ -3898,8 +3929,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir for (VMInstanceVO vmsDest : vmsOnDest) { ServiceOfferingVO destPlanner = _offeringDao.findById(vm.getId(), vmsDest.getServiceOfferingId()); if (!((destPlanner.getDeploymentPlanner() != null && destPlanner.getDeploymentPlanner().equals("ImplicitDedicationPlanner")) && vmsDest.getAccountId() == accountOfVm)) { - msg = "VM of account " + accountOfVm + " with preffered implicit deployment planner being migrated to host " + destHost.getName() + - " not having all vms implicitly dedicated to account " + accountOfVm; + msg = + "VM of account " + accountOfVm + " with preffered implicit deployment planner being migrated to host " + destHost.getName() + + " not having all vms implicitly dedicated to account " + accountOfVm; } } } @@ -3977,7 +4009,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir createdByImplicitStrict = false; break; } else if (isServiceOfferingUsingPlannerInPreferredMode(vm.getServiceOfferingId()) || vm.getAccountId() != accountId) { - s_logger.info("Host " + vm.getHostId() + " found to be running a vm created by an implicit planner" + " in preferred mode, or running vms of other account"); + s_logger.info("Host " + vm.getHostId() + " found to be running a vm created by an implicit planner" + + " in preferred mode, or running vms of other account"); createdByImplicitStrict = false; break; } @@ -4030,7 +4063,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && - !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { + !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm) && + !vm.getHypervisorType().equals(HypervisorType.Simulator)) { throw new InvalidParameterValueException("Unsupported hypervisor type for vm migration, we support" + " XenServer/VMware/KVM only"); } @@ -4038,25 +4072,27 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir Host srcHost = _resourceMgr.getHost(srcHostId); // Check if src and destination hosts are valid and migrating to same host if (destinationHost.getId() == srcHostId) { - throw new InvalidParameterValueException("Cannot migrate VM, VM is already present on this host, please" + " specify valid destination host to migrate the VM"); + throw new InvalidParameterValueException("Cannot migrate VM, VM is already present on this host, please" + + " specify valid destination host to migrate the VM"); } // Check if the source and destination hosts are of the same type and support storage motion. if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()) && srcHost.getHypervisorVersion().equals(destinationHost.getHypervisorVersion()))) { throw new CloudRuntimeException("The source and destination hosts are not of the same type and version. " + "Source hypervisor type and version: " + - srcHost.getHypervisorType().toString() + " " + srcHost.getHypervisorVersion() + ", Destination hypervisor type and version: " + - destinationHost.getHypervisorType().toString() + " " + destinationHost.getHypervisorVersion()); + srcHost.getHypervisorType().toString() + " " + srcHost.getHypervisorVersion() + ", Destination hypervisor type and version: " + + destinationHost.getHypervisorType().toString() + " " + destinationHost.getHypervisorVersion()); } HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); if (!capabilities.isStorageMotionSupported()) { - throw new CloudRuntimeException("Migration with storage isn't supported on hypervisor " + srcHost.getHypervisorType() + " of version " + srcHost.getHypervisorVersion()); + throw new CloudRuntimeException("Migration with storage isn't supported on hypervisor " + srcHost.getHypervisorType() + " of version " + + srcHost.getHypervisorVersion()); } // Check if destination host is up. if (destinationHost.getState() != com.cloud.host.Status.Up || destinationHost.getResourceState() != ResourceState.Enabled) { throw new CloudRuntimeException("Cannot migrate VM, destination host is not in correct state, has " + "status: " + destinationHost.getState() + ", state: " + - destinationHost.getResourceState()); + destinationHost.getResourceState()); } List vmVolumes = _volsDao.findUsableVolumesForInstance(vm.getId()); @@ -4066,7 +4102,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // If the destination host is in the same cluster and volumes do not have to be migrated across pools // then fail the call. migrateVirtualMachine api should have been used. throw new InvalidParameterValueException("Migration of the vm " + vm + "from host " + srcHost + " to destination host " + destinationHost + - " doesn't involve migrating the volumes."); + " doesn't involve migrating the volumes."); } } @@ -4082,7 +4118,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } else { // Verify the volume given belongs to the vm. if (!vmVolumes.contains(volume)) { - throw new InvalidParameterValueException("There volume " + volume + " doesn't belong to " + "the virtual machine " + vm + " that has to be migrated"); + throw new InvalidParameterValueException("There volume " + volume + " doesn't belong to " + "the virtual machine " + vm + + " that has to be migrated"); } volToPoolObjectMap.put(volume, pool); } @@ -4100,7 +4137,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir HostVO destinationHostVO = _hostDao.findById(destinationHost.getId()); if (_capacityMgr.checkIfHostReachMaxGuestLimit(destinationHostVO)) { throw new VirtualMachineMigrationException("Host name: " + destinationHost.getName() + ", hostId: " + destinationHost.getId() + - " already has max running vms (count includes system VMs). Cannot" + " migrate to this host"); + " already has max running vms (count includes system VMs). Cannot" + " migrate to this host"); } checkHostsDedication(vm, srcHostId, destinationHost.getId()); @@ -4112,7 +4149,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @DB @Override @ActionEvent(eventType = EventTypes.EVENT_VM_MOVE, eventDescription = "move VM to another user", async = false) - public UserVm moveVMToUser(final AssignVMCmd cmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public UserVm moveVMToUser(final AssignVMCmd cmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { // VERIFICATIONS and VALIDATIONS // VV 1: verify the two users @@ -4225,8 +4263,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override public void doInTransactionWithoutResult(TransactionStatus status) { //generate destroy vm event for usage - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(), - vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), + vm.getServiceOfferingId(), vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid()); // update resource counts for old account resourceCountDecrement(oldAccount.getAccountId(), new Long(offering.getCpu()), new Long(offering.getRamSize())); @@ -4260,8 +4298,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir resourceCountIncrement(newAccount.getAccountId(), new Long(offering.getCpu()), new Long(offering.getRamSize())); //generate usage events to account for this change - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(), - vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), + vm.getServiceOfferingId(), vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid()); } }); @@ -4323,8 +4361,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (s_logger.isDebugEnabled()) { s_logger.debug("Couldn't find default security group for the account " + newAccount + " so creating a new one"); } - defaultGroup = _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, - newAccount.getDomainId(), newAccount.getId(), newAccount.getAccountName()); + defaultGroup = + _securityGroupMgr.createSecurityGroup(SecurityGroupManager.DEFAULT_GROUP_NAME, SecurityGroupManager.DEFAULT_GROUP_DESCRIPTION, + newAccount.getDomainId(), newAccount.getId(), newAccount.getAccountName()); securityGroupIdList.add(defaultGroup.getId()); } } @@ -4369,7 +4408,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir // don't allow to use system networks NetworkOffering networkOffering = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId()); if (networkOffering.isSystemOnly()) { - InvalidParameterValueException ex = new InvalidParameterValueException("Specified Network id is system only and can't be used for vm deployment"); + InvalidParameterValueException ex = + new InvalidParameterValueException("Specified Network id is system only and can't be used for vm deployment"); ex.addProxyObject(network.getUuid(), "networkId"); throw ex; } @@ -4380,25 +4420,26 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir List requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (requiredOfferings.size() < 1) { throw new InvalidParameterValueException("Unable to find network offering with availability=" + Availability.Required + - " to automatically create the network as a part of vm creation"); + " to automatically create the network as a part of vm creation"); } if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) { // get Virtual networks List virtualNetworks = _networkModel.listNetworksForAccount(newAccount.getId(), zone.getId(), Network.GuestType.Isolated); if (virtualNetworks.isEmpty()) { - long physicalNetworkId = _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0) - .getTrafficType()); + long physicalNetworkId = + _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); // Validate physical network PhysicalNetwork physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); if (physicalNetwork == null) { throw new InvalidParameterValueException("Unable to find physical network with id: " + physicalNetworkId + " and tag: " + - requiredOfferings.get(0).getTags()); + requiredOfferings.get(0).getTags()); } s_logger.debug("Creating network for account " + newAccount + " from the network offering id=" + requiredOfferings.get(0).getId() + - " as a part of deployVM process"); - Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), newAccount.getAccountName() + "-network", - newAccount.getAccountName() + "-network", null, null, null, null, newAccount, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, - null, null, true, null); + " as a part of deployVM process"); + Network newNetwork = + _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), newAccount.getAccountName() + "-network", newAccount.getAccountName() + + "-network", null, null, null, null, newAccount, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, + null); // if the network offering has persistent set to true, implement the network if (requiredOfferings.get(0).getIsPersistent()) { DeployDestination dest = new DeployDestination(zone, null, null, null); @@ -4414,9 +4455,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir newNetwork = implementedNetwork.second(); } catch (Exception ex) { s_logger.warn("Failed to implement network " + newNetwork + " elements and" + - " resources as a part of network provision for persistent network due to ", ex); - CloudRuntimeException e = new CloudRuntimeException("Failed to implement network" - + " (with specified id) elements and resources as a part of network provision"); + " resources as a part of network provision for persistent network due to ", ex); + CloudRuntimeException e = + new CloudRuntimeException("Failed to implement network" + + " (with specified id) elements and resources as a part of network provision"); e.addProxyObject(newNetwork.getUuid(), "networkId"); throw e; } @@ -4424,12 +4466,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir defaultNetwork = _networkDao.findById(newNetwork.getId()); } else if (virtualNetworks.size() > 1) { throw new InvalidParameterValueException("More than 1 default Isolated networks are found " + "for account " + newAccount + - "; please specify networkIds"); + "; please specify networkIds"); } else { defaultNetwork = _networkDao.findById(virtualNetworks.get(0).getId()); } } else { - throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); + throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + + NetworkOffering.State.Enabled); } applicableNetworks.add(defaultNetwork); diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java index 6943791c434..9f5f51dc06f 100644 --- a/server/src/com/cloud/vm/UserVmStateListener.java +++ b/server/src/com/cloud/vm/UserVmStateListener.java @@ -16,30 +16,33 @@ // under the License. package com.cloud.vm; -import com.cloud.event.EventCategory; -import com.cloud.event.EventTypes; -import com.cloud.event.UsageEventUtils; -import com.cloud.event.dao.UsageEventDao; -import com.cloud.network.Network; -import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.NetworkVO; -import com.cloud.server.ManagementServer; -import com.cloud.utils.component.ComponentContext; -import com.cloud.utils.fsm.StateListener; -import com.cloud.vm.VirtualMachine.Event; -import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.dao.NicDao; -import org.apache.cloudstack.framework.events.EventBus; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; - -import javax.inject.Inject; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; + +import org.apache.cloudstack.framework.events.EventBus; + +import com.cloud.event.EventCategory; +import com.cloud.event.EventTypes; +import com.cloud.event.UsageEventUtils; +import com.cloud.event.dao.UsageEventDao; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; +import com.cloud.server.ManagementServer; +import com.cloud.server.ManagementService; +import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.fsm.StateListener; +import com.cloud.vm.VirtualMachine.Event; +import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.dao.NicDao; + public class UserVmStateListener implements StateListener { @Inject @@ -77,23 +80,23 @@ public class UserVmStateListener implements StateListener nics = _nicDao.listByVmId(vo.getId()); for (NicVO nic : nics) { NetworkVO network = _networkDao.findById(nic.getNetworkId()); - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), Long.toString(nic.getId()), - network.getNetworkOfferingId(), null, 0L, vo.getClass().getName(), vo.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), + Long.toString(nic.getId()), network.getNetworkOfferingId(), null, 0L, vo.getClass().getName(), vo.getUuid()); } } else if (VirtualMachine.State.isVmDestroyed(oldState, event, newState)) { - UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), vo.getHostName(), vo.getServiceOfferingId(), - vo.getTemplateId(), vo.getHypervisorType().toString(), vo.getClass().getName(), vo.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), vo.getHostName(), + vo.getServiceOfferingId(), vo.getTemplateId(), vo.getHypervisorType().toString(), vo.getClass().getName(), vo.getUuid()); } return true; } @@ -107,8 +110,9 @@ public class UserVmStateListener implements StateListener eventDescription = new HashMap(); eventDescription.put("resource", resourceName); eventDescription.put("id", vo.getUuid()); diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index e2fcfb747ef..d1346f0ec10 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -27,14 +27,15 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; @@ -143,8 +144,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana String name = cmd.getVmSnapshotName(); String accountName = cmd.getAccountName(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, listAll, false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -180,7 +181,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana } if (state == null) { - VMSnapshot.State[] status = {VMSnapshot.State.Ready, VMSnapshot.State.Creating, VMSnapshot.State.Allocated, VMSnapshot.State.Error, VMSnapshot.State.Expunging, + VMSnapshot.State[] status = + {VMSnapshot.State.Ready, VMSnapshot.State.Creating, VMSnapshot.State.Allocated, VMSnapshot.State.Error, VMSnapshot.State.Expunging, VMSnapshot.State.Reverting}; sc.setParameters("status", (Object[])status); } else { @@ -267,8 +269,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana // check if there are active volume snapshots tasks List listVolumes = _volumeDao.findByInstance(vmId); for (VolumeVO volume : listVolumes) { - List activeSnapshots = _snapshotDao.listByInstanceId(volume.getInstanceId(), Snapshot.State.Creating, Snapshot.State.CreatedOnPrimary, - Snapshot.State.BackingUp); + List activeSnapshots = + _snapshotDao.listByInstanceId(volume.getInstanceId(), Snapshot.State.Creating, Snapshot.State.CreatedOnPrimary, Snapshot.State.BackingUp); if (activeSnapshots.size() > 0) { throw new CloudRuntimeException("There is other active volume snapshot tasks on the instance to which the volume is attached, please try again later."); } @@ -284,8 +286,9 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana vmSnapshotType = VMSnapshot.Type.DiskAndMemory; try { - VMSnapshotVO vmSnapshotVo = new VMSnapshotVO(userVmVo.getAccountId(), userVmVo.getDomainId(), vmId, vsDescription, vmSnapshotName, vsDisplayName, - userVmVo.getServiceOfferingId(), vmSnapshotType, null); + VMSnapshotVO vmSnapshotVo = + new VMSnapshotVO(userVmVo.getAccountId(), userVmVo.getDomainId(), vmId, vsDescription, vmSnapshotName, vsDisplayName, userVmVo.getServiceOfferingId(), + vmSnapshotType, null); VMSnapshot vmSnapshot = _vmSnapshotDao.persist(vmSnapshotVo); if (vmSnapshot == null) { throw new CloudRuntimeException("Failed to create snapshot for vm: " + vmId); @@ -342,8 +345,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana @Override public boolean hasActiveVMSnapshotTasks(Long vmId) { - List activeVMSnapshots = _vmSnapshotDao.listByInstanceId(vmId, VMSnapshot.State.Creating, VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, - VMSnapshot.State.Allocated); + List activeVMSnapshots = + _vmSnapshotDao.listByInstanceId(vmId, VMSnapshot.State.Creating, VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, VMSnapshot.State.Allocated); return activeVMSnapshots.size() > 0; } @@ -504,8 +507,8 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana if (userVm == null) return false; - List vmSnapshotsInExpungingStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, - VMSnapshot.State.Creating); + List vmSnapshotsInExpungingStates = + _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Reverting, VMSnapshot.State.Creating); for (VMSnapshotVO vmSnapshotVO : vmSnapshotsInExpungingStates) { VMSnapshotStrategy strategy = findVMSnapshotStrategy(vmSnapshotVO); if (vmSnapshotVO.getState() == VMSnapshot.State.Expunging) { diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java index 36e3b48aab1..2a6b7d46d89 100644 --- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -21,12 +21,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Map.Entry; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; @@ -34,19 +35,13 @@ import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; -import org.springframework.context.annotation.Primary; -import com.cloud.deploy.DeploymentPlanner; + import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; -import com.cloud.exception.ResourceInUseException; -import com.cloud.network.Network; -import com.cloud.network.dao.NetworkDomainVO; -import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.DomainManager; @@ -63,7 +58,6 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; -import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.StateListener; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; @@ -105,7 +99,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro } public void setAffinityGroupProcessors(List affinityProcessors) { - this._affinityProcessors = affinityProcessors; + _affinityProcessors = affinityProcessors; } @DB @@ -136,7 +130,8 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro @DB @Override - public AffinityGroup createAffinityGroupInternal(String account, final Long domainId, final String affinityGroupName, final String affinityGroupType, final String description) { + public AffinityGroup createAffinityGroupInternal(String account, final Long domainId, final String affinityGroupName, final String affinityGroupType, + final String description) { Account caller = CallContext.current().getCallingAccount(); @@ -203,7 +198,8 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro AffinityGroupVO group = Transaction.execute(new TransactionCallback() { @Override public AffinityGroupVO doInTransaction(TransactionStatus status) { - AffinityGroupVO group = new AffinityGroupVO(affinityGroupName, affinityGroupType, description, ownerFinal.getDomainId(), ownerFinal.getId(), aclTypeFinal); + AffinityGroupVO group = + new AffinityGroupVO(affinityGroupName, affinityGroupType, description, ownerFinal.getDomainId(), ownerFinal.getId(), aclTypeFinal); _affinityGroupDao.persist(group); if (domainId != null && aclTypeFinal == ACLType.Domain) { @@ -291,8 +287,8 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro } @Override - public Pair, Integer> listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, Long startIndex, - Long pageSize) { + public Pair, Integer> listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, + Long startIndex, Long pageSize) { Filter searchFilter = new Filter(AffinityGroupVO.class, "id", Boolean.TRUE, startIndex, pageSize); Account caller = CallContext.current().getCallingAccount(); @@ -334,7 +330,8 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro } _accountMgr.checkAccess(caller, null, true, userVM); // add join to affinity_groups_vm_map - groupSearch.join("vmInstanceSearch", vmInstanceSearch, groupSearch.entity().getId(), vmInstanceSearch.entity().getAffinityGroupId(), JoinBuilder.JoinType.INNER); + groupSearch.join("vmInstanceSearch", vmInstanceSearch, groupSearch.entity().getId(), vmInstanceSearch.entity().getAffinityGroupId(), + JoinBuilder.JoinType.INNER); sc.setJoinParameters("vmInstanceSearch", "instanceId", vmId); } @@ -441,8 +438,8 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro // Check that the VM is stopped if (!vmInstance.getState().equals(State.Stopped)) { s_logger.warn("Unable to update affinity groups of the virtual machine " + vmInstance.toString() + " in state " + vmInstance.getState()); - throw new InvalidParameterValueException("Unable update affinity groups of the virtual machine " + vmInstance.toString() + " " + "in state " + vmInstance.getState() + - "; make sure the virtual machine is stopped and not in an error state before updating."); + throw new InvalidParameterValueException("Unable update affinity groups of the virtual machine " + vmInstance.toString() + " " + "in state " + + vmInstance.getState() + "; make sure the virtual machine is stopped and not in an error state before updating."); } Account caller = CallContext.current().getCallingAccount(); diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java index b0d2f81f8d9..9c93b463314 100644 --- a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java +++ b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java @@ -26,6 +26,7 @@ import javax.inject.Inject; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.command.user.loadbalancer.ListApplicationLoadBalancersCmd; import org.apache.cloudstack.context.CallContext; @@ -103,8 +104,8 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A @Override @ActionEvent(eventType = EventTypes.EVENT_LOAD_BALANCER_CREATE, eventDescription = "creating load balancer") - public ApplicationLoadBalancerRule createApplicationLoadBalancer(String name, String description, Scheme scheme, long sourceIpNetworkId, String sourceIp, int sourcePort, - int instancePort, String algorithm, long networkId, long lbOwnerId) throws InsufficientAddressCapacityException, NetworkRuleConflictException, + public ApplicationLoadBalancerRule createApplicationLoadBalancer(String name, String description, Scheme scheme, long sourceIpNetworkId, String sourceIp, + int sourcePort, int instancePort, String algorithm, long networkId, long lbOwnerId) throws InsufficientAddressCapacityException, NetworkRuleConflictException, InsufficientVirtualNetworkCapcityException { //Validate LB rule guest network @@ -129,8 +130,9 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A return createApplicationLoadBalancer(name, description, scheme, sourceIpNtwk, sourceIp, sourcePort, instancePort, algorithm, lbOwner, guestNtwk); } - protected ApplicationLoadBalancerRule createApplicationLoadBalancer(String name, String description, Scheme scheme, Network sourceIpNtwk, String sourceIp, int sourcePort, - int instancePort, String algorithm, Account lbOwner, Network guestNtwk) throws NetworkRuleConflictException, InsufficientVirtualNetworkCapcityException { + protected ApplicationLoadBalancerRule createApplicationLoadBalancer(String name, String description, Scheme scheme, Network sourceIpNtwk, String sourceIp, + int sourcePort, int instancePort, String algorithm, Account lbOwner, Network guestNtwk) throws NetworkRuleConflictException, + InsufficientVirtualNetworkCapcityException { //Only Internal scheme is supported in this release if (scheme != Scheme.Internal) { @@ -146,12 +148,14 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A //3) Get source ip address Ip sourceIpAddr = getSourceIp(scheme, sourceIpNtwk, sourceIp); - ApplicationLoadBalancerRuleVO newRule = new ApplicationLoadBalancerRuleVO(name, description, sourcePort, instancePort, algorithm, guestNtwk.getId(), lbOwner.getId(), - lbOwner.getDomainId(), sourceIpAddr, sourceIpNtwk.getId(), scheme); + ApplicationLoadBalancerRuleVO newRule = + new ApplicationLoadBalancerRuleVO(name, description, sourcePort, instancePort, algorithm, guestNtwk.getId(), lbOwner.getId(), lbOwner.getDomainId(), + sourceIpAddr, sourceIpNtwk.getId(), scheme); //4) Validate Load Balancing rule on the providers - LoadBalancingRule loadBalancing = new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), new ArrayList(), - sourceIpAddr, null, null); + LoadBalancingRule loadBalancing = + new LoadBalancingRule(newRule, new ArrayList(), new ArrayList(), new ArrayList(), sourceIpAddr, null, + null); if (!_lbMgr.validateLbRule(loadBalancing)) { throw new InvalidParameterValueException("LB service provider cannot support this rule"); } @@ -176,8 +180,8 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A if (!_firewallDao.setStateToAdd(newRule)) { throw new CloudRuntimeException("Unable to update the state to add for " + newRule); } - s_logger.debug("Load balancer " + newRule.getId() + " for Ip address " + newRule.getSourceIp().addr() + ", source port " + newRule.getSourcePortStart() + - ", instance port " + newRule.getDefaultPortStart() + " is added successfully."); + s_logger.debug("Load balancer " + newRule.getId() + " for Ip address " + newRule.getSourceIp().addr() + ", source port " + + newRule.getSourcePortStart() + ", instance port " + newRule.getDefaultPortStart() + " is added successfully."); CallContext.current().setEventDetails("Load balancer Id: " + newRule.getId()); Network ntwk = _networkModel.getNetwork(newRule.getNetworkId()); UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_CREATE, newRule.getAccountId(), ntwk.getDataCenterId(), newRule.getId(), null, @@ -382,8 +386,8 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A Account caller = CallContext.current().getCallingAccount(); List permittedAccounts = new ArrayList(); - Ternary domainIdRecursiveListProject = new Ternary(cmd.getDomainId(), - cmd.isRecursive(), null); + Ternary domainIdRecursiveListProject = + new Ternary(cmd.getDomainId(), cmd.isRecursive(), null); _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false); Long domainId = domainIdRecursiveListProject.first(); Boolean isRecursive = domainIdRecursiveListProject.second(); @@ -512,8 +516,8 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A (newLbRule.getSourcePortStart().intValue() <= lbRule.getSourcePortEnd().intValue() && newLbRule.getSourcePortEnd().intValue() >= lbRule.getSourcePortEnd() .intValue())) { - throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart() + "-" + newLbRule.getSourcePortEnd() + ", conflicts with rule " + - lbRule.getId() + " which has " + lbRule.getSourcePortStart() + "-" + lbRule.getSourcePortEnd()); + throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart() + "-" + newLbRule.getSourcePortEnd() + + ", conflicts with rule " + lbRule.getId() + " which has " + lbRule.getSourcePortStart() + "-" + lbRule.getSourcePortEnd()); } } diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java index 867c46026cb..17f88bdd4aa 100644 --- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java +++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java @@ -16,32 +16,34 @@ // under the License. package org.apache.cloudstack.network.lb; -import com.cloud.event.ActionEvent; -import com.cloud.event.EventTypes; -import com.cloud.network.dao.*; -import com.cloud.network.lb.CertService; -import com.cloud.network.rules.LoadBalancer; -import com.cloud.user.dao.AccountDao; -import com.cloud.utils.db.EntityManager; -import com.cloud.utils.exception.CloudRuntimeException; - -import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; -import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd; -import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; -import org.apache.cloudstack.api.response.SslCertResponse; - -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.user.Account; -import com.cloud.user.AccountManager; -import com.cloud.utils.db.DB; - -import org.apache.cloudstack.acl.SecurityChecker; -import org.apache.cloudstack.context.CallContext; -import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openssl.PEMReader; -import org.bouncycastle.openssl.PasswordFinder; +import java.io.IOException; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Security; +import java.security.cert.CertPathBuilder; +import java.security.cert.CertPathBuilderException; +import java.security.cert.CertStore; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CollectionCertStoreParameters; +import java.security.cert.PKIXBuilderParameters; +import java.security.cert.TrustAnchor; +import java.security.cert.X509CertSelector; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -50,17 +52,35 @@ import javax.crypto.NoSuchPaddingException; import javax.ejb.Local; import javax.inject.Inject; -import java.io.IOException; -import java.io.StringReader; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.security.*; -import java.security.cert.*; -import java.security.cert.Certificate; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.apache.commons.io.IOUtils; +import org.apache.log4j.Logger; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openssl.PEMReader; +import org.bouncycastle.openssl.PasswordFinder; + +import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; +import org.apache.cloudstack.api.response.SslCertResponse; +import org.apache.cloudstack.context.CallContext; + +import com.cloud.event.ActionEvent; +import com.cloud.event.EventTypes; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.network.dao.LoadBalancerCertMapDao; +import com.cloud.network.dao.LoadBalancerCertMapVO; +import com.cloud.network.dao.LoadBalancerVO; +import com.cloud.network.dao.SslCertDao; +import com.cloud.network.dao.SslCertVO; +import com.cloud.network.lb.CertService; +import com.cloud.network.rules.LoadBalancer; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.dao.AccountDao; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.EntityManager; +import com.cloud.utils.exception.CloudRuntimeException; @Local(value = {CertService.class}) public class CertServiceImpl implements CertService { @@ -464,6 +484,7 @@ public class CertServiceImpl implements CertService { this.password = word; } + @Override public char[] getPassword() { password_requested = true; return password; diff --git a/server/src/org/apache/cloudstack/region/RegionManager.java b/server/src/org/apache/cloudstack/region/RegionManager.java index d4b063d412e..6f254817103 100644 --- a/server/src/org/apache/cloudstack/region/RegionManager.java +++ b/server/src/org/apache/cloudstack/region/RegionManager.java @@ -17,7 +17,6 @@ package org.apache.cloudstack.region; import java.util.List; -import java.util.Map; import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java index 90955c9ade7..89107141966 100755 --- a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java +++ b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java @@ -16,6 +16,24 @@ // under the License. package org.apache.cloudstack.region; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; +import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; +import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; +import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; +import org.apache.cloudstack.region.dao.RegionDao; + import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; @@ -25,35 +43,10 @@ import com.cloud.user.AccountManager; import com.cloud.user.DomainManager; import com.cloud.user.UserAccount; import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.UserAccountDao; -import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; -import com.cloud.utils.crypt.EncryptionSecretKeyChecker; import com.cloud.utils.db.DbProperties; -import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; -import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; -import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; -import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; -import org.apache.cloudstack.region.dao.RegionDao; -import org.apache.log4j.Logger; -import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; -import org.jasypt.properties.EncryptableProperties; -import org.springframework.stereotype.Component; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; - @Component @Local(value = {RegionManager.class}) public class RegionManagerImpl extends ManagerBase implements RegionManager, Manager { @@ -98,6 +91,7 @@ public class RegionManagerImpl extends ManagerBase implements RegionManager, Man return _name; } + @Override public int getId() { return _id; } @@ -205,7 +199,8 @@ public class RegionManagerImpl extends ManagerBase implements RegionManager, Man * {@inheritDoc} */ @Override - public Account disableAccount(String accountName, Long domainId, Long accountId, Boolean lockRequested) throws ConcurrentOperationException, ResourceUnavailableException { + public Account disableAccount(String accountName, Long domainId, Long accountId, Boolean lockRequested) throws ConcurrentOperationException, + ResourceUnavailableException { Account account = null; if (lockRequested) { account = _accountMgr.lockAccount(accountName, domainId, accountId); diff --git a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java index 475c77805b1..98cf5005f89 100755 --- a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java @@ -16,13 +16,16 @@ // under the License. package org.apache.cloudstack.region; -import com.cloud.domain.Domain; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.user.Account; -import com.cloud.user.UserAccount; -import com.cloud.utils.component.Manager; -import com.cloud.utils.component.ManagerBase; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd; import org.apache.cloudstack.api.command.admin.account.DisableAccountCmd; import org.apache.cloudstack.api.command.admin.account.EnableAccountCmd; @@ -34,14 +37,14 @@ import org.apache.cloudstack.api.command.admin.user.DisableUserCmd; import org.apache.cloudstack.api.command.admin.user.EnableUserCmd; import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; import org.apache.cloudstack.api.command.user.region.ListRegionsCmd; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.util.List; -import java.util.Map; +import com.cloud.domain.Domain; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +import com.cloud.user.UserAccount; +import com.cloud.utils.component.Manager; +import com.cloud.utils.component.ManagerBase; @Component @Local(value = {RegionService.class}) diff --git a/server/src/org/apache/cloudstack/region/RegionsApiUtil.java b/server/src/org/apache/cloudstack/region/RegionsApiUtil.java index f8768fbb3d1..679f6d88a75 100644 --- a/server/src/org/apache/cloudstack/region/RegionsApiUtil.java +++ b/server/src/org/apache/cloudstack/region/RegionsApiUtil.java @@ -38,11 +38,12 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.log4j.Logger; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; + import com.cloud.domain.DomainVO; import com.cloud.user.UserAccount; import com.cloud.user.UserAccountVO; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.DomDriver; /** * Utility class for making API calls between peer Regions diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 53a48a2dd24..e88d6f8b5c2 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -17,6 +17,28 @@ package org.apache.cloudstack.region.gslb; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + +import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.ListGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.RemoveFromGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.region.ha.gslb.UpdateGlobalLoadBalancerRuleCmd; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.region.Region; +import org.apache.cloudstack.region.dao.RegionDao; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.routing.GlobalLoadBalancerConfigCommand; import com.cloud.agent.api.routing.SiteLoadBalancerConfig; @@ -27,7 +49,11 @@ import com.cloud.event.UsageEventUtils; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Network; -import com.cloud.network.dao.*; +import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.network.dao.LoadBalancerDao; +import com.cloud.network.dao.LoadBalancerVO; +import com.cloud.network.dao.NetworkDao; import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.RulesManager; import com.cloud.region.ha.GlobalLoadBalancerRule; @@ -43,22 +69,6 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; -import org.apache.cloudstack.acl.SecurityChecker; -import org.apache.cloudstack.api.command.user.region.ha.gslb.*; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.region.Region; -import org.apache.cloudstack.region.dao.RegionDao; -import org.apache.log4j.Logger; - -import javax.ejb.Local; -import javax.inject.Inject; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - @Local(value = {GlobalLoadBalancingRulesService.class}) public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingRulesService { @@ -140,8 +150,9 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR GlobalLoadBalancerRuleVO newGslbRule = Transaction.execute(new TransactionCallback() { @Override public GlobalLoadBalancerRuleVO doInTransaction(TransactionStatus status) { - GlobalLoadBalancerRuleVO newGslbRule = new GlobalLoadBalancerRuleVO(name, description, domainName, algorithm, stickyMethod, serviceType, regionId, - gslbOwner.getId(), gslbOwner.getDomainId(), GlobalLoadBalancerRule.State.Staged); + GlobalLoadBalancerRuleVO newGslbRule = + new GlobalLoadBalancerRuleVO(name, description, domainName, algorithm, stickyMethod, serviceType, regionId, gslbOwner.getId(), + gslbOwner.getDomainId(), GlobalLoadBalancerRule.State.Staged); _gslbRuleDao.persist(newGslbRule); UsageEventUtils.publishUsageEvent(EventTypes.EVENT_GLOBAL_LOAD_BALANCER_CREATE, newGslbRule.getAccountId(), 0, newGslbRule.getId(), name, @@ -158,7 +169,9 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR @Override @DB - @ActionEvent(eventType = EventTypes.EVENT_ASSIGN_TO_GLOBAL_LOAD_BALANCER_RULE, eventDescription = "Assigning a load balancer rule to global load balancer rule", async = true) + @ActionEvent(eventType = EventTypes.EVENT_ASSIGN_TO_GLOBAL_LOAD_BALANCER_RULE, + eventDescription = "Assigning a load balancer rule to global load balancer rule", + async = true) public boolean assignToGlobalLoadBalancerRule(AssignToGlobalLoadBalancerRuleCmd assignToGslbCmd) { CallContext ctx = CallContext.current(); @@ -238,7 +251,8 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR // for each of the physical network check if GSLB service provider configured for (Pair physicalNetwork : physcialNetworks) { if (!checkGslbServiceEnabledInZone(physicalNetwork.first(), physicalNetwork.second())) { - throw new InvalidParameterValueException("GSLB service is not enabled in the Zone:" + physicalNetwork.first() + " and physical network " + physicalNetwork.second()); + throw new InvalidParameterValueException("GSLB service is not enabled in the Zone:" + physicalNetwork.first() + " and physical network " + + physicalNetwork.second()); } } @@ -292,7 +306,8 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR @Override @DB - @ActionEvent(eventType = EventTypes.EVENT_REMOVE_FROM_GLOBAL_LOAD_BALANCER_RULE, eventDescription = "Removing a load balancer rule to be part of global load balancer rule") + @ActionEvent(eventType = EventTypes.EVENT_REMOVE_FROM_GLOBAL_LOAD_BALANCER_RULE, + eventDescription = "Removing a load balancer rule to be part of global load balancer rule") public boolean removeFromGlobalLoadBalancerRule(RemoveFromGlobalLoadBalancerRuleCmd removeFromGslbCmd) { CallContext ctx = CallContext.current(); @@ -322,7 +337,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR List gslbLbMapVos = _gslbLbMapDao.listByGslbRuleId(gslbRuleId); if (gslbLbMapVos == null) { throw new InvalidParameterValueException(" There are no load balancer rules that are assigned to global " + " load balancer rule id: " + gslbRule.getUuid() + - " that are available for deletion"); + " that are available for deletion"); } for (Long lbRuleId : lbRuleIdsToremove) { @@ -344,7 +359,8 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR for (Long lbRuleId : lbRuleIdsToremove) { LoadBalancerVO loadBalancer = _lbDao.findById(lbRuleId); if (oldLbRuleIds != null && !oldLbRuleIds.contains(loadBalancer.getId())) { - throw new InvalidParameterValueException("Load balancer ID " + loadBalancer.getUuid() + " is not assigned" + " to global load balancer rule: " + gslbRule.getUuid()); + throw new InvalidParameterValueException("Load balancer ID " + loadBalancer.getUuid() + " is not assigned" + " to global load balancer rule: " + + gslbRule.getUuid()); } } @@ -636,8 +652,9 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR gslbSiteIds.add(new Pair(dataCenterId, physicalNetworkId)); IPAddressVO ip = _ipAddressDao.findById(loadBalancer.getSourceIpAddressId()); - SiteLoadBalancerConfig siteLb = new SiteLoadBalancerConfig(gslbLbMapVo.isRevoke(), serviceType, ip.getAddress().addr(), - Integer.toString(loadBalancer.getDefaultPortStart()), dataCenterId); + SiteLoadBalancerConfig siteLb = + new SiteLoadBalancerConfig(gslbLbMapVo.isRevoke(), serviceType, ip.getAddress().addr(), Integer.toString(loadBalancer.getDefaultPortStart()), + dataCenterId); siteLb.setGslbProviderPublicIp(_gslbProvider.getZoneGslbProviderPublicIp(dataCenterId, physicalNetworkId)); siteLb.setGslbProviderPrivateIp(_gslbProvider.getZoneGslbProviderPrivateIp(dataCenterId, physicalNetworkId)); diff --git a/server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java b/server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java index 6e90167cced..8b8796b7257 100755 --- a/server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java +++ b/server/src/org/apache/cloudstack/region/gslb/GslbServiceProvider.java @@ -18,9 +18,10 @@ */ package org.apache.cloudstack.region.gslb; +import org.apache.cloudstack.region.RegionServiceProvider; + import com.cloud.agent.api.routing.GlobalLoadBalancerConfigCommand; import com.cloud.exception.ResourceUnavailableException; -import org.apache.cloudstack.region.RegionServiceProvider; public interface GslbServiceProvider extends RegionServiceProvider { diff --git a/server/test/com/cloud/api/APITest.java b/server/test/com/cloud/api/APITest.java index 070fc7ba70c..12c3b5a652a 100644 --- a/server/test/com/cloud/api/APITest.java +++ b/server/test/com/cloud/api/APITest.java @@ -28,10 +28,11 @@ import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Iterator; +import com.google.gson.Gson; + import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.utils.exception.CloudRuntimeException; -import com.google.gson.Gson; /** * Base class for API Test diff --git a/server/test/com/cloud/api/ApiDispatcherTest.java b/server/test/com/cloud/api/ApiDispatcherTest.java index b59f2e42ac8..7314a57b468 100644 --- a/server/test/com/cloud/api/ApiDispatcherTest.java +++ b/server/test/com/cloud/api/ApiDispatcherTest.java @@ -19,12 +19,7 @@ package com.cloud.api; import java.util.HashMap; -import java.util.Map; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.context.CallContext; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -34,6 +29,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.context.CallContext; + import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; @@ -61,8 +61,8 @@ public class ApiDispatcherTest { boolean boolparam1; @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, - NetworkRuleConflictException { + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { // well documented nothing } diff --git a/server/test/com/cloud/api/ListPerfTest.java b/server/test/com/cloud/api/ListPerfTest.java index d3f3bbfb075..a376a0024d7 100644 --- a/server/test/com/cloud/api/ListPerfTest.java +++ b/server/test/com/cloud/api/ListPerfTest.java @@ -16,18 +16,11 @@ // under the License. package com.cloud.api; -import static org.junit.Assert.*; - import java.util.HashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import org.junit.Before; import org.junit.Test; -import com.cloud.utils.exception.CloudRuntimeException; - /** * Test fixture to do performance test for list command * Currently we commented out this test suite since it requires a real MS and Db running. diff --git a/server/test/com/cloud/api/LoginResponse.java b/server/test/com/cloud/api/LoginResponse.java index 630f0f17eb9..81c61d848b5 100644 --- a/server/test/com/cloud/api/LoginResponse.java +++ b/server/test/com/cloud/api/LoginResponse.java @@ -16,10 +16,11 @@ // under the License. package com.cloud.api; +import com.google.gson.annotations.SerializedName; + import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; /** * Login Response object diff --git a/server/test/com/cloud/capacity/CapacityManagerTest.java b/server/test/com/cloud/capacity/CapacityManagerTest.java index 394d2825dae..b6cae6be9c9 100644 --- a/server/test/com/cloud/capacity/CapacityManagerTest.java +++ b/server/test/com/cloud/capacity/CapacityManagerTest.java @@ -17,20 +17,21 @@ package com.cloud.capacity; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.junit.Assert; +import org.junit.Test; + import com.cloud.capacity.dao.CapacityDao; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterDetailsVO; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; -import com.cloud.vm.UserVmDetailVO; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.dao.UserVmDetailsDao; -import org.apache.log4j.Logger; -import org.junit.*; -import org.junit.Test; -import org.mockito.Mockito; - -import static org.mockito.Mockito.*; public class CapacityManagerTest { CapacityDao CDao = mock(CapacityDao.class); @@ -46,7 +47,7 @@ public class CapacityManagerTest { public CapacityManagerImpl setUp() { CapacityManagerImpl capMgr = new CapacityManagerImpl(); - ((CapacityManagerImpl)capMgr)._clusterDetailsDao = ClusterDetailsDao; + capMgr._clusterDetailsDao = ClusterDetailsDao; capMgr._capacityDao = CDao; capMgr._offeringsDao = SOfferingDao; return capMgr; diff --git a/server/test/com/cloud/configuration/ConfigurationManagerTest.java b/server/test/com/cloud/configuration/ConfigurationManagerTest.java index 2b037231074..f1bb30acffd 100755 --- a/server/test/com/cloud/configuration/ConfigurationManagerTest.java +++ b/server/test/com/cloud/configuration/ConfigurationManagerTest.java @@ -40,6 +40,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; + import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; import org.apache.cloudstack.context.CallContext; @@ -67,7 +68,6 @@ import com.cloud.user.AccountVO; import com.cloud.user.ResourceLimitService; import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.Ip; @@ -228,8 +228,9 @@ public class ConfigurationManagerTest { when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null); - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true, + true, null, null); when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); List ipAddressList = new ArrayList(); @@ -271,8 +272,9 @@ public class ConfigurationManagerTest { accountVlanMaps.add(accountVlanMap); when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(accountVlanMaps); - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true, + true, null, null); when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); List ipAddressList = new ArrayList(); @@ -297,8 +299,9 @@ public class ConfigurationManagerTest { when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(null); // public ip range belongs to zone of type basic - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, - true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, + true, null, null); when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); List ipAddressList = new ArrayList(); @@ -322,8 +325,9 @@ public class ConfigurationManagerTest { when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null); - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, - true, true, null, null); + DataCenterVO dc = + new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true, + true, null, null); when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); // one of the ip addresses of the range is allocated to different account @@ -478,8 +482,10 @@ public class ConfigurationManagerTest { try { configurationMgr.validateStaticNatServiceCapablities(staticNatServiceCapabilityMap); } catch (InvalidParameterValueException e) { - Assert.assertTrue(e.getMessage(), - e.getMessage().contains("Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + Capability.ElasticIp.getName() + " is true")); + Assert.assertTrue( + e.getMessage(), + e.getMessage().contains( + "Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + Capability.ElasticIp.getName() + " is true")); caught = true; } Assert.assertTrue("should not be accepted", caught); diff --git a/server/test/com/cloud/configuration/ValidateIpRangeTest.java b/server/test/com/cloud/configuration/ValidateIpRangeTest.java index 85797aa18ff..4a5da8860c5 100644 --- a/server/test/com/cloud/configuration/ValidateIpRangeTest.java +++ b/server/test/com/cloud/configuration/ValidateIpRangeTest.java @@ -16,20 +16,21 @@ // under the License. package com.cloud.configuration; -import com.cloud.dc.VlanVO; -import com.cloud.network.Network; -import com.cloud.network.NetworkModel; -import com.cloud.utils.Pair; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.when; +import com.cloud.dc.VlanVO; +import com.cloud.network.Network; +import com.cloud.network.NetworkModel; +import com.cloud.utils.Pair; public class ValidateIpRangeTest { @Mock @@ -53,15 +54,16 @@ public class ValidateIpRangeTest { @Test public void SameSubnetTest() { - Pair> sameSubnet = configurationMgr.validateIpRange("10.147.33.104", "10.147.33.105", "10.147.33.1", "255.255.255.128", vlanVOList, true, - false, null, null, null, null, network); + Pair> sameSubnet = + configurationMgr.validateIpRange("10.147.33.104", "10.147.33.105", "10.147.33.1", "255.255.255.128", vlanVOList, true, false, null, null, null, null, network); Assert.assertTrue(sameSubnet.first()); } @Test public void NewSubnetTest() { - Pair> sameSubnet = configurationMgr.validateIpRange("10.147.33.140", "10.147.33.145", "10.147.33.130", "255.255.255.192", vlanVOList, true, - false, null, null, null, null, network); + Pair> sameSubnet = + configurationMgr.validateIpRange("10.147.33.140", "10.147.33.145", "10.147.33.130", "255.255.255.192", vlanVOList, true, false, null, null, null, null, + network); Assert.assertTrue(!sameSubnet.first()); } diff --git a/server/test/com/cloud/event/EventControlsUnitTest.java b/server/test/com/cloud/event/EventControlsUnitTest.java index 466e4eed8f6..91dc921d261 100644 --- a/server/test/com/cloud/event/EventControlsUnitTest.java +++ b/server/test/com/cloud/event/EventControlsUnitTest.java @@ -27,8 +27,6 @@ import java.util.List; import junit.framework.TestCase; -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.SecurityChecker.AccessType; + import com.cloud.event.dao.EventDao; import com.cloud.server.ManagementServerImpl; import com.cloud.user.Account; @@ -63,6 +64,7 @@ public class EventControlsUnitTest extends TestCase { when(_eventDao.listToArchiveOrDeleteEvents(anyList(), anyString(), any(Date.class), any(Date.class), anyList())).thenReturn(_events); } + @Override @After public void tearDown() throws Exception { } diff --git a/server/test/com/cloud/ha/KVMFencerTest.java b/server/test/com/cloud/ha/KVMFencerTest.java index af19b214f7b..cdd13b6b606 100644 --- a/server/test/com/cloud/ha/KVMFencerTest.java +++ b/server/test/com/cloud/ha/KVMFencerTest.java @@ -25,6 +25,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; @@ -106,7 +107,7 @@ public class KVMFencerTest { Mockito.when(resourceManager.listAllHostsInCluster(1l)).thenReturn(Arrays.asList(host, secondHost)); FenceAnswer answer = new FenceAnswer(null, true, "ok"); - Mockito.when(agentManager.send(Mockito.anyLong(), Mockito.any(FenceCommand.class))).thenReturn(answer); + Mockito.when(agentManager.send(Matchers.anyLong(), Matchers.any(FenceCommand.class))).thenReturn(answer); Assert.assertTrue(fencer.fenceOff(virtualMachine, host)); } @@ -129,7 +130,7 @@ public class KVMFencerTest { Mockito.when(resourceManager.listAllHostsInCluster(1l)).thenReturn(Arrays.asList(host, secondHost)); - Mockito.when(agentManager.send(Mockito.anyLong(), Mockito.any(FenceCommand.class))).thenThrow(new AgentUnavailableException(2l)); + Mockito.when(agentManager.send(Matchers.anyLong(), Matchers.any(FenceCommand.class))).thenThrow(new AgentUnavailableException(2l)); Assert.assertFalse(fencer.fenceOff(virtualMachine, host)); } @@ -152,7 +153,7 @@ public class KVMFencerTest { Mockito.when(resourceManager.listAllHostsInCluster(1l)).thenReturn(Arrays.asList(host, secondHost)); - Mockito.when(agentManager.send(Mockito.anyLong(), Mockito.any(FenceCommand.class))).thenThrow(new OperationTimedoutException(null, 2l, 0l, 0, false)); + Mockito.when(agentManager.send(Matchers.anyLong(), Matchers.any(FenceCommand.class))).thenThrow(new OperationTimedoutException(null, 2l, 0l, 0, false)); Assert.assertFalse(fencer.fenceOff(virtualMachine, host)); } diff --git a/server/test/com/cloud/keystore/KeystoreTest.java b/server/test/com/cloud/keystore/KeystoreTest.java index 612f035cce2..1981a7315f4 100644 --- a/server/test/com/cloud/keystore/KeystoreTest.java +++ b/server/test/com/cloud/keystore/KeystoreTest.java @@ -22,39 +22,40 @@ import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; -import com.cloud.api.ApiSerializerHelper; import org.apache.cloudstack.api.response.AlertResponse; import org.apache.cloudstack.api.response.UserVmResponse; +import com.cloud.api.ApiSerializerHelper; + public class KeystoreTest extends TestCase { private final static Logger s_logger = Logger.getLogger(KeystoreTest.class); - private String keyContent = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALV5vGlkiWwoZX4hTRplPXP8qtST\n" - + "hwZhko8noeY5vf8ECwmd+vrCTw/JvnOtkx/8oYNbg/SeUt1EfOsk6gqJdBblGFBZRMcUJlIpqE9z\n" - + "uv68U9G8Gfi/qvRSY336hibw0J5bZ4vn1QqmyHDB+Czea9AjFUV7AEVG15+vED7why+/AgMBAAEC\n" - + "gYBmFBPnNKYYMKDmUdUNA+WNWJK/ADzzWe8WlzR6TACTcbLDthl289WFC/YVG42mcHRpbxDKiEQU\n" - + "MnIR0rHTO34Qb/2HcuyweStU2gqR6omxBvMnFpJr90nD1HcOMJzeLHsphau0/EmKKey+gk4PyieD\n" - + "KqTM7LTjjHv8xPM4n+WAAQJBAOMNCeFKlJ4kMokWhU74B5/w/NGyT1BHUN0VmilHSiJC8JqS4BiI\n" - + "ZpAeET3VmilO6QTGh2XVhEDGteu3uZR6ipUCQQDMnRzMgQ/50LFeIQo4IBtwlEouczMlPQF4c21R\n" - + "1d720moxILVPT0NJZTQUDDmmgbL+B7CgtcCR2NlP5sKPZVADAkEAh4Xq1cy8dMBKYcVNgNtPQcqI\n" - + "PWpfKR3ISI5yXB0vRNAL6Vet5zbTcUZhKDVtNSbis3UEsGYH8NorEC2z2cpjGQJANhJi9Ow6c5Mh\n" - + "/DURBUn+1l5pyCKrZnDbvaALSLATLvjmFTuGjoHszy2OeKnOZmEqExWnKKE/VYuPyhy6V7i3TwJA\n" - + "f8skDgtPK0OsBCa6IljPaHoWBjPc4kFkSTSS1d56hUcWSikTmiuKdLyBb85AADSZYsvHWrte4opN\n" + "dhNukMJuRA==\n"; + private final String keyContent = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALV5vGlkiWwoZX4hTRplPXP8qtST\n" + + "hwZhko8noeY5vf8ECwmd+vrCTw/JvnOtkx/8oYNbg/SeUt1EfOsk6gqJdBblGFBZRMcUJlIpqE9z\n" + + "uv68U9G8Gfi/qvRSY336hibw0J5bZ4vn1QqmyHDB+Czea9AjFUV7AEVG15+vED7why+/AgMBAAEC\n" + + "gYBmFBPnNKYYMKDmUdUNA+WNWJK/ADzzWe8WlzR6TACTcbLDthl289WFC/YVG42mcHRpbxDKiEQU\n" + + "MnIR0rHTO34Qb/2HcuyweStU2gqR6omxBvMnFpJr90nD1HcOMJzeLHsphau0/EmKKey+gk4PyieD\n" + + "KqTM7LTjjHv8xPM4n+WAAQJBAOMNCeFKlJ4kMokWhU74B5/w/NGyT1BHUN0VmilHSiJC8JqS4BiI\n" + + "ZpAeET3VmilO6QTGh2XVhEDGteu3uZR6ipUCQQDMnRzMgQ/50LFeIQo4IBtwlEouczMlPQF4c21R\n" + + "1d720moxILVPT0NJZTQUDDmmgbL+B7CgtcCR2NlP5sKPZVADAkEAh4Xq1cy8dMBKYcVNgNtPQcqI\n" + + "PWpfKR3ISI5yXB0vRNAL6Vet5zbTcUZhKDVtNSbis3UEsGYH8NorEC2z2cpjGQJANhJi9Ow6c5Mh\n" + + "/DURBUn+1l5pyCKrZnDbvaALSLATLvjmFTuGjoHszy2OeKnOZmEqExWnKKE/VYuPyhy6V7i3TwJA\n" + + "f8skDgtPK0OsBCa6IljPaHoWBjPc4kFkSTSS1d56hUcWSikTmiuKdLyBb85AADSZYsvHWrte4opN\n" + "dhNukMJuRA==\n"; - private String certContent = "-----BEGIN CERTIFICATE-----\n" + "MIIE3jCCA8agAwIBAgIFAqv56tIwDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYT\n" - + "AlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYD\n" + "VQQKExFHb0RhZGR5LmNvbSwgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRpZmlj\n" - + "YXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5MTAwLgYDVQQDEydHbyBEYWRkeSBT\n" + "ZWN1cmUgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxETAPBgNVBAUTCDA3OTY5Mjg3\n" - + "MB4XDTA5MDIxMTA0NTc1NloXDTEyMDIwNzA1MTEyM1owWTEZMBcGA1UECgwQKi5y\n" + "ZWFsaG9zdGlwLmNvbTEhMB8GA1UECwwYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVk\n" - + "MRkwFwYDVQQDDBAqLnJlYWxob3N0aXAuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN\n" + "ADCBiQKBgQC1ebxpZIlsKGV+IU0aZT1z/KrUk4cGYZKPJ6HmOb3/BAsJnfr6wk8P\n" - + "yb5zrZMf/KGDW4P0nlLdRHzrJOoKiXQW5RhQWUTHFCZSKahPc7r+vFPRvBn4v6r0\n" + "UmN9+oYm8NCeW2eL59UKpshwwfgs3mvQIxVFewBFRtefrxA+8IcvvwIDAQABo4IB\n" - + "vTCCAbkwDwYDVR0TAQH/BAUwAwEBADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\n" + "BQUHAwIwDgYDVR0PAQH/BAQDAgWgMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9j\n" - + "cmwuZ29kYWRkeS5jb20vZ2RzMS0yLmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0B\n" + "BxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" - + "b20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0\n" + "cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlm\n" - + "aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNy\n" + "dDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAq\n" - + "LnJlYWxob3N0aXAuY29tgg5yZWFsaG9zdGlwLmNvbTAdBgNVHQ4EFgQUHxwmdK5w\n" + "9/YVeZ/3fHyi6nQfzoYwDQYJKoZIhvcNAQEFBQADggEBABv/XinvId6oWXJtmku+\n" - + "7m90JhSVH0ycoIGjgdaIkcExQGP08MCilbUsPcbhLheSFdgn/cR4e1MP083lacoj\n" + "OGauY7b8f/cuquGkT49Ns14awPlEzRjjycQEjjLxFEuL5CFWa2t2gKRE1dSfhDQ+\n" - + "fJ6GBCs1XgZLuhkKS8fPf+YmG2ZjHzYDjYoSx7paDXgEm+kbYIZdCK51lA0BUAjP\n" + "9ZMGhsu/PpAbh5U/DtcIqxY0xeqD4TeGsBzXg6uLhv+jKHDtXg5fYPe+z0n5DCEL\n" - + "k0fLF4+i/pt9hVCz0QrZ28RUhXf825+EOL0Gw+Uzt+7RV2cCaJrlu4cDrDom2FRy\n" + "E8I=\n" + "-----END CERTIFICATE-----\n"; + private final String certContent = "-----BEGIN CERTIFICATE-----\n" + "MIIE3jCCA8agAwIBAgIFAqv56tIwDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYT\n" + + "AlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYD\n" + "VQQKExFHb0RhZGR5LmNvbSwgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRpZmlj\n" + + "YXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5MTAwLgYDVQQDEydHbyBEYWRkeSBT\n" + "ZWN1cmUgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxETAPBgNVBAUTCDA3OTY5Mjg3\n" + + "MB4XDTA5MDIxMTA0NTc1NloXDTEyMDIwNzA1MTEyM1owWTEZMBcGA1UECgwQKi5y\n" + "ZWFsaG9zdGlwLmNvbTEhMB8GA1UECwwYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVk\n" + + "MRkwFwYDVQQDDBAqLnJlYWxob3N0aXAuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN\n" + "ADCBiQKBgQC1ebxpZIlsKGV+IU0aZT1z/KrUk4cGYZKPJ6HmOb3/BAsJnfr6wk8P\n" + + "yb5zrZMf/KGDW4P0nlLdRHzrJOoKiXQW5RhQWUTHFCZSKahPc7r+vFPRvBn4v6r0\n" + "UmN9+oYm8NCeW2eL59UKpshwwfgs3mvQIxVFewBFRtefrxA+8IcvvwIDAQABo4IB\n" + + "vTCCAbkwDwYDVR0TAQH/BAUwAwEBADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\n" + "BQUHAwIwDgYDVR0PAQH/BAQDAgWgMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9j\n" + + "cmwuZ29kYWRkeS5jb20vZ2RzMS0yLmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0B\n" + "BxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\n" + + "b20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0\n" + "cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlm\n" + + "aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNy\n" + "dDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAq\n" + + "LnJlYWxob3N0aXAuY29tgg5yZWFsaG9zdGlwLmNvbTAdBgNVHQ4EFgQUHxwmdK5w\n" + "9/YVeZ/3fHyi6nQfzoYwDQYJKoZIhvcNAQEFBQADggEBABv/XinvId6oWXJtmku+\n" + + "7m90JhSVH0ycoIGjgdaIkcExQGP08MCilbUsPcbhLheSFdgn/cR4e1MP083lacoj\n" + "OGauY7b8f/cuquGkT49Ns14awPlEzRjjycQEjjLxFEuL5CFWa2t2gKRE1dSfhDQ+\n" + + "fJ6GBCs1XgZLuhkKS8fPf+YmG2ZjHzYDjYoSx7paDXgEm+kbYIZdCK51lA0BUAjP\n" + "9ZMGhsu/PpAbh5U/DtcIqxY0xeqD4TeGsBzXg6uLhv+jKHDtXg5fYPe+z0n5DCEL\n" + + "k0fLF4+i/pt9hVCz0QrZ28RUhXf825+EOL0Gw+Uzt+7RV2cCaJrlu4cDrDom2FRy\n" + "E8I=\n" + "-----END CERTIFICATE-----\n"; @Override @Before @@ -151,7 +152,6 @@ public class KeystoreTest extends TestCase { vm.setObjectName("virtualmachine"); */ String result = ApiSerializerHelper.toSerializedString(vm); - // String result = "org.apache.cloudstack.api.response.UserVmResponse/virtualmachine/{\"id\":{\"_tableName\":\"vm_instance\",\"_value\":3},\"name\":\"i-2-3-KY\",\"displayname\":\"i-2-3-KY\",\"account\":\"admin\",\"projectid\":{\"_tableName\":\"projects\"},\"domainid\":{\"_tableName\":\"domain\",\"_value\":1},\"domain\":\"ROOT\",\"created\":\"2011-11-02T21:54:07-0700\",\"state\":\"Running\",\"haenable\":false,\"groupid\":{\"_tableName\":\"instance_group\"},\"zoneid\":{\"_tableName\":\"data_center\",\"_value\":1},\"zonename\":\"KY\",\"hostid\":{\"_tableName\":\"host\",\"_value\":1},\"hostname\":\"xenserver-basic\",\"templateid\":{\"_tableName\":\"vm_template\",\"_value\":2},\"templatename\":\"CentOS 5.3(64-bit) no GUI (XenServer)\",\"templatedisplaytext\":\"CentOS 5.3(64-bit) no GUI (XenServer)\",\"passwordenabled\":false,\"isoid\":{\"_tableName\":\"vm_template\"},\"serviceofferingid\":{\"_tableName\":\"disk_offering\",\"_value\":7},\"serviceofferingname\":\"Small Instance\",\"cpunumber\":1,\"cpuspeed\":500,\"memory\":512,\"guestosid\":{\"_tableName\":\"guest_os\",\"_value\":12},\"rootdeviceid\":0,\"rootdevicetype\":\"NetworkFilesystem\",\"securitygroup\":[],\"jobid\":{\"_tableName\":\"async_job\"},\"nic\":[{\"id\":7,\"networkid\":200,\"netmask\":\"255.255.255.0\",\"gateway\":\"10.1.1.1\",\"ipaddress\":\"10.1.1.116\",\"isolationuri\":\"vlan://1699\",\"broadcasturi\":\"vlan://1699\",\"traffictype\":\"Guest\",\"type\":\"Virtual\",\"isdefault\":true,\"macaddress\":\"02:00:39:a7:00:01\"}],\"hypervisor\":\"XenServer\"}"; System.out.println(result); //Object obj = ApiSerializerHelper.fromSerializedString(result); diff --git a/server/test/com/cloud/network/CreatePrivateNetworkTest.java b/server/test/com/cloud/network/CreatePrivateNetworkTest.java index 3f43c8bb694..dc979d05c94 100644 --- a/server/test/com/cloud/network/CreatePrivateNetworkTest.java +++ b/server/test/com/cloud/network/CreatePrivateNetworkTest.java @@ -32,10 +32,10 @@ import junit.framework.Assert; import org.apache.log4j.Logger; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; + import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -61,7 +61,6 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @@ -102,8 +101,9 @@ public class CreatePrivateNetworkTest { Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); when(networkService._accountMgr.getAccount(anyLong())).thenReturn(account); - NetworkOfferingVO ntwkOff = new NetworkOfferingVO("offer", "fakeOffer", TrafficType.Guest, true, true, null, null, false, null, null, GuestType.Isolated, false, false, - false, false, false, false, false, false, false, false, false, false, false); + NetworkOfferingVO ntwkOff = + new NetworkOfferingVO("offer", "fakeOffer", TrafficType.Guest, true, true, null, null, false, null, null, GuestType.Isolated, false, false, false, false, + false, false, false, false, false, false, false, false, false); when(networkService._networkOfferingDao.findById(anyLong())).thenReturn(ntwkOff); List netofferlist = new ArrayList(); netofferlist.add(ntwkOff); @@ -117,12 +117,13 @@ public class CreatePrivateNetworkTest { when(networkService._networksDao.getPrivateNetwork(anyString(), anyString(), eq(1L), eq(1L), anyLong())).thenReturn(null); - Network net = new NetworkVO(1L, TrafficType.Guest, Mode.None, BroadcastDomainType.Vlan, 1L, 1L, 1L, 1L, "bla", "fake", "eet.net", GuestType.Isolated, 1L, 1L, - ACLType.Account, false, 1L); + Network net = + new NetworkVO(1L, TrafficType.Guest, Mode.None, BroadcastDomainType.Vlan, 1L, 1L, 1L, 1L, "bla", "fake", "eet.net", GuestType.Isolated, 1L, 1L, + ACLType.Account, false, 1L); when( - networkService._networkMgr.createGuestNetwork(eq(ntwkOff.getId()), eq("bla"), eq("fake"), eq("10.1.1.1"), eq("10.1.1.0/24"), anyString(), anyString(), eq(account), - anyLong(), eq(physicalNetwork), eq(physicalNetwork.getDataCenterId()), eq(ACLType.Account), anyBoolean(), eq(1L), anyString(), anyString(), anyBoolean(), - anyString())).thenReturn(net); + networkService._networkMgr.createGuestNetwork(eq(ntwkOff.getId()), eq("bla"), eq("fake"), eq("10.1.1.1"), eq("10.1.1.0/24"), anyString(), anyString(), + eq(account), anyLong(), eq(physicalNetwork), eq(physicalNetwork.getDataCenterId()), eq(ACLType.Account), anyBoolean(), eq(1L), anyString(), anyString(), + anyBoolean(), anyString())).thenReturn(net); when(networkService._privateIpDao.findByIpAndSourceNetworkId(net.getId(), "10.1.1.2")).thenReturn(null); when(networkService._privateIpDao.findByIpAndSourceNetworkIdAndVpcId(eq(1L), anyString(), eq(1L))).thenReturn(null); diff --git a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java index fbf9b7db0e4..176891b198e 100644 --- a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java +++ b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java @@ -37,6 +37,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; + import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd; import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd; import org.apache.cloudstack.api.command.admin.network.ReleaseDedicatedGuestVlanRangeCmd; @@ -54,7 +55,6 @@ import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; public class DedicateGuestVlanRangesTest { diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java index f5e2994618b..5d74c851144 100644 --- a/server/test/com/cloud/network/MockFirewallManagerImpl.java +++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java @@ -30,13 +30,12 @@ import com.cloud.network.dao.IPAddressVO; import com.cloud.network.firewall.FirewallService; import com.cloud.network.rules.FirewallManager; import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.rules.FirewallRule.FirewallRuleType; import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.FirewallRule.TrafficType; +import com.cloud.network.rules.FirewallRuleVO; import com.cloud.user.Account; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; @Local(value = {FirewallManager.class, FirewallService.class}) diff --git a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java index ff6edf20269..2608371db53 100644 --- a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java +++ b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java @@ -16,29 +16,25 @@ // under the License. package com.cloud.network; -import com.cloud.capacity.CapacityManagerImpl; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.DataCenterVnetDao; -import com.cloud.network.NetworkServiceImpl; -import com.cloud.network.dao.PhysicalNetworkDao; -import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionLegacy; - -import org.junit.*; -import org.mockito.ArgumentCaptor; -import org.mockito.MockitoAnnotations.*; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.DataCenterVnetDao; +import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.utils.db.TransactionLegacy; public class UpdatePhysicalNetworkTest { private PhysicalNetworkDao _physicalNetworkDao = mock(PhysicalNetworkDao.class); @@ -51,7 +47,7 @@ public class UpdatePhysicalNetworkTest { public NetworkServiceImpl setUp() { NetworkServiceImpl networkService = new NetworkServiceImpl(); - ((NetworkServiceImpl)networkService)._dcDao = _datacenterDao; + networkService._dcDao = _datacenterDao; networkService._physicalNetworkDao = _physicalNetworkDao; networkService._datacneter_vnet = _DatacenterVnetDao; return networkService; diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java index f9aa3dc5d62..81aacdd5b07 100644 --- a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java +++ b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java @@ -19,10 +19,6 @@ package com.cloud.network.security; import java.io.IOException; -import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; -import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; -import org.apache.cloudstack.test.utils.SpringUtils; - import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -33,15 +29,19 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; +import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.agent.AgentManager; import com.cloud.api.query.dao.SecurityGroupJoinDaoImpl; import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.HostPodDaoImpl; import com.cloud.dc.dao.PodVlanDaoImpl; import com.cloud.domain.dao.DomainDaoImpl; @@ -70,12 +70,15 @@ import com.cloud.vm.dao.UserVmDetailsDaoImpl; import com.cloud.vm.dao.VMInstanceDaoImpl; @Configuration -@ComponentScan(basePackageClasses = {SecurityGroupRulesDaoImpl.class, UserVmDaoImpl.class, AccountDaoImpl.class, ConfigurationDaoImpl.class, SecurityGroupWorkDaoImpl.class, - VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class, ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, - HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, - SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class, SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, - DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, SecurityGroupRuleDaoImpl.class, - NicDaoImpl.class, SecurityGroupJoinDaoImpl.class}, includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) +@ComponentScan(basePackageClasses = {SecurityGroupRulesDaoImpl.class, UserVmDaoImpl.class, AccountDaoImpl.class, ConfigurationDaoImpl.class, + SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class, + ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, + DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class, + SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, + DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, SecurityGroupRuleDaoImpl.class, NicDaoImpl.class, + SecurityGroupJoinDaoImpl.class}, + includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)}, + useDefaultFilters = false) public class SecurityGroupManagerTestConfiguration { @Bean diff --git a/server/test/com/cloud/network/security/SecurityGroupQueueTest.java b/server/test/com/cloud/network/security/SecurityGroupQueueTest.java index 213e267a60e..6c104c275aa 100644 --- a/server/test/com/cloud/network/security/SecurityGroupQueueTest.java +++ b/server/test/com/cloud/network/security/SecurityGroupQueueTest.java @@ -21,10 +21,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.cloud.utils.Profiler; - import junit.framework.TestCase; +import com.cloud.utils.Profiler; + public class SecurityGroupQueueTest extends TestCase { public final static SecurityGroupWorkQueue queue = new LocalSecurityGroupWorkQueue(); @@ -40,6 +40,7 @@ public class SecurityGroupQueueTest extends TestCase { } } + @Override public void run() { _newWorkQueued = queue.submitWorkForVms(vmIds); } @@ -61,6 +62,7 @@ public class SecurityGroupQueueTest extends TestCase { this._numJobsToDequeue = numJobsToDequeu; } + @Override public void run() { List result = new ArrayList(); try { diff --git a/server/test/com/cloud/projects/MockProjectManagerImpl.java b/server/test/com/cloud/projects/MockProjectManagerImpl.java index 7bd0183f91b..dc377ff6f42 100644 --- a/server/test/com/cloud/projects/MockProjectManagerImpl.java +++ b/server/test/com/cloud/projects/MockProjectManagerImpl.java @@ -22,17 +22,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import com.cloud.api.query.vo.ProjectAccountJoinVO; -import com.cloud.api.query.vo.ProjectInvitationJoinVO; -import com.cloud.api.query.vo.ProjectJoinVO; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.projects.ProjectAccount.Role; import com.cloud.user.Account; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; -import com.cloud.utils.Pair; @Local(value = {ProjectManager.class}) public class MockProjectManagerImpl extends ManagerBase implements ProjectManager { diff --git a/server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java b/server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java index 053fab42fd6..8b7c9b71d87 100644 --- a/server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java +++ b/server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java @@ -37,6 +37,7 @@ public class ResourceLimitManagerImplTest extends TestCase { } + @Override @After public void tearDown() throws Exception { } diff --git a/server/test/com/cloud/server/ConfigurationServerImplTest.java b/server/test/com/cloud/server/ConfigurationServerImplTest.java index 6e1f4f90b37..08a20974f9a 100644 --- a/server/test/com/cloud/server/ConfigurationServerImplTest.java +++ b/server/test/com/cloud/server/ConfigurationServerImplTest.java @@ -16,13 +16,13 @@ // under the License. package com.cloud.server; +import java.io.File; +import java.io.IOException; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.junit.Test; -import java.io.File; -import java.io.IOException; - public class ConfigurationServerImplTest { final static String TEST = "the quick brown fox jumped over the lazy dog"; diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTest.java b/server/test/com/cloud/snapshot/SnapshotDaoTest.java index 309d8e759be..ec77a4bafa4 100644 --- a/server/test/com/cloud/snapshot/SnapshotDaoTest.java +++ b/server/test/com/cloud/snapshot/SnapshotDaoTest.java @@ -20,6 +20,9 @@ import java.util.List; import javax.inject.Inject; +import junit.framework.Assert; +import junit.framework.TestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,9 +34,6 @@ import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDaoImpl; import com.cloud.utils.component.ComponentContext; -import junit.framework.Assert; -import junit.framework.TestCase; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/SnapshotDaoTestContext.xml") public class SnapshotDaoTest extends TestCase { diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java index bdc0bfe6a33..ffb97b885af 100644 --- a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java +++ b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java @@ -19,7 +19,6 @@ package com.cloud.snapshot; import java.io.IOException; -import org.apache.cloudstack.test.utils.SpringUtils; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; @@ -28,6 +27,8 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.HostPodDaoImpl; @@ -42,7 +43,7 @@ import com.cloud.vm.dao.VMInstanceDaoImpl; @Configuration @ComponentScan(basePackageClasses = {SnapshotDaoImpl.class, ResourceTagsDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, NicDaoImpl.class, HostDaoImpl.class, - HostDetailsDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class}, + HostDetailsDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class}, includeFilters = {@Filter(value = SnapshotDaoTestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public class SnapshotDaoTestConfiguration { diff --git a/server/test/com/cloud/storage/dao/StoragePoolDaoTest.java b/server/test/com/cloud/storage/dao/StoragePoolDaoTest.java index 8014bf69313..cf7cf9764df 100644 --- a/server/test/com/cloud/storage/dao/StoragePoolDaoTest.java +++ b/server/test/com/cloud/storage/dao/StoragePoolDaoTest.java @@ -18,13 +18,14 @@ package com.cloud.storage.dao; import javax.inject.Inject; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import junit.framework.TestCase; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import junit.framework.TestCase; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; import com.cloud.storage.StoragePoolStatus; diff --git a/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java b/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java index 43c0953fd34..14d8f062eeb 100644 --- a/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java +++ b/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java @@ -19,8 +19,6 @@ package com.cloud.storage.dao; import java.io.IOException; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; -import org.apache.cloudstack.test.utils.SpringUtils; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; @@ -29,6 +27,9 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.apache.cloudstack.test.utils.SpringUtils; + @Configuration @ComponentScan(basePackageClasses = {PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class}, includeFilters = {@Filter(value = StoragePoolDaoTestConfiguration.Library.class, type = FilterType.CUSTOM)}, diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index 56a483bae55..62e7fc88403 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; @@ -29,7 +31,6 @@ import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; import org.apache.cloudstack.api.command.admin.user.RegisterCmd; import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; -import org.springframework.stereotype.Component; import com.cloud.api.query.vo.ControlledViewEntity; import com.cloud.domain.Domain; @@ -291,14 +292,15 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco } @Override - public UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType, - Long domainId, String networkDomain, Map details, String accountUUID, String userUUID) { + public UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, + short accountType, Long domainId, String networkDomain, Map details, String accountUUID, String userUUID) { // TODO Auto-generated method stub return null; } @Override - public User createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, String userUUID) { + public User createUser(String userName, String password, String firstName, String lastName, String email, String timeZone, String accountName, Long domainId, + String userUUID) { // TODO Auto-generated method stub return null; } diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java index 0dfe5dd5c95..7dddefbcf3f 100644 --- a/server/test/com/cloud/user/MockDomainManagerImpl.java +++ b/server/test/com/cloud/user/MockDomainManagerImpl.java @@ -23,16 +23,16 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd; import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd; -import org.springframework.stereotype.Component; import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.exception.PermissionDeniedException; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; @Component diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java index 1616bccb76f..0d82ff22c15 100644 --- a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java +++ b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.vm; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNull; import java.io.IOException; import java.util.ArrayList; @@ -25,33 +25,23 @@ import java.util.List; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.StorageManager; -import com.cloud.storage.dao.DiskOfferingDao; -import com.cloud.storage.dao.GuestOSCategoryDao; -import com.cloud.storage.dao.GuestOSDao; -import com.cloud.storage.dao.StoragePoolHostDao; -import com.cloud.storage.dao.VolumeDao; -import com.cloud.capacity.CapacityManager; -import com.cloud.capacity.dao.CapacityDao; -import com.cloud.deploy.DeploymentPlanner.ExcludeList; -import com.cloud.agent.AgentManager; -import com.cloud.dc.ClusterDetailsDao; -import com.cloud.dc.ClusterVO; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.DedicatedResourceDao; -import com.cloud.dc.dao.HostPodDao; -import com.cloud.deploy.DataCenterDeployment; -import com.cloud.deploy.DeployDestination; -import com.cloud.deploy.DeploymentClusterPlanner; -import com.cloud.deploy.DeploymentPlanner; -import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage; -import com.cloud.deploy.DeploymentPlanningManagerImpl; -import com.cloud.deploy.FirstFitPlanner; -import com.cloud.deploy.PlannerHostReservationVO; -import com.cloud.deploy.dao.PlannerHostReservationDao; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.apache.cloudstack.affinity.AffinityGroupProcessor; import org.apache.cloudstack.affinity.AffinityGroupService; @@ -64,27 +54,37 @@ import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.test.utils.SpringUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - +import com.cloud.agent.AgentManager; +import com.cloud.capacity.CapacityManager; +import com.cloud.capacity.dao.CapacityDao; +import com.cloud.dc.ClusterDetailsDao; +import com.cloud.dc.ClusterVO; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.dao.ClusterDao; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.DedicatedResourceDao; +import com.cloud.dc.dao.HostPodDao; +import com.cloud.deploy.DataCenterDeployment; +import com.cloud.deploy.DeployDestination; +import com.cloud.deploy.DeploymentClusterPlanner; +import com.cloud.deploy.DeploymentPlanner; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage; +import com.cloud.deploy.DeploymentPlanningManagerImpl; +import com.cloud.deploy.FirstFitPlanner; +import com.cloud.deploy.PlannerHostReservationVO; +import com.cloud.deploy.dao.PlannerHostReservationDao; import com.cloud.exception.AffinityConflictException; import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.service.ServiceOfferingVO; +import com.cloud.storage.StorageManager; +import com.cloud.storage.dao.DiskOfferingDao; +import com.cloud.storage.dao.GuestOSCategoryDao; +import com.cloud.storage.dao.GuestOSDao; +import com.cloud.storage.dao.StoragePoolHostDao; +import com.cloud.storage.dao.VolumeDao; import com.cloud.user.AccountManager; import com.cloud.utils.component.ComponentContext; import com.cloud.vm.dao.UserVmDao; @@ -137,19 +137,19 @@ public class DeploymentPlanningManagerImplTest { ComponentContext.initComponentsLifeCycle(); PlannerHostReservationVO reservationVO = new PlannerHostReservationVO(200L, 1L, 2L, 3L, PlannerResourceUsage.Shared); - Mockito.when(_plannerHostReserveDao.persist(Mockito.any(PlannerHostReservationVO.class))).thenReturn(reservationVO); - Mockito.when(_plannerHostReserveDao.findById(Mockito.anyLong())).thenReturn(reservationVO); - Mockito.when(_affinityGroupVMMapDao.countAffinityGroupsForVm(Mockito.anyLong())).thenReturn(0L); + Mockito.when(_plannerHostReserveDao.persist(Matchers.any(PlannerHostReservationVO.class))).thenReturn(reservationVO); + Mockito.when(_plannerHostReserveDao.findById(Matchers.anyLong())).thenReturn(reservationVO); + Mockito.when(_affinityGroupVMMapDao.countAffinityGroupsForVm(Matchers.anyLong())).thenReturn(0L); VMInstanceVO vm = new VMInstanceVO(); Mockito.when(vmProfile.getVirtualMachine()).thenReturn(vm); - Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(dc); + Mockito.when(_dcDao.findById(Matchers.anyLong())).thenReturn(dc); Mockito.when(dc.getId()).thenReturn(dataCenterId); ClusterVO clusterVO = new ClusterVO(); clusterVO.setHypervisorType(HypervisorType.XenServer.toString()); - Mockito.when(_clusterDao.findById(Mockito.anyLong())).thenReturn(clusterVO); + Mockito.when(_clusterDao.findById(Matchers.anyLong())).thenReturn(clusterVO); Mockito.when(_planner.getName()).thenReturn("FirstFitPlanner"); List planners = new ArrayList(); @@ -160,25 +160,27 @@ public class DeploymentPlanningManagerImplTest { @Test public void dataCenterAvoidTest() throws InsufficientServerCapacityException, AffinityConflictException { - ServiceOfferingVO svcOffering = new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, - VirtualMachine.Type.User, domainId, null, "FirstFitPlanner"); + ServiceOfferingVO svcOffering = + new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, VirtualMachine.Type.User, domainId, + null, "FirstFitPlanner"); Mockito.when(vmProfile.getServiceOffering()).thenReturn(svcOffering); DataCenterDeployment plan = new DataCenterDeployment(dataCenterId); - Mockito.when(avoids.shouldAvoid((DataCenterVO)Mockito.anyObject())).thenReturn(true); + Mockito.when(avoids.shouldAvoid((DataCenterVO)Matchers.anyObject())).thenReturn(true); DeployDestination dest = _dpm.planDeployment(vmProfile, plan, avoids); assertNull("DataCenter is in avoid set, destination should be null! ", dest); } @Test public void plannerCannotHandleTest() throws InsufficientServerCapacityException, AffinityConflictException { - ServiceOfferingVO svcOffering = new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, - VirtualMachine.Type.User, domainId, null, "UserDispersingPlanner"); + ServiceOfferingVO svcOffering = + new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, VirtualMachine.Type.User, domainId, + null, "UserDispersingPlanner"); Mockito.when(vmProfile.getServiceOffering()).thenReturn(svcOffering); DataCenterDeployment plan = new DataCenterDeployment(dataCenterId); - Mockito.when(avoids.shouldAvoid((DataCenterVO)Mockito.anyObject())).thenReturn(false); + Mockito.when(avoids.shouldAvoid((DataCenterVO)Matchers.anyObject())).thenReturn(false); Mockito.when(_planner.canHandle(vmProfile, plan, avoids)).thenReturn(false); DeployDestination dest = _dpm.planDeployment(vmProfile, plan, avoids); @@ -187,12 +189,13 @@ public class DeploymentPlanningManagerImplTest { @Test public void emptyClusterListTest() throws InsufficientServerCapacityException, AffinityConflictException { - ServiceOfferingVO svcOffering = new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, - VirtualMachine.Type.User, domainId, null, "FirstFitPlanner"); + ServiceOfferingVO svcOffering = + new ServiceOfferingVO("testOffering", 1, 512, 500, 1, 1, false, false, false, "test dpm", false, false, null, false, VirtualMachine.Type.User, domainId, + null, "FirstFitPlanner"); Mockito.when(vmProfile.getServiceOffering()).thenReturn(svcOffering); DataCenterDeployment plan = new DataCenterDeployment(dataCenterId); - Mockito.when(avoids.shouldAvoid((DataCenterVO)Mockito.anyObject())).thenReturn(false); + Mockito.when(avoids.shouldAvoid((DataCenterVO)Matchers.anyObject())).thenReturn(false); Mockito.when(_planner.canHandle(vmProfile, plan, avoids)).thenReturn(true); Mockito.when(((DeploymentClusterPlanner)_planner).orderClusters(vmProfile, plan, avoids)).thenReturn(null); @@ -201,9 +204,8 @@ public class DeploymentPlanningManagerImplTest { } @Configuration - @ComponentScan(basePackageClasses = {DeploymentPlanningManagerImpl.class}, - includeFilters = {@Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)}, - useDefaultFilters = false) + @ComponentScan(basePackageClasses = {DeploymentPlanningManagerImpl.class}, includeFilters = {@Filter(value = TestConfiguration.Library.class, + type = FilterType.CUSTOM)}, useDefaultFilters = false) public static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean diff --git a/server/test/com/cloud/vm/UserVmManagerTest.java b/server/test/com/cloud/vm/UserVmManagerTest.java index a23d747a936..71bbebea386 100755 --- a/server/test/com/cloud/vm/UserVmManagerTest.java +++ b/server/test/com/cloud/vm/UserVmManagerTest.java @@ -192,7 +192,8 @@ public class UserVmManagerTest { // Test restoreVm when VM is in stopped state @Test - public void testRestoreVMF2() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void testRestoreVMF2() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { doReturn(VirtualMachine.State.Stopped).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); @@ -222,7 +223,8 @@ public class UserVmManagerTest { // Test restoreVM when VM is in running state @Test - public void testRestoreVMF3() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void testRestoreVMF3() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { doReturn(VirtualMachine.State.Running).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); @@ -252,7 +254,8 @@ public class UserVmManagerTest { // Test restoreVM on providing new template Id, when VM is in running state @Test - public void testRestoreVMF4() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void testRestoreVMF4() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { doReturn(VirtualMachine.State.Running).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); when(_volsDao.findByInstanceAndType(314L, Volume.Type.ROOT)).thenReturn(_rootVols); @@ -288,7 +291,8 @@ public class UserVmManagerTest { // Test restoreVM on providing new ISO Id, when VM(deployed using ISO) is in running state @Test - public void testRestoreVMF5() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + public void testRestoreVMF5() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { doReturn(VirtualMachine.State.Running).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); when(_volsDao.findByInstanceAndType(314L, Volume.Type.ROOT)).thenReturn(_rootVols); @@ -502,7 +506,8 @@ public class UserVmManagerTest { boolean ha = false; boolean useLocalStorage = false; - ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); + ServiceOfferingVO serviceOffering = + new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false); return serviceOffering; } diff --git a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java b/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java index b40ad2a5548..16ab18cecf9 100644 --- a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java +++ b/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoImplTest.java @@ -41,7 +41,7 @@ public class UserVmCloneSettingDaoImplTest extends TestCase { _vmcsdao.persist(vo); vo = _vmcsdao.findById(vmId); assert (vo.getCloneType().equalsIgnoreCase(cloneType)) : "Unexpected Clone Type retrieved from table! Retrieved: " + vo.getCloneType() + " while expected was: " + - cloneType; + cloneType; // Next test whether the record is retrieved by clone type. List voList = new ArrayList(); diff --git a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java b/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java index 6de6d937b79..9c187325a55 100644 --- a/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java +++ b/server/test/com/cloud/vm/dao/UserVmCloneSettingDaoTestConfiguration.java @@ -19,7 +19,6 @@ package com.cloud.vm.dao; import java.io.IOException; -import org.apache.cloudstack.test.utils.SpringUtils; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; @@ -28,7 +27,7 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; -import com.cloud.vm.dao.UserVmCloneSettingDaoImpl; +import org.apache.cloudstack.test.utils.SpringUtils; @Configuration @ComponentScan(basePackageClasses = {UserVmCloneSettingDaoImpl.class}, includeFilters = {@Filter(value = UserVmCloneSettingDaoTestConfiguration.Library.class, diff --git a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java index b1fef3d330a..b46ac7d4930 100644 --- a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java +++ b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java @@ -31,8 +31,8 @@ public class UserVmDaoImplTest extends TestCase { @Inject UserVmDao dao; - public void makeAndVerifyEntry(Long vmId, String instanceName, String displayName, long templateId, boolean userdataFlag, Hypervisor.HypervisorType hypervisor, long guestOsId, - boolean haEnabled, boolean limitCpuUse, long domainId, long accountId, long serviceOfferingId, String name, Long diskOfferingId) { + public void makeAndVerifyEntry(Long vmId, String instanceName, String displayName, long templateId, boolean userdataFlag, Hypervisor.HypervisorType hypervisor, + long guestOsId, boolean haEnabled, boolean limitCpuUse, long domainId, long accountId, long serviceOfferingId, String name, Long diskOfferingId) { dao.expunge(vmId); String userdata; @@ -46,8 +46,9 @@ public class UserVmDaoImplTest extends TestCase { } // Persist the data. - UserVmVO vo = new UserVmVO(vmId, instanceName, displayName, templateId, hypervisor, guestOsId, haEnabled, limitCpuUse, domainId, accountId, serviceOfferingId, userdata, - name, diskOfferingId); + UserVmVO vo = + new UserVmVO(vmId, instanceName, displayName, templateId, hypervisor, guestOsId, haEnabled, limitCpuUse, domainId, accountId, serviceOfferingId, userdata, + name, diskOfferingId); dao.persist(vo); vo = dao.findById(vmId); diff --git a/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java b/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java index 38fc8ede672..5d14f6d28c2 100644 --- a/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java +++ b/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java @@ -19,7 +19,6 @@ package com.cloud.vm.dao; import java.io.IOException; -import org.apache.cloudstack.test.utils.SpringUtils; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; @@ -28,6 +27,8 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.test.utils.SpringUtils; + @Configuration @ComponentScan(basePackageClasses = {UserVmDaoImpl.class}, includeFilters = {@Filter(value = UserVmDaoTestConfiguration.Library.class, type = FilterType.CUSTOM)}, diff --git a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java index 27e9ce88e51..352dbeacae4 100644 --- a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java +++ b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java @@ -27,26 +27,18 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import com.amazonaws.services.ec2.model.HypervisorType; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import com.cloud.agent.AgentManager; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.CreateVMSnapshotAnswer; -import com.cloud.agent.api.CreateVMSnapshotCommand; -import com.cloud.agent.api.to.VolumeTO; import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.OperationTimedoutException; diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index f2ba549e5e7..71d85804c1a 100755 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -23,7 +23,6 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import javax.naming.NamingException; import org.springframework.stereotype.Component; @@ -80,11 +79,8 @@ import com.cloud.offering.ServiceOffering; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDaoImpl; import com.cloud.org.Grouping.AllocationState; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.DiskOfferingVO; import com.cloud.user.Account; import com.cloud.utils.component.ManagerBase; -import com.cloud.vm.VirtualMachine.Type; @Component @Local(value = {ConfigurationManager.class, ConfigurationService.class}) @@ -433,9 +429,9 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu */ @Override public NetworkOfferingVO createNetworkOffering(String name, String displayText, TrafficType trafficType, String tags, boolean specifyVlan, Availability availability, - Integer networkRate, Map> serviceProviderMap, boolean isDefault, GuestType type, boolean systemOnly, Long serviceOfferingId, boolean conserveMode, - Map> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent, Map details, - boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive) { + Integer networkRate, Map> serviceProviderMap, boolean isDefault, GuestType type, boolean systemOnly, Long serviceOfferingId, + boolean conserveMode, Map> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent, + Map details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive) { // TODO Auto-generated method stub return null; } diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 503d4225cc2..2388a7f2993 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -105,8 +105,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches Provider implementedProvider = element.getProvider(); if (implementedProvider != null) { if (s_providerToNetworkElementMap.containsKey(implementedProvider.getName())) { - s_logger.error("Cannot start MapNetworkManager: Provider <-> NetworkElement must be a one-to-one map, " + "multiple NetworkElements found for Provider: " + - implementedProvider.getName()); + s_logger.error("Cannot start MapNetworkManager: Provider <-> NetworkElement must be a one-to-one map, " + + "multiple NetworkElements found for Provider: " + implementedProvider.getName()); return false; } s_providerToNetworkElementMap.put(implementedProvider.getName(), element.getName()); @@ -212,7 +212,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#restartNetwork(com.cloud.api.commands.RestartNetworkCmd, boolean) */ @Override - public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { // TODO Auto-generated method stub return false; } @@ -248,8 +249,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#updateGuestNetwork(long, java.lang.String, java.lang.String, com.cloud.user.Account, com.cloud.user.User, java.lang.String, java.lang.Long, java.lang.Boolean) */ @Override - public Network updateGuestNetwork(long networkId, String name, String displayText, Account callerAccount, User callerUser, String domainSuffix, Long networkOfferingId, - Boolean changeCidr, String guestVmCidr, Boolean displayNetwork) { + public Network updateGuestNetwork(long networkId, String name, String displayText, Account callerAccount, User callerUser, String domainSuffix, + Long networkOfferingId, Boolean changeCidr, String guestVmCidr, Boolean displayNetwork) { // TODO Auto-generated method stub return null; } @@ -258,8 +259,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#createPhysicalNetwork(java.lang.Long, java.lang.String, java.lang.String, java.util.List, java.lang.String, java.lang.Long, java.util.List, java.lang.String) */ @Override - public PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed, List isolationMethods, String broadcastDomainRange, Long domainId, - List tags, String name) { + public PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed, List isolationMethods, String broadcastDomainRange, + Long domainId, List tags, String name) { // TODO Auto-generated method stub return null; } @@ -323,8 +324,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#addProviderToPhysicalNetwork(java.lang.Long, java.lang.String, java.lang.Long, java.util.List) */ @Override - public PhysicalNetworkServiceProvider - addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, List enabledServices) { + public PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, + List enabledServices) { // TODO Auto-generated method stub return null; } @@ -479,8 +480,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#associateIPToNetwork(long, long) */ @Override - public IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException, ResourceAllocationException, ResourceUnavailableException, - ConcurrentOperationException { + public IpAddress associateIPToNetwork(long ipId, long networkId) throws InsufficientAddressCapacityException, ResourceAllocationException, + ResourceUnavailableException, ConcurrentOperationException { // TODO Auto-generated method stub return null; } @@ -489,8 +490,9 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkService#createPrivateNetwork(java.lang.String, java.lang.String, long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, long, java.lang.Long) */ @Override - public Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan, String startIp, String endIP, String gateway, String netmask, - long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException { + public Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan, String startIp, String endIP, String gateway, + String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException, + InsufficientCapacityException { // TODO Auto-generated method stub return null; } @@ -510,7 +512,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches */ @Override public List setupNetwork(Account owner, NetworkOffering offering, Network predefined, DeploymentPlan plan, String name, String displayText, - boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isNetworkDisplayEnabled) throws ConcurrentOperationException { + boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isNetworkDisplayEnabled) + throws ConcurrentOperationException { // TODO Auto-generated method stub return null; } @@ -529,8 +532,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkManager#prepare(com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override - public void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException { + public void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException { // TODO Auto-generated method stub } @@ -603,9 +606,10 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkManager#createGuestNetwork(long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, com.cloud.user.Account, java.lang.Long, com.cloud.network.PhysicalNetwork, long, org.apache.cloudstack.acl.ControlledEntity.ACLType, java.lang.Boolean, java.lang.Long) */ @Override - public Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, Account owner, - Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6, String cidrv6, - Boolean displayNetworkEnabled, String isolatedPvlan) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { + public Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, String networkDomain, + Account owner, Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6, + String cidrv6, Boolean displayNetworkEnabled, String isolatedPvlan) throws ConcurrentOperationException, InsufficientCapacityException, + ResourceAllocationException { // TODO Auto-generated method stub return null; } @@ -716,8 +720,8 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches * @see com.cloud.network.NetworkManager#restartNetwork(java.lang.Long, com.cloud.user.Account, com.cloud.user.User, boolean) */ @Override - public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean restartNetwork(Long networkId, Account callerAccount, User callerUser, boolean cleanup) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { // TODO Auto-generated method stub return false; } diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java index 511caf2500c..b02e1a4b6c5 100644 --- a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java +++ b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd; import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd; import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd; @@ -33,7 +35,6 @@ import org.apache.cloudstack.api.command.user.vpn.ListVpnCustomerGatewaysCmd; import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd; import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd; import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd; -import org.springframework.stereotype.Component; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; @@ -44,7 +45,6 @@ import com.cloud.network.dao.Site2SiteVpnConnectionVO; import com.cloud.network.vpn.Site2SiteVpnManager; import com.cloud.network.vpn.Site2SiteVpnService; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.DomainRouterVO; diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java index 388772ea421..dbb2cc90df5 100644 --- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java +++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java @@ -23,10 +23,11 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import com.cloud.network.vpc.NetworkACLItem; -import org.apache.cloudstack.api.command.admin.router.*; import org.springframework.stereotype.Component; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd; + import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -42,12 +43,12 @@ import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VpcVirtualNetworkApplianceManager; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.StaticNat; +import com.cloud.network.vpc.NetworkACLItem; import com.cloud.network.vpc.PrivateGateway; import com.cloud.network.vpc.StaticRouteProfile; import com.cloud.network.vpc.Vpc; import com.cloud.user.Account; import com.cloud.user.User; -import com.cloud.uservm.UserVm; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.NicProfile; @@ -71,7 +72,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.router.VirtualNetworkApplianceManager#savePasswordToRouter(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, java.util.List) */ @Override - public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) throws ResourceUnavailableException { + public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) + throws ResourceUnavailableException { // TODO Auto-generated method stub return false; } @@ -86,7 +88,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.router.VirtualNetworkApplianceManager#saveUserDataToRouter(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, java.util.List) */ @Override - public boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) throws ResourceUnavailableException { + public boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) + throws ResourceUnavailableException { // TODO Auto-generated method stub return false; } @@ -95,8 +98,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.router.VirtualNetworkApplianceManager#deployVirtualRouterInGuestNetwork(com.cloud.network.Network, com.cloud.deploy.DeployDestination, com.cloud.user.Account, java.util.Map, boolean) */ @Override - public List deployVirtualRouterInGuestNetwork(Network guestNetwork, DeployDestination dest, Account owner, Map params, boolean isRedundant) - throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException { + public List deployVirtualRouterInGuestNetwork(Network guestNetwork, DeployDestination dest, Account owner, Map params, + boolean isRedundant) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException { // TODO Auto-generated method stub return null; } @@ -123,7 +126,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.router.VirtualNetworkApplianceManager#associatePublicIP(com.cloud.network.Network, java.util.List, java.util.List) */ @Override - public boolean associatePublicIP(Network network, List ipAddress, List routers) throws ResourceUnavailableException { + public boolean associatePublicIP(Network network, List ipAddress, List routers) + throws ResourceUnavailableException { // TODO Auto-generated method stub return false; } @@ -159,7 +163,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.router.VirtualNetworkApplianceManager#stop(com.cloud.network.router.VirtualRouter, boolean, com.cloud.user.User, com.cloud.user.Account) */ @Override - public VirtualRouter stop(VirtualRouter router, boolean forced, User callingUser, Account callingAccount) throws ConcurrentOperationException, ResourceUnavailableException { + public VirtualRouter stop(VirtualRouter router, boolean forced, User callingUser, Account callingAccount) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return null; } @@ -217,7 +222,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.VirtualNetworkApplianceService#startRouter(long, boolean) */ @Override - public VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { // TODO Auto-generated method stub return null; } @@ -226,7 +232,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.VirtualNetworkApplianceService#rebootRouter(long, boolean) */ @Override - public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + public VirtualRouter rebootRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { // TODO Auto-generated method stub return null; } @@ -306,8 +313,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.VpcVirtualNetworkApplianceService#addVpcRouterToGuestNetwork(com.cloud.network.router.VirtualRouter, com.cloud.network.Network, boolean) */ @Override - public boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + public boolean addVpcRouterToGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { // TODO Auto-generated method stub return false; } @@ -316,7 +323,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement * @see com.cloud.network.VpcVirtualNetworkApplianceService#removeVpcRouterFromGuestNetwork(com.cloud.network.router.VirtualRouter, com.cloud.network.Network, boolean) */ @Override - public boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, ResourceUnavailableException { + public boolean removeVpcRouterFromGuestNetwork(VirtualRouter router, Network network, boolean isRedundant) throws ConcurrentOperationException, + ResourceUnavailableException { // TODO Auto-generated method stub return false; } @@ -389,7 +397,8 @@ public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implement } @Override - public boolean applyLoadBalancingRules(Network network, List rules, List routers) throws ResourceUnavailableException { + public boolean applyLoadBalancingRules(Network network, List rules, List routers) + throws ResourceUnavailableException { // TODO Auto-generated method stub return false; } diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java index a67776e567d..3e1220d4f97 100644 --- a/server/test/com/cloud/vpc/NetworkACLManagerTest.java +++ b/server/test/com/cloud/vpc/NetworkACLManagerTest.java @@ -29,6 +29,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -119,29 +120,30 @@ public class NetworkACLManagerTest extends TestCase { @Test public void testCreateACL() throws Exception { - Mockito.when(_networkACLDao.persist(Mockito.any(NetworkACLVO.class))).thenReturn(acl); + Mockito.when(_networkACLDao.persist(Matchers.any(NetworkACLVO.class))).thenReturn(acl); assertNotNull(_aclMgr.createNetworkACL("acl_new", "acl desc", 1L)); } @Test public void testApplyACL() throws Exception { NetworkVO network = Mockito.mock(NetworkVO.class); - Mockito.when(_networkDao.findById(Mockito.anyLong())).thenReturn(network); - Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Mockito.anyLong(), Mockito.any(Network.Service.class), Mockito.any(Network.Provider.class))).thenReturn(true); - Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Mockito.any(Network.class), Mockito.anyList())).thenReturn(true); + Mockito.when(_networkDao.findById(Matchers.anyLong())).thenReturn(network); + Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))) + .thenReturn(true); + Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), Matchers.anyList())).thenReturn(true); assertTrue(_aclMgr.applyACLToNetwork(1L)); } @Test public void testRevokeACLItem() throws Exception { - Mockito.when(_networkACLItemDao.findById(Mockito.anyLong())).thenReturn(aclItem); + Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); assertTrue(_aclMgr.revokeNetworkACLItem(1L)); } @Test public void testUpdateACLItem() throws Exception { - Mockito.when(_networkACLItemDao.findById(Mockito.anyLong())).thenReturn(aclItem); - Mockito.when(_networkACLItemDao.update(Mockito.anyLong(), Mockito.any(NetworkACLItemVO.class))).thenReturn(true); + Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); + Mockito.when(_networkACLItemDao.update(Matchers.anyLong(), Matchers.any(NetworkACLItemVO.class))).thenReturn(true); assertNotNull(_aclMgr.updateNetworkACLItem(1L, "UDP", null, NetworkACLItem.TrafficType.Ingress, "Deny", 10, 22, 32, null, null)); } @@ -149,7 +151,7 @@ public class NetworkACLManagerTest extends TestCase { public void deleteNonEmptyACL() throws Exception { List aclItems = new ArrayList(); aclItems.add(aclItem); - Mockito.when(_networkACLItemDao.listByACL(Mockito.anyLong())).thenReturn(aclItems); + Mockito.when(_networkACLItemDao.listByACL(Matchers.anyLong())).thenReturn(aclItems); _aclMgr.deleteNetworkACL(acl); } diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java index 7f91845f3c3..820e1b607b5 100644 --- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java +++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java @@ -27,6 +27,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -147,41 +148,41 @@ public class NetworkACLServiceTest extends TestCase { @Test public void testCreateACL() throws Exception { - Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.anyLong())).thenReturn(new VpcVO()); + Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); Mockito.when(_networkAclMgr.createNetworkACL("acl_new", "acl desc", 1L)).thenReturn(acl); assertNotNull(_aclService.createNetworkACL("acl_new", "acl desc", 1L)); } @Test(expected = InvalidParameterValueException.class) public void testDeleteDefaultACL() throws Exception { - Mockito.when(_networkACLDao.findById(Mockito.anyLong())).thenReturn(acl); + Mockito.when(_networkACLDao.findById(Matchers.anyLong())).thenReturn(acl); Mockito.when(_networkAclMgr.deleteNetworkACL(acl)).thenReturn(true); _aclService.deleteNetworkACL(1L); } @Test public void testCreateACLItem() throws Exception { - Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.anyLong())).thenReturn(new VpcVO()); - Mockito.when(_networkAclMgr.getNetworkACL(Mockito.anyLong())).thenReturn(acl); + Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); + Mockito.when(_networkAclMgr.getNetworkACL(Matchers.anyLong())).thenReturn(acl); Mockito.when( - _networkAclMgr.createNetworkACLItem(Mockito.anyInt(), Mockito.anyInt(), Mockito.anyString(), Mockito.anyList(), Mockito.anyInt(), Mockito.anyInt(), - Mockito.any(NetworkACLItem.TrafficType.class), Mockito.anyLong(), Mockito.anyString(), Mockito.anyInt())).thenReturn(new NetworkACLItemVO()); - Mockito.when(_networkACLItemDao.findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt())).thenReturn(null); + _networkAclMgr.createNetworkACLItem(Matchers.anyInt(), Matchers.anyInt(), Matchers.anyString(), Matchers.anyList(), Matchers.anyInt(), Matchers.anyInt(), + Matchers.any(NetworkACLItem.TrafficType.class), Matchers.anyLong(), Matchers.anyString(), Matchers.anyInt())).thenReturn(new NetworkACLItemVO()); + Mockito.when(_networkACLItemDao.findByAclAndNumber(Matchers.anyLong(), Matchers.anyInt())).thenReturn(null); assertNotNull(_aclService.createNetworkACLItem(createACLItemCmd)); } @Test(expected = InvalidParameterValueException.class) public void testCreateACLItemDuplicateNumber() throws Exception { - Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.anyLong())).thenReturn(new VpcVO()); - Mockito.when(_networkAclMgr.getNetworkACL(Mockito.anyLong())).thenReturn(acl); - Mockito.when(_networkACLItemDao.findByAclAndNumber(Mockito.anyLong(), Mockito.anyInt())).thenReturn(new NetworkACLItemVO()); + Mockito.when(_entityMgr.findById(Matchers.eq(Vpc.class), Matchers.anyLong())).thenReturn(new VpcVO()); + Mockito.when(_networkAclMgr.getNetworkACL(Matchers.anyLong())).thenReturn(acl); + Mockito.when(_networkACLItemDao.findByAclAndNumber(Matchers.anyLong(), Matchers.anyInt())).thenReturn(new NetworkACLItemVO()); _aclService.createNetworkACLItem(createACLItemCmd); } @Test public void testDeleteACLItem() throws Exception { - Mockito.when(_networkACLItemDao.findById(Mockito.anyLong())).thenReturn(aclItem); - Mockito.when(_networkAclMgr.revokeNetworkACLItem(Mockito.anyLong())).thenReturn(true); + Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem); + Mockito.when(_networkAclMgr.revokeNetworkACLItem(Matchers.anyLong())).thenReturn(true); assertTrue(_aclService.revokeNetworkACLItem(1L)); } diff --git a/server/test/com/cloud/vpc/VpcTestConfiguration.java b/server/test/com/cloud/vpc/VpcTestConfiguration.java index 289cef44ef2..94e92128b9d 100644 --- a/server/test/com/cloud/vpc/VpcTestConfiguration.java +++ b/server/test/com/cloud/vpc/VpcTestConfiguration.java @@ -19,9 +19,6 @@ package com.cloud.vpc; import java.io.IOException; -import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; -import org.apache.cloudstack.test.utils.SpringUtils; - import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -32,6 +29,9 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; +import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl; +import org.apache.cloudstack.test.utils.SpringUtils; + import com.cloud.alert.AlertManager; import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; import com.cloud.configuration.dao.ResourceCountDaoImpl; @@ -40,10 +40,10 @@ import com.cloud.dao.EntityManagerImpl; import com.cloud.dc.dao.AccountVlanMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.HostPodDaoImpl; import com.cloud.dc.dao.PodVlanDaoImpl; import com.cloud.dc.dao.PodVlanMapDaoImpl; @@ -73,7 +73,6 @@ import com.cloud.network.rules.RulesManager; import com.cloud.network.vpc.VpcManagerImpl; import com.cloud.network.vpc.dao.PrivateIpDaoImpl; import com.cloud.network.vpc.dao.StaticRouteDaoImpl; -import com.cloud.network.vpc.dao.VpcDao; import com.cloud.network.vpc.dao.VpcGatewayDaoImpl; import com.cloud.network.vpc.dao.VpcOfferingDao; import com.cloud.network.vpc.dao.VpcServiceMapDaoImpl; @@ -109,20 +108,20 @@ import com.cloud.vpc.dao.MockVpcOfferingServiceMapDaoImpl; @Configuration @ComponentScan(basePackageClasses = {VpcManagerImpl.class, NetworkElement.class, VpcOfferingDao.class, ConfigurationDaoImpl.class, IPAddressDaoImpl.class, - DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class, PhysicalNetworkDaoImpl.class, - ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class, - Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, - HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class, UserStatisticsDaoImpl.class, - PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class, ResourceLimitDaoImpl.class, - ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, NicDaoImpl.class, SnapshotDaoImpl.class, - VMInstanceDaoImpl.class, VolumeDaoImpl.class, UserIpv6AddressDaoImpl.class, NicSecondaryIpDaoImpl.class, VpcServiceMapDaoImpl.class, - ServiceOfferingDaoImpl.class, VMTemplateHostDaoImpl.class, MockVpcDaoImpl.class, VMTemplateDaoImpl.class, VMTemplateZoneDaoImpl.class, - VMTemplateDetailsDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, - DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, MockNetworkManagerImpl.class, - MockVpcVirtualNetworkApplianceManager.class, EntityManagerImpl.class, LoadBalancerDaoImpl.class, FirewallRulesCidrsDaoImpl.class, - VirtualRouterProviderDaoImpl.class, ProjectDaoImpl.class, ProjectAccountDaoImpl.class, MockVpcOfferingDaoImpl.class, MockConfigurationManagerImpl.class, - MockNetworkOfferingServiceMapDaoImpl.class, MockNetworkServiceMapDaoImpl.class, MockVpcOfferingServiceMapDaoImpl.class, MockNetworkOfferingDaoImpl.class, - MockNetworkModelImpl.class, Ipv6AddressManagerImpl.class}, + DomainRouterDaoImpl.class, VpcGatewayDaoImpl.class, PrivateIpDaoImpl.class, StaticRouteDaoImpl.class, PhysicalNetworkDaoImpl.class, + ResourceTagsDaoImpl.class, FirewallRulesDaoImpl.class, VlanDaoImpl.class, AccountDaoImpl.class, ResourceCountDaoImpl.class, + Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class, + UserStatisticsDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class, + ResourceLimitDaoImpl.class, ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, NicDaoImpl.class, + SnapshotDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, UserIpv6AddressDaoImpl.class, NicSecondaryIpDaoImpl.class, + VpcServiceMapDaoImpl.class, ServiceOfferingDaoImpl.class, VMTemplateHostDaoImpl.class, MockVpcDaoImpl.class, VMTemplateDaoImpl.class, + VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, + DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, + MockNetworkManagerImpl.class, MockVpcVirtualNetworkApplianceManager.class, EntityManagerImpl.class, LoadBalancerDaoImpl.class, + FirewallRulesCidrsDaoImpl.class, VirtualRouterProviderDaoImpl.class, ProjectDaoImpl.class, ProjectAccountDaoImpl.class, MockVpcOfferingDaoImpl.class, + MockConfigurationManagerImpl.class, MockNetworkOfferingServiceMapDaoImpl.class, MockNetworkServiceMapDaoImpl.class, + MockVpcOfferingServiceMapDaoImpl.class, MockNetworkOfferingDaoImpl.class, MockNetworkModelImpl.class, Ipv6AddressManagerImpl.class}, includeFilters = {@Filter(value = VpcTestConfiguration.VpcLibrary.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public class VpcTestConfiguration { diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java index 4175b388d2b..0b22db48c35 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java @@ -16,6 +16,12 @@ // under the License. package com.cloud.vpc.dao; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; + import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Networks.TrafficType; @@ -26,11 +32,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; -import javax.ejb.Local; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - @Local(value = NetworkDao.class) @DB() public class MockNetworkDaoImpl extends GenericDaoBase implements NetworkDao { diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java index 47c43010796..7ea0a80167d 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java @@ -98,29 +98,35 @@ public class MockNetworkOfferingDaoImpl extends NetworkOfferingDaoImpl implement NetworkOfferingVO vo = null; if (id.longValue() == 1) { //network offering valid for vpc - vo = new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, false, - false, false, false); + vo = + new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, + false, false, false, false); } else if (id.longValue() == 2) { //invalid offering - source nat is not included - vo = new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, false, - false, false, false); + vo = + new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, + false, false, false, false); } else if (id.longValue() == 3) { //network offering invalid for vpc (conserve mode off) - vo = new NetworkOfferingVO("non vpc", "non vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, true, - false, false, false, false); + vo = + new NetworkOfferingVO("non vpc", "non vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, + true, false, false, false, false); } else if (id.longValue() == 4) { //network offering invalid for vpc (Shared) - vo = new NetworkOfferingVO("non vpc", "non vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Shared, false, - false, false, false, false); + vo = + new NetworkOfferingVO("non vpc", "non vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Shared, + false, false, false, false, false); } else if (id.longValue() == 5) { //network offering invalid for vpc (has redundant router) - vo = new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, false, - false, false, false); + vo = + new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, + false, false, false, false); vo.setRedundantRouter(true); } else if (id.longValue() == 6) { //network offering invalid for vpc (has lb service) - vo = new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, false, - false, false, false); + vo = + new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, + false, false, false, false); } if (vo != null) { diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java index 3eb4029e7f7..061fd42ac6b 100644 --- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java @@ -33,15 +33,11 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.junit.After; -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.affinity.dao.AffinityGroupDao; -import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; -import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; -import org.apache.cloudstack.test.utils.SpringUtils; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -55,15 +51,14 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; +import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.test.utils.SpringUtils; import com.cloud.dc.dao.DedicatedResourceDao; -import com.cloud.event.ActionEventUtils; -import com.cloud.dc.dao.DedicatedResourceDao; -import com.cloud.deploy.DeploymentPlanner; import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEventUtils; import com.cloud.event.EventVO; @@ -75,8 +70,8 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountService; import com.cloud.user.AccountVO; -import com.cloud.user.UserVO; import com.cloud.user.DomainManager; +import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.component.ComponentContext; @@ -148,12 +143,12 @@ public class AffinityApiUnitTest { _affinityService.setAffinityGroupProcessors(affinityProcessors); AffinityGroupVO group = new AffinityGroupVO("group1", "mock", "mock group", domainId, 200L, ControlledEntity.ACLType.Account); - Mockito.when(_affinityGroupDao.persist(Mockito.any(AffinityGroupVO.class))).thenReturn(group); - Mockito.when(_affinityGroupDao.findById(Mockito.anyLong())).thenReturn(group); - Mockito.when(_affinityGroupDao.findByAccountAndName(Mockito.anyLong(), Mockito.anyString())).thenReturn(group); - Mockito.when(_affinityGroupDao.lockRow(Mockito.anyLong(), anyBoolean())).thenReturn(group); - Mockito.when(_affinityGroupDao.expunge(Mockito.anyLong())).thenReturn(true); - Mockito.when(_eventDao.persist(Mockito.any(EventVO.class))).thenReturn(new EventVO()); + Mockito.when(_affinityGroupDao.persist(Matchers.any(AffinityGroupVO.class))).thenReturn(group); + Mockito.when(_affinityGroupDao.findById(Matchers.anyLong())).thenReturn(group); + Mockito.when(_affinityGroupDao.findByAccountAndName(Matchers.anyLong(), Matchers.anyString())).thenReturn(group); + Mockito.when(_affinityGroupDao.lockRow(Matchers.anyLong(), anyBoolean())).thenReturn(group); + Mockito.when(_affinityGroupDao.expunge(Matchers.anyLong())).thenReturn(true); + Mockito.when(_eventDao.persist(Matchers.any(EventVO.class))).thenReturn(new EventVO()); } @After @@ -212,8 +207,9 @@ public class AffinityApiUnitTest { } @Configuration - @ComponentScan(basePackageClasses = {AffinityGroupServiceImpl.class, ActionEventUtils.class}, includeFilters = {@Filter(value = TestConfiguration.Library.class, - type = FilterType.CUSTOM)}, useDefaultFilters = false) + @ComponentScan(basePackageClasses = {AffinityGroupServiceImpl.class, ActionEventUtils.class}, + includeFilters = {@Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)}, + useDefaultFilters = false) public static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean diff --git a/server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java b/server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java index 9f68ebb237d..e2bd9b225d0 100644 --- a/server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java +++ b/server/test/org/apache/cloudstack/network/lb/ApplicationLoadBalancerTest.java @@ -25,11 +25,11 @@ import javax.inject.Inject; import junit.framework.TestCase; -import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -45,9 +45,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; +import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao; -import org.apache.cloudstack.network.lb.ApplicationLoadBalancerManagerImpl; -import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule; import org.apache.cloudstack.test.utils.SpringUtils; import com.cloud.event.dao.UsageEventDao; @@ -146,23 +145,24 @@ public class ApplicationLoadBalancerTest extends TestCase { Mockito.when(_ntwkModel.areServicesSupportedInNetwork(validGuestNetworkId, Service.Lb)).thenReturn(true); Mockito.when(_ntwkModel.areServicesSupportedInNetwork(invalidGuestNetworkId, Service.Lb)).thenReturn(false); - ApplicationLoadBalancerRuleVO lbRule = new ApplicationLoadBalancerRuleVO("new", "new", 22, 22, "roundrobin", validGuestNetworkId, validAccountId, 1L, new Ip( - validRequestedIp), validGuestNetworkId, Scheme.Internal); - Mockito.when(_lbDao.persist(Mockito.any(ApplicationLoadBalancerRuleVO.class))).thenReturn(lbRule); + ApplicationLoadBalancerRuleVO lbRule = + new ApplicationLoadBalancerRuleVO("new", "new", 22, 22, "roundrobin", validGuestNetworkId, validAccountId, 1L, new Ip(validRequestedIp), validGuestNetworkId, + Scheme.Internal); + Mockito.when(_lbDao.persist(Matchers.any(ApplicationLoadBalancerRuleVO.class))).thenReturn(lbRule); - Mockito.when(_lbMgr.validateLbRule(Mockito.any(LoadBalancingRule.class))).thenReturn(true); + Mockito.when(_lbMgr.validateLbRule(Matchers.any(LoadBalancingRule.class))).thenReturn(true); - Mockito.when(_firewallDao.setStateToAdd(Mockito.any(FirewallRuleVO.class))).thenReturn(true); + Mockito.when(_firewallDao.setStateToAdd(Matchers.any(FirewallRuleVO.class))).thenReturn(true); Mockito.when(_accountMgr.getSystemUser()).thenReturn(new UserVO(1)); Mockito.when(_accountMgr.getSystemAccount()).thenReturn(new AccountVO(2)); CallContext.register(_accountMgr.getSystemUser(), _accountMgr.getSystemAccount()); - Mockito.when(_ntwkModel.areServicesSupportedInNetwork(Mockito.anyLong(), Mockito.any(Network.Service.class))).thenReturn(true); + Mockito.when(_ntwkModel.areServicesSupportedInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class))).thenReturn(true); Map caps = new HashMap(); caps.put(Capability.SupportedProtocols, NetUtils.TCP_PROTO); - Mockito.when(_ntwkModel.getNetworkServiceCapabilities(Mockito.anyLong(), Mockito.any(Network.Service.class))).thenReturn(caps); + Mockito.when(_ntwkModel.getNetworkServiceCapabilities(Matchers.anyLong(), Matchers.any(Network.Service.class))).thenReturn(caps); Mockito.when(_lbDao.countBySourceIp(new Ip(validRequestedIp), validGuestNetworkId)).thenReturn(1L); @@ -243,14 +243,16 @@ public class ApplicationLoadBalancerTest extends TestCase { //Positive test public void createValidLoadBalancer() throws InsufficientAddressCapacityException, InsufficientVirtualNetworkCapcityException, NetworkRuleConflictException { - _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, validRequestedIp, 22, 22, "roundrobin", validGuestNetworkId, validAccountId); + _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, validRequestedIp, 22, 22, "roundrobin", validGuestNetworkId, + validAccountId); } @Test(expected = UnsupportedServiceException.class) //Negative test - only internal scheme value is supported in the current release public void createPublicLoadBalancer() throws InsufficientAddressCapacityException, InsufficientVirtualNetworkCapcityException, NetworkRuleConflictException { - _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Public, validGuestNetworkId, validRequestedIp, 22, 22, "roundrobin", validGuestNetworkId, validAccountId); + _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Public, validGuestNetworkId, validRequestedIp, 22, 22, "roundrobin", validGuestNetworkId, + validAccountId); } @Test(expected = InvalidParameterValueException.class) @@ -275,8 +277,8 @@ public class ApplicationLoadBalancerTest extends TestCase { public void createWithInvalidAlgorithm() throws InsufficientAddressCapacityException, InsufficientVirtualNetworkCapcityException, NetworkRuleConflictException { String expectedExcText = null; - _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, validRequestedIp, 22, 22, "invalidalgorithm", validGuestNetworkId, - validAccountId); + _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, validRequestedIp, 22, 22, "invalidalgorithm", + validGuestNetworkId, validAccountId); } @@ -294,7 +296,8 @@ public class ApplicationLoadBalancerTest extends TestCase { public void createWithInvalidRequestedIp() throws InsufficientAddressCapacityException, InsufficientVirtualNetworkCapcityException, NetworkRuleConflictException { - _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, "10.2.1.1", 22, 22, "roundrobin", validGuestNetworkId, validAccountId); + _appLbSvc.createApplicationLoadBalancer("alena", "alena", Scheme.Internal, validGuestNetworkId, "10.2.1.1", 22, 22, "roundrobin", validGuestNetworkId, + validAccountId); } private static NetworkVO setId(NetworkVO vo, long id) { @@ -314,8 +317,9 @@ public class ApplicationLoadBalancerTest extends TestCase { } @Configuration - @ComponentScan(basePackageClasses = {NetUtils.class, ApplicationLoadBalancerManagerImpl.class}, includeFilters = {@Filter(value = TestConfiguration.Library.class, - type = FilterType.CUSTOM)}, useDefaultFilters = false) + @ComponentScan(basePackageClasses = {NetUtils.class, ApplicationLoadBalancerManagerImpl.class}, + includeFilters = {@Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)}, + useDefaultFilters = false) public static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java index 919399202d9..a67a9abf12b 100644 --- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java +++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java @@ -32,15 +32,16 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; -import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; -import org.apache.cloudstack.context.CallContext; import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; +import org.apache.cloudstack.context.CallContext; + import com.cloud.network.dao.LoadBalancerCertMapDao; import com.cloud.network.dao.LoadBalancerCertMapVO; import com.cloud.network.dao.LoadBalancerVO; diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java index 093b47b5845..6d93f84e17d 100644 --- a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java +++ b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java @@ -19,16 +19,6 @@ package org.apache.cloudstack.networkoffering; import java.io.IOException; -import javax.inject.Inject; - -import org.apache.cloudstack.acl.SecurityChecker; -import org.apache.cloudstack.affinity.AffinityGroupService; -import org.apache.cloudstack.affinity.dao.AffinityGroupDao; -import org.apache.cloudstack.framework.config.ConfigDepot; -import org.apache.cloudstack.region.PortableIpDaoImpl; -import org.apache.cloudstack.region.dao.RegionDaoImpl; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; -import org.apache.cloudstack.test.utils.SpringUtils; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -40,9 +30,12 @@ import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.affinity.AffinityGroupService; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.region.PortableIpDaoImpl; import org.apache.cloudstack.region.PortableIpRangeDaoImpl; @@ -59,10 +52,10 @@ import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.dao.AccountVlanMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao; import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DataCenterDetailsDaoImpl; import com.cloud.dc.dao.DedicatedResourceDao; import com.cloud.dc.dao.HostPodDaoImpl; import com.cloud.dc.dao.PodVlanDaoImpl; @@ -129,15 +122,15 @@ import com.cloud.vm.dao.VMInstanceDaoImpl; @Configuration @ComponentScan(basePackageClasses = {AccountVlanMapDaoImpl.class, VolumeDaoImpl.class, HostPodDaoImpl.class, DomainDaoImpl.class, ServiceOfferingDaoImpl.class, - ServiceOfferingDetailsDaoImpl.class, VlanDaoImpl.class, IPAddressDaoImpl.class, ResourceTagsDaoImpl.class, AccountDaoImpl.class, InstanceGroupDaoImpl.class, - UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class, VMInstanceDaoImpl.class, HostTransferMapDaoImpl.class, - PortForwardingRulesDaoImpl.class, PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class, DiskOfferingDaoImpl.class, - DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, - NicSecondaryIpDaoImpl.class, UserIpv6AddressDaoImpl.class, UserDaoImpl.class, NicDaoImpl.class, NetworkDomainDaoImpl.class, HostDetailsDaoImpl.class, - HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class, FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, - PhysicalNetworkTrafficTypeDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class, LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class, - PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class, PortableIpRangeDaoImpl.class, RegionDaoImpl.class, PortableIpDaoImpl.class, - AccountGuestVlanMapDaoImpl.class}, + ServiceOfferingDetailsDaoImpl.class, VlanDaoImpl.class, IPAddressDaoImpl.class, ResourceTagsDaoImpl.class, AccountDaoImpl.class, + InstanceGroupDaoImpl.class, UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class, VMInstanceDaoImpl.class, + HostTransferMapDaoImpl.class, PortForwardingRulesDaoImpl.class, PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class, + DiskOfferingDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, + DataCenterDetailsDaoImpl.class, NicSecondaryIpDaoImpl.class, UserIpv6AddressDaoImpl.class, UserDaoImpl.class, NicDaoImpl.class, + NetworkDomainDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class, + FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class, + LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class, PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class, + PortableIpRangeDaoImpl.class, RegionDaoImpl.class, PortableIpDaoImpl.class, AccountGuestVlanMapDaoImpl.class}, includeFilters = {@Filter(value = ChildTestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public class ChildTestConfiguration { diff --git a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java index 17e0e3f67f8..ccebb95e2ce 100644 --- a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java +++ b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java @@ -24,15 +24,13 @@ import java.util.Set; import javax.inject.Inject; -import com.cloud.event.dao.UsageEventDao; -import com.cloud.event.dao.UsageEventDetailsDao; -import com.cloud.vm.dao.UserVmDetailsDao; import junit.framework.TestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -42,6 +40,8 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; import com.cloud.configuration.ConfigurationManager; +import com.cloud.event.dao.UsageEventDao; +import com.cloud.event.dao.UsageEventDetailsDao; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; import com.cloud.network.Network.Provider; @@ -57,6 +57,7 @@ import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.UserVO; import com.cloud.utils.component.ComponentContext; +import com.cloud.vm.dao.UserVmDetailsDao; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/createNetworkOffering.xml") @@ -95,11 +96,11 @@ public class CreateNetworkOfferingTest extends TestCase { ComponentContext.initComponentsLifeCycle(); ConfigurationVO configVO = new ConfigurationVO("200", "200", "200", "200", "200", "200"); - Mockito.when(configDao.findByName(Mockito.anyString())).thenReturn(configVO); + Mockito.when(configDao.findByName(Matchers.anyString())).thenReturn(configVO); - Mockito.when(offDao.persist(Mockito.any(NetworkOfferingVO.class))).thenReturn(new NetworkOfferingVO()); - Mockito.when(offDao.persist(Mockito.any(NetworkOfferingVO.class), Mockito.anyMap())).thenReturn(new NetworkOfferingVO()); - Mockito.when(mapDao.persist(Mockito.any(NetworkOfferingServiceMapVO.class))).thenReturn(new NetworkOfferingServiceMapVO()); + Mockito.when(offDao.persist(Matchers.any(NetworkOfferingVO.class))).thenReturn(new NetworkOfferingVO()); + Mockito.when(offDao.persist(Matchers.any(NetworkOfferingVO.class), Matchers.anyMap())).thenReturn(new NetworkOfferingVO()); + Mockito.when(mapDao.persist(Matchers.any(NetworkOfferingServiceMapVO.class))).thenReturn(new NetworkOfferingServiceMapVO()); Mockito.when(accountMgr.getSystemUser()).thenReturn(new UserVO(1)); Mockito.when(accountMgr.getSystemAccount()).thenReturn(new AccountVO(2)); @@ -115,16 +116,18 @@ public class CreateNetworkOfferingTest extends TestCase { //Test Shared network offerings @Test public void createSharedNtwkOffWithVlan() { - NetworkOfferingVO off = configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, - Network.GuestType.Shared, false, null, false, null, true, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared, false, + null, false, null, true, false, null, false, null, true); assertNotNull("Shared network offering with specifyVlan=true failed to create ", off); } @Test public void createSharedNtwkOffWithNoVlan() { try { - NetworkOfferingVO off = configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, false, Availability.Optional, 200, null, false, - Network.GuestType.Shared, false, null, false, null, true, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, false, Availability.Optional, 200, null, false, Network.GuestType.Shared, + false, null, false, null, true, false, null, false, null, true); assertNull("Shared network offering with specifyVlan=false was created", off); } catch (InvalidParameterValueException ex) { } @@ -132,8 +135,9 @@ public class CreateNetworkOfferingTest extends TestCase { @Test public void createSharedNtwkOffWithSpecifyIpRanges() { - NetworkOfferingVO off = configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, - Network.GuestType.Shared, false, null, false, null, true, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared, false, + null, false, null, true, false, null, false, null, true); assertNotNull("Shared network offering with specifyIpRanges=true failed to create ", off); } @@ -141,8 +145,9 @@ public class CreateNetworkOfferingTest extends TestCase { @Test public void createSharedNtwkOffWithoutSpecifyIpRanges() { try { - NetworkOfferingVO off = configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, - Network.GuestType.Shared, false, null, false, null, false, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared, + false, null, false, null, false, false, null, false, null, true); assertNull("Shared network offering with specifyIpRanges=false was created", off); } catch (InvalidParameterValueException ex) { } @@ -155,8 +160,9 @@ public class CreateNetworkOfferingTest extends TestCase { Set vrProvider = new HashSet(); vrProvider.add(Provider.VirtualRouter); serviceProviderMap.put(Network.Service.SourceNat, vrProvider); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); assertNotNull("Isolated network offering with specifyIpRanges=false failed to create ", off); } @@ -167,8 +173,9 @@ public class CreateNetworkOfferingTest extends TestCase { Set vrProvider = new HashSet(); vrProvider.add(Provider.VirtualRouter); serviceProviderMap.put(Network.Service.SourceNat, vrProvider); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); assertNotNull("Isolated network offering with specifyVlan=true wasn't created", off); } @@ -180,8 +187,9 @@ public class CreateNetworkOfferingTest extends TestCase { Set vrProvider = new HashSet(); vrProvider.add(Provider.VirtualRouter); serviceProviderMap.put(Network.Service.SourceNat, vrProvider); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true); assertNull("Isolated network offering with specifyIpRanges=true and source nat service enabled, was created", off); } catch (InvalidParameterValueException ex) { } @@ -192,8 +200,9 @@ public class CreateNetworkOfferingTest extends TestCase { Map> serviceProviderMap = new HashMap>(); Set vrProvider = new HashSet(); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true); assertNotNull("Isolated network offering with specifyIpRanges=true and with no sourceNatService, failed to create", off); } @@ -209,8 +218,9 @@ public class CreateNetworkOfferingTest extends TestCase { serviceProviderMap.put(Network.Service.SourceNat, vrProvider); serviceProviderMap.put(Network.Service.Gateway, vrProvider); serviceProviderMap.put(Network.Service.Lb, vrProvider); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); // System.out.println("Creating Vpc Network Offering"); assertNotNull("Vpc Isolated network offering with Vpc provider ", off); } @@ -228,8 +238,9 @@ public class CreateNetworkOfferingTest extends TestCase { serviceProviderMap.put(Network.Service.SourceNat, vrProvider); serviceProviderMap.put(Network.Service.Gateway, vrProvider); serviceProviderMap.put(Network.Service.Lb, lbProvider); - NetworkOfferingVO off = configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, - Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); + NetworkOfferingVO off = + configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false, + Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true); // System.out.println("Creating Vpc Network Offering"); assertNotNull("Vpc Isolated network offering with Vpc and Netscaler provider ", off); } diff --git a/server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java b/server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java index 3ccba210b13..6a7dbd231c7 100644 --- a/server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java +++ b/server/test/org/apache/cloudstack/privategw/AclOnPrivateGwTest.java @@ -16,37 +16,16 @@ // under the License. package org.apache.cloudstack.privategw; -import com.cloud.configuration.ConfigurationManager; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.VlanDao; -import com.cloud.exception.*; -import com.cloud.network.NetworkModel; -import com.cloud.network.NetworkService; -import com.cloud.network.dao.*; -import com.cloud.network.vpc.VpcManagerImpl; -import com.cloud.network.vpc.VpcService; -import com.cloud.network.vpc.dao.*; -import com.cloud.network.vpn.Site2SiteVpnManager; -import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; -import com.cloud.server.ConfigurationServer; -import com.cloud.tags.dao.ResourceTagDao; -import com.cloud.user.AccountManager; -import com.cloud.user.ResourceLimitService; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.dao.DomainRouterDao; +import java.io.IOException; + +import javax.naming.ConfigurationException; import junit.framework.Assert; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd; -import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.apache.cloudstack.test.utils.SpringUtils; - import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -59,9 +38,43 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd; +import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.test.utils.SpringUtils; -import java.io.IOException; +import com.cloud.configuration.ConfigurationManager; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.VlanDao; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.NetworkModel; +import com.cloud.network.NetworkService; +import com.cloud.network.dao.FirewallRulesDao; +import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.Site2SiteVpnGatewayDao; +import com.cloud.network.vpc.VpcManagerImpl; +import com.cloud.network.vpc.VpcService; +import com.cloud.network.vpc.dao.NetworkACLDao; +import com.cloud.network.vpc.dao.PrivateIpDao; +import com.cloud.network.vpc.dao.StaticRouteDao; +import com.cloud.network.vpc.dao.VpcDao; +import com.cloud.network.vpc.dao.VpcGatewayDao; +import com.cloud.network.vpc.dao.VpcOfferingDao; +import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao; +import com.cloud.network.vpc.dao.VpcServiceMapDao; +import com.cloud.network.vpn.Site2SiteVpnManager; +import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; +import com.cloud.server.ConfigurationServer; +import com.cloud.tags.dao.ResourceTagDao; +import com.cloud.user.AccountManager; +import com.cloud.user.ResourceLimitService; +import com.cloud.vm.dao.DomainRouterDao; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) @@ -87,7 +100,7 @@ public class AclOnPrivateGwTest { VpcService _vpcService = Mockito.mock(VpcService.class); try { - _vpcService.applyVpcPrivateGateway(Mockito.anyLong(), Mockito.anyBoolean()); + _vpcService.applyVpcPrivateGateway(Matchers.anyLong(), Matchers.anyBoolean()); } catch (ResourceUnavailableException e) { e.printStackTrace(); } catch (ConcurrentOperationException e) { @@ -102,7 +115,7 @@ public class AclOnPrivateGwTest { createPrivateGwCmd._vpcService = vpcService; try { - Mockito.when(vpcService.applyVpcPrivateGateway(Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(null); + Mockito.when(vpcService.applyVpcPrivateGateway(Matchers.anyLong(), Matchers.anyBoolean())).thenReturn(null); } catch (ResourceUnavailableException e) { e.printStackTrace(); } catch (ConcurrentOperationException e) { diff --git a/server/test/org/apache/cloudstack/region/RegionManagerTest.java b/server/test/org/apache/cloudstack/region/RegionManagerTest.java index 18ce9c94824..d7bc53784b2 100644 --- a/server/test/org/apache/cloudstack/region/RegionManagerTest.java +++ b/server/test/org/apache/cloudstack/region/RegionManagerTest.java @@ -23,10 +23,12 @@ import javax.naming.ConfigurationException; import junit.framework.Assert; -import org.apache.cloudstack.region.dao.RegionDao; import org.junit.Test; +import org.mockito.Matchers; import org.mockito.Mockito; +import org.apache.cloudstack.region.dao.RegionDao; + import com.cloud.exception.InvalidParameterValueException; public class RegionManagerTest { @@ -36,7 +38,7 @@ public class RegionManagerTest { RegionManagerImpl regionMgr = new RegionManagerImpl(); RegionDao regionDao = Mockito.mock(RegionDao.class); RegionVO region = new RegionVO(2, "APAC", ""); - Mockito.when(regionDao.findByName(Mockito.anyString())).thenReturn(region); + Mockito.when(regionDao.findByName(Matchers.anyString())).thenReturn(region); regionMgr._regionDao = regionDao; try { regionMgr.addRegion(2, "APAC", ""); diff --git a/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java b/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java index c4699c49a81..d152c6668b4 100644 --- a/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java +++ b/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java @@ -33,6 +33,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; + import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd; import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd; import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd; @@ -57,7 +58,6 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.UserVO; -import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.Ip; @@ -526,8 +526,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(assignCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); LoadBalancerVO lbRule = new LoadBalancerVO(); @@ -589,8 +589,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(assignCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 3, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 3, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); LoadBalancerVO lbRule1 = new LoadBalancerVO(); @@ -674,8 +674,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(assignCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Revoke); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Revoke); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); LoadBalancerVO lbRule = new LoadBalancerVO(); @@ -732,8 +732,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(removeFromGslbCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); LoadBalancerVO lbRule = new LoadBalancerVO(); @@ -804,8 +804,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(removeFromGslbCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); LoadBalancerVO lbRule = new LoadBalancerVO(); @@ -865,8 +865,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(removeFromGslbCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); Field lbRules = _class.getDeclaredField("loadBalancerRulesIds"); @@ -909,8 +909,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(deleteCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); GlobalLoadBalancerLbRuleMapVO gslbLbMap = new GlobalLoadBalancerLbRuleMapVO(); @@ -955,8 +955,8 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase { gslbRuleId.setAccessible(true); gslbRuleId.set(deleteCmd, new Long(1)); - GlobalLoadBalancerRuleVO gslbRule = new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, - GlobalLoadBalancerRule.State.Active); + GlobalLoadBalancerRuleVO gslbRule = + new GlobalLoadBalancerRuleVO("test-gslb-rule", "test-gslb-rule", "test-domain", "roundrobin", "sourceip", "tcp", 1, 1, 1, GlobalLoadBalancerRule.State.Active); when(gslbServiceImpl._gslbRuleDao.findById(new Long(1))).thenReturn(gslbRule); GlobalLoadBalancerLbRuleMapVO gslbLmMap = new GlobalLoadBalancerLbRuleMapVO(1, 1, 1); diff --git a/server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java b/server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java index 3ba4151d134..a3f8afbd4d6 100644 --- a/server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java +++ b/server/test/org/apache/cloudstack/service/ServiceOfferingVOTest.java @@ -16,13 +16,14 @@ // under the License. package org.apache.cloudstack.service; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.vm.VirtualMachine; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.Assert; import org.mockito.MockitoAnnotations; +import com.cloud.service.ServiceOfferingVO; +import com.cloud.vm.VirtualMachine; + public class ServiceOfferingVOTest { ServiceOfferingVO offeringCustom; ServiceOfferingVO offering; diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtBellAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtBellAdapter.java index 3318c090303..5970abb21a9 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtBellAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtBellAdapter.java @@ -28,49 +28,50 @@ import streamer.PipelineImpl; public class AwtBellAdapter extends BaseElement { - public AwtBellAdapter(String id) { - super(id); - declarePads(); - } + public AwtBellAdapter(String id) { + super(id); + declarePads(); + } - private void declarePads() { - inputPads.put(STDIN, null); - } + private void declarePads() { + inputPads.put(STDIN, null); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (buf == null) - return; + if (buf == null) + return; - Toolkit.getDefaultToolkit().beep(); - } + Toolkit.getDefaultToolkit().beep(); + } - public String toString() { - return "Bell(" + id + ")"; - } + @Override + public String toString() { + return "Bell(" + id + ")"; + } - /** - * Example. - */ - public static void main(String args[]) { - System.setProperty("streamer.Element.debug", "true"); + /** + * Example. + */ + public static void main(String args[]) { + System.setProperty("streamer.Element.debug", "true"); - Element source = new FakeSource("source") { - { - this.incommingBufLength = 0; - this.delay = 1000; - this.numBuffers = 3; - } - }; + Element source = new FakeSource("source") { + { + this.incommingBufLength = 0; + this.delay = 1000; + this.numBuffers = 3; + } + }; - Element sink = new AwtBellAdapter("sink"); + Element sink = new AwtBellAdapter("sink"); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.addAndLink(source, sink); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.addAndLink(source, sink); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtCanvasAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtCanvasAdapter.java index 12dd88b9cdc..8adee499cb6 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtCanvasAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtCanvasAdapter.java @@ -31,134 +31,136 @@ import streamer.PipelineImpl; public class AwtCanvasAdapter extends BaseElement { - protected ScreenDescription screen; + protected ScreenDescription screen; - public AwtCanvasAdapter(String id, BufferedImageCanvas canvas, ScreenDescription screen) { - super(id); - this.canvas = canvas; - this.screen = screen; - } - - protected BufferedImageCanvas canvas; - - public String toString() { - return "AwtRdpAdapter(" + id + ")"; - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - Order order = (Order) buf.getOrder(); - switch ((OrderType) order.type) { - - case BITMAP_UPDATE: - handleBitmap((BitmapOrder) order, buf); - break; - - case COPY_RECT: - handleCopyRect((CopyRectOrder) order, buf); - break; - - default: - throw new RuntimeException("Order is not implemented: " + buf + "."); - // break; + public AwtCanvasAdapter(String id, BufferedImageCanvas canvas, ScreenDescription screen) { + super(id); + this.canvas = canvas; + this.screen = screen; } - buf.unref(); - } + protected BufferedImageCanvas canvas; - private void handleCopyRect(CopyRectOrder order, ByteBuffer buf) { - // TODO Auto-generated method stub - // Copy image - canvas.getOfflineGraphics().copyArea(order.srcX, order.srcY, order.width, order.height, order.x - order.srcX, order.y - order.srcY); - - // Request update of repainted area - canvas.repaint(order.x, order.y, order.width, order.height); - - } - - private void handleBitmap(BitmapOrder order, ByteBuffer buf) { - // Draw rectangle on offline buffer - BufferedImage image = canvas.getOfflineImage(); - Graphics2D g = (Graphics2D) image.getGraphics(); - - for (BitmapRectangle rectangle : order.rectangles) { - // *DEBUG*/System.out.println("["+this+"] DEBUG: Rectangle: " + - // rectangle.toString()); - - int x = rectangle.x; - int y = rectangle.y; - int width = rectangle.width; - int height = rectangle.height; - int bufferWidth = rectangle.bufferWidth; - int bufferHeight = rectangle.bufferHeight; - - BufferedImage rectImage; - switch (rectangle.colorDepth) { - case 8: { - rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_BYTE_INDEXED, screen.colorMap); - WritableRaster raster = rectImage.getRaster(); - raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toByteArray()); - break; - } - case 15: { - rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_USHORT_555_RGB); - WritableRaster raster = rectImage.getRaster(); - raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toShortArray()); - break; - } - case 16: { - rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_USHORT_565_RGB); - WritableRaster raster = rectImage.getRaster(); - raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toShortArray()); - break; - } - case 24: - case 32: { - rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_INT_RGB); - WritableRaster raster = rectImage.getRaster(); - raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toIntLEArray()); - break; - } - default: - throw new RuntimeException("Unsupported color depth: " + rectangle.colorDepth + "."); - } - - g.setClip(x, y, width, height); - g.drawImage(rectImage, x, y, null); - - // Request update of repainted area - canvas.repaint(x, y, width, height); + @Override + public String toString() { + return "AwtRdpAdapter(" + id + ")"; } - } + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - ByteBuffer packet = new ByteBuffer(new byte[] { 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, - 0x01, 0x04, 0x0a, 0x00, 0x0c, (byte) 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }); + Order order = buf.getOrder(); + switch ((OrderType)order.type) { - Pipeline pipeline = new PipelineImpl("test"); + case BITMAP_UPDATE: + handleBitmap((BitmapOrder)order, buf); + break; - Element bitmap = new ServerBitmapUpdate("bitmap"); + case COPY_RECT: + handleCopyRect((CopyRectOrder)order, buf); + break; - BufferedImageCanvas canvas = new BufferedImageCanvas(1024, 768); - Element adapter = new AwtCanvasAdapter("test", canvas, null) { - { - verbose = true; - } - }; - pipeline.addAndLink(bitmap, adapter); + default: + throw new RuntimeException("Order is not implemented: " + buf + "."); + // break; + } - bitmap.handleData(packet, null); + buf.unref(); + } - } + private void handleCopyRect(CopyRectOrder order, ByteBuffer buf) { + // TODO Auto-generated method stub + // Copy image + canvas.getOfflineGraphics().copyArea(order.srcX, order.srcY, order.width, order.height, order.x - order.srcX, order.y - order.srcY); + + // Request update of repainted area + canvas.repaint(order.x, order.y, order.width, order.height); + + } + + private void handleBitmap(BitmapOrder order, ByteBuffer buf) { + // Draw rectangle on offline buffer + BufferedImage image = canvas.getOfflineImage(); + Graphics2D g = (Graphics2D)image.getGraphics(); + + for (BitmapRectangle rectangle : order.rectangles) { + // *DEBUG*/System.out.println("["+this+"] DEBUG: Rectangle: " + + // rectangle.toString()); + + int x = rectangle.x; + int y = rectangle.y; + int width = rectangle.width; + int height = rectangle.height; + int bufferWidth = rectangle.bufferWidth; + int bufferHeight = rectangle.bufferHeight; + + BufferedImage rectImage; + switch (rectangle.colorDepth) { + case 8: { + rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_BYTE_INDEXED, screen.colorMap); + WritableRaster raster = rectImage.getRaster(); + raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toByteArray()); + break; + } + case 15: { + rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_USHORT_555_RGB); + WritableRaster raster = rectImage.getRaster(); + raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toShortArray()); + break; + } + case 16: { + rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_USHORT_565_RGB); + WritableRaster raster = rectImage.getRaster(); + raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toShortArray()); + break; + } + case 24: + case 32: { + rectImage = new BufferedImage(bufferWidth, height, BufferedImage.TYPE_INT_RGB); + WritableRaster raster = rectImage.getRaster(); + raster.setDataElements(0, 0, bufferWidth, bufferHeight, rectangle.bitmapDataStream.toIntLEArray()); + break; + } + default: + throw new RuntimeException("Unsupported color depth: " + rectangle.colorDepth + "."); + } + + g.setClip(x, y, width, height); + g.drawImage(rectImage, x, y, null); + + // Request update of repainted area + canvas.repaint(x, y, width, height); + } + + } + + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + // System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + ByteBuffer packet = + new ByteBuffer(new byte[] {0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x04, 0x0a, + 0x00, 0x0c, (byte)0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); + + Pipeline pipeline = new PipelineImpl("test"); + + Element bitmap = new ServerBitmapUpdate("bitmap"); + + BufferedImageCanvas canvas = new BufferedImageCanvas(1024, 768); + Element adapter = new AwtCanvasAdapter("test", canvas, null) { + { + verbose = true; + } + }; + pipeline.addAndLink(bitmap, adapter); + + bitmap.handleData(packet, null); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtClipboardAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtClipboardAdapter.java index aeed41ca636..75dc1b91122 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtClipboardAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtClipboardAdapter.java @@ -26,30 +26,31 @@ import vncclient.VncMessageHandler; public class AwtClipboardAdapter extends BaseElement { - public AwtClipboardAdapter(String id) { - super(id); - declarePads(); - } + public AwtClipboardAdapter(String id) { + super(id); + declarePads(); + } - private void declarePads() { - inputPads.put(STDIN, null); - } + private void declarePads() { + inputPads.put(STDIN, null); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (buf == null) - return; + if (buf == null) + return; - String content = (String) buf.getMetadata(VncMessageHandler.CLIPBOARD_CONTENT); - StringSelection contents = new StringSelection(content); - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(contents, null); - } + String content = (String)buf.getMetadata(VncMessageHandler.CLIPBOARD_CONTENT); + StringSelection contents = new StringSelection(content); + Toolkit.getDefaultToolkit().getSystemClipboard().setContents(contents, null); + } - public String toString() { - return "Clipboard(" + id + ")"; - } + @Override + public String toString() { + return "Clipboard(" + id + ")"; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java index a754796a0d2..89a90083e23 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java @@ -24,30 +24,30 @@ import streamer.ByteBuffer; public class AwtKeyEventSource extends BaseElement implements KeyListener { - public AwtKeyEventSource(String id) { - super(id); - } + public AwtKeyEventSource(String id) { + super(id); + } - @Override - public void keyTyped(KeyEvent e) { - // Nothing to do + @Override + public void keyTyped(KeyEvent e) { + // Nothing to do - } + } - @Override - public void keyPressed(KeyEvent e) { - sendEvent(e, true); - } + @Override + public void keyPressed(KeyEvent e) { + sendEvent(e, true); + } - @Override - public void keyReleased(KeyEvent e) { - sendEvent(e, false); - } + @Override + public void keyReleased(KeyEvent e) { + sendEvent(e, false); + } - private void sendEvent(KeyEvent e, boolean pressed) { - ByteBuffer buf=new ByteBuffer(new KeyOrder(e, pressed)); + private void sendEvent(KeyEvent e, boolean pressed) { + ByteBuffer buf = new ByteBuffer(new KeyOrder(e, pressed)); - pushDataToAllOuts(buf); - } + pushDataToAllOuts(buf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java index f3e58fc02c1..fe4dde65f01 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java @@ -25,47 +25,47 @@ import streamer.ByteBuffer; public class AwtMouseEventSource extends BaseElement implements MouseListener, MouseMotionListener { - public AwtMouseEventSource(String id) { - super(id); - } + public AwtMouseEventSource(String id) { + super(id); + } - @Override - public void mouseClicked(MouseEvent e) { - // Nothing to do - } + @Override + public void mouseClicked(MouseEvent e) { + // Nothing to do + } - @Override - public void mousePressed(MouseEvent e) { - MouseOrder order = new MouseOrder(e); - order.pressed = true; - pushDataToAllOuts(new ByteBuffer(order)); - } + @Override + public void mousePressed(MouseEvent e) { + MouseOrder order = new MouseOrder(e); + order.pressed = true; + pushDataToAllOuts(new ByteBuffer(order)); + } - @Override - public void mouseReleased(MouseEvent e) { - MouseOrder order = new MouseOrder(e); - order.released = true; - pushDataToAllOuts(new ByteBuffer(order)); - } + @Override + public void mouseReleased(MouseEvent e) { + MouseOrder order = new MouseOrder(e); + order.released = true; + pushDataToAllOuts(new ByteBuffer(order)); + } - @Override - public void mouseEntered(MouseEvent e) { - // Nothing to do - } + @Override + public void mouseEntered(MouseEvent e) { + // Nothing to do + } - @Override - public void mouseExited(MouseEvent e) { - // Nothing to do - } + @Override + public void mouseExited(MouseEvent e) { + // Nothing to do + } - @Override - public void mouseDragged(MouseEvent e) { - pushDataToAllOuts(new ByteBuffer(new MouseOrder(e))); - } + @Override + public void mouseDragged(MouseEvent e) { + pushDataToAllOuts(new ByteBuffer(new MouseOrder(e))); + } - @Override - public void mouseMoved(MouseEvent e) { - pushDataToAllOuts(new ByteBuffer(new MouseOrder(e))); - } + @Override + public void mouseMoved(MouseEvent e) { + pushDataToAllOuts(new ByteBuffer(new MouseOrder(e))); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java index f594df67197..3a25c8f1cfb 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java @@ -18,7 +18,6 @@ package common; import java.util.Arrays; - import streamer.Order; /** @@ -28,21 +27,20 @@ import streamer.Order; */ public class BitmapOrder extends Order { - public BitmapOrder() { - type = OrderType.BITMAP_UPDATE; - } + public BitmapOrder() { + type = OrderType.BITMAP_UPDATE; + } - /** - * Structures, each of which contains a rectangular clipping taken from the - * server-side screen frame buffer. - */ - public BitmapRectangle rectangles[]; + /** + * Structures, each of which contains a rectangular clipping taken from the + * server-side screen frame buffer. + */ + public BitmapRectangle rectangles[]; - @Override - public String toString() { - final int maxLen = 10; - return String.format("BitmapUpdateOrder [rectangles=%s]", rectangles != null ? Arrays.asList(rectangles).subList(0, Math.min(rectangles.length, maxLen)) - : null); - } + @Override + public String toString() { + final int maxLen = 10; + return String.format("BitmapUpdateOrder [rectangles=%s]", rectangles != null ? Arrays.asList(rectangles).subList(0, Math.min(rectangles.length, maxLen)) : null); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java index f0c178e6092..08dcbf69da7 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java @@ -23,52 +23,50 @@ import streamer.ByteBuffer; */ public class BitmapRectangle { - /** - * Left bound of the rectangle. - */ - public int x; + /** + * Left bound of the rectangle. + */ + public int x; - /** - * Top bound of the rectangle. - */ - public int y; + /** + * Top bound of the rectangle. + */ + public int y; - /** - * Width of the rectangle. - */ - public int width; + /** + * Width of the rectangle. + */ + public int width; - /** - * Height of the rectangle. - */ - public int height; + /** + * Height of the rectangle. + */ + public int height; - /** - * Color depth of the rectangle data in bits-per-pixel. - */ - public int colorDepth; + /** + * Color depth of the rectangle data in bits-per-pixel. + */ + public int colorDepth; - /** - * Variable-length array of bytes describing a raw uncompressed bitmap image. - */ - public ByteBuffer bitmapDataStream; + /** + * Variable-length array of bytes describing a raw uncompressed bitmap image. + */ + public ByteBuffer bitmapDataStream; - /** - * Size of single horizontal scan line. - */ - public int bufferWidth; + /** + * Size of single horizontal scan line. + */ + public int bufferWidth; - /** - * Number of horizontal scan lines in buffer. - */ - public int bufferHeight; + /** + * Number of horizontal scan lines in buffer. + */ + public int bufferHeight; - @Override - public String toString() { - return String - .format( - "BitmapUpdateRectangle [x=%s, y=%s, width=%s, height=%s, bitsPerPixel=%s, bitmapDataStream=%s]", - x, y, width, height, colorDepth, bitmapDataStream); - } + @Override + public String toString() { + return String.format("BitmapUpdateRectangle [x=%s, y=%s, width=%s, height=%s, bitsPerPixel=%s, bitmapDataStream=%s]", x, y, width, height, colorDepth, + bitmapDataStream); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java index f78bef07240..2418de3832f 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java @@ -27,53 +27,53 @@ import java.awt.image.BufferedImage; * screen. It also notifies its subscribers when screen is repainted. */ public class BufferedImageCanvas extends Canvas { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - // Offline screen buffer - private BufferedImage offlineImage; + // Offline screen buffer + private BufferedImage offlineImage; - // Cached Graphics2D object for offline screen buffer - private Graphics2D graphics; + // Cached Graphics2D object for offline screen buffer + private Graphics2D graphics; - public BufferedImageCanvas(int width, int height) { - super(); + public BufferedImageCanvas(int width, int height) { + super(); - setBackground(Color.black); + setBackground(Color.black); - setFocusable(true); + setFocusable(true); - // Don't intercept TAB key - setFocusTraversalKeysEnabled(false); + // Don't intercept TAB key + setFocusTraversalKeysEnabled(false); - setCanvasSize(width, height); - } + setCanvasSize(width, height); + } - public void setCanvasSize(int width, int height) { - this.offlineImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); - graphics = offlineImage.createGraphics(); + public void setCanvasSize(int width, int height) { + this.offlineImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + graphics = offlineImage.createGraphics(); - setSize(offlineImage.getWidth(), offlineImage.getHeight()); - } + setSize(offlineImage.getWidth(), offlineImage.getHeight()); + } - @Override - public void update(Graphics g) { - // Call paint() directly, without clearing screen first - paint(g); - } + @Override + public void update(Graphics g) { + // Call paint() directly, without clearing screen first + paint(g); + } - @Override - public void paint(Graphics g) { - // Only part of image, requested with repaint(Rectangle), will be - // painted on screen. - g.drawImage(offlineImage, 0, 0, this); - } + @Override + public void paint(Graphics g) { + // Only part of image, requested with repaint(Rectangle), will be + // painted on screen. + g.drawImage(offlineImage, 0, 0, this); + } - public BufferedImage getOfflineImage() { - return offlineImage; - } + public BufferedImage getOfflineImage() { + return offlineImage; + } - public Graphics2D getOfflineGraphics() { - return graphics; - } + public Graphics2D getOfflineGraphics() { + return graphics; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java index 1e11bd8d5e2..28bf640cfbd 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java @@ -26,99 +26,99 @@ import streamer.Link; public class BufferedImageCopyRectAdapter extends BaseElement { - public static final String SRC_X = "srcX"; - public static final String SRC_Y = "srcY"; - public static final String TARGET_X = "x"; - public static final String TARGET_Y = "y"; - public static final String WIDTH = "width"; - public static final String HEIGHT = "height"; + public static final String SRC_X = "srcX"; + public static final String SRC_Y = "srcY"; + public static final String TARGET_X = "x"; + public static final String TARGET_Y = "y"; + public static final String WIDTH = "width"; + public static final String HEIGHT = "height"; - protected BufferedImageCanvas canvas; + protected BufferedImageCanvas canvas; - public BufferedImageCopyRectAdapter(String id, BufferedImageCanvas canvas) { - super(id); - this.canvas = canvas; - declarePads(); - } + public BufferedImageCopyRectAdapter(String id, BufferedImageCanvas canvas) { + super(id); + this.canvas = canvas; + declarePads(); + } - private void declarePads() { - inputPads.put(STDIN, null); - } + private void declarePads() { + inputPads.put(STDIN, null); + } - public String toString() { - return "Renderer(" + id + ")"; - } + @Override + public String toString() { + return "Renderer(" + id + ")"; + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - int x = (Integer) buf.getMetadata(TARGET_X); - int y = (Integer) buf.getMetadata(TARGET_Y); - int width = (Integer) buf.getMetadata(WIDTH); - int height = (Integer) buf.getMetadata(HEIGHT); - int srcX = (Integer) buf.getMetadata(SRC_X); - int srcY = (Integer) buf.getMetadata(SRC_Y); - buf.unref(); + int x = (Integer)buf.getMetadata(TARGET_X); + int y = (Integer)buf.getMetadata(TARGET_Y); + int width = (Integer)buf.getMetadata(WIDTH); + int height = (Integer)buf.getMetadata(HEIGHT); + int srcX = (Integer)buf.getMetadata(SRC_X); + int srcY = (Integer)buf.getMetadata(SRC_Y); + buf.unref(); - // Copy image - canvas.getOfflineGraphics().copyArea(srcX, srcY, width, height, x - srcX, y - srcY); + // Copy image + canvas.getOfflineGraphics().copyArea(srcX, srcY, width, height, x - srcX, y - srcY); - // Request update of repainted area - canvas.repaint(x, y, width, height); - } + // Request update of repainted area + canvas.repaint(x, y, width, height); + } - public static void main(String args[]) { - System.setProperty("streamer.Element.debug", "true"); + public static void main(String args[]) { + System.setProperty("streamer.Element.debug", "true"); - BufferedImageCanvas canvas = new BufferedImageCanvas(4, 4); + BufferedImageCanvas canvas = new BufferedImageCanvas(4, 4); - Element renderer = new BufferedImageCopyRectAdapter("renderer", canvas); + Element renderer = new BufferedImageCopyRectAdapter("renderer", canvas); - int[] pixelsBeforeCopy = new int[] { - // 0 - 1, 2, 3, 4, - // 1 - 5, 6, 7, 8, - // 2 - 9, 10, 11, 12, - // 3 - 13, 14, 15, 16 }; - int[] pixelsAfterCopy = new int[] { - // 0 - 11, 12, 3, 4, - // 1 - 15, 16, 7, 8, - // 2 - 9, 10, 11, 12, - // 3 - 13, 14, 15, 16 }; + int[] pixelsBeforeCopy = new int[] { + // 0 + 1, 2, 3, 4, + // 1 + 5, 6, 7, 8, + // 2 + 9, 10, 11, 12, + // 3 + 13, 14, 15, 16}; + int[] pixelsAfterCopy = new int[] { + // 0 + 11, 12, 3, 4, + // 1 + 15, 16, 7, 8, + // 2 + 9, 10, 11, 12, + // 3 + 13, 14, 15, 16}; + // Initalize image + int[] data = ((DataBufferInt)canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); + System.arraycopy(pixelsBeforeCopy, 0, data, 0, pixelsBeforeCopy.length); - // Initalize image - int[] data = ((DataBufferInt) canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); - System.arraycopy(pixelsBeforeCopy, 0, data, 0, pixelsBeforeCopy.length); + ByteBuffer buf = new ByteBuffer(new byte[0]); + buf.putMetadata(TARGET_X, 0); + buf.putMetadata(TARGET_Y, 0); + buf.putMetadata(WIDTH, 2); + buf.putMetadata(HEIGHT, 2); + buf.putMetadata(SRC_X, 2); + buf.putMetadata(SRC_Y, 2); - ByteBuffer buf = new ByteBuffer(new byte[0]); - buf.putMetadata(TARGET_X, 0); - buf.putMetadata(TARGET_Y, 0); - buf.putMetadata(WIDTH, 2); - buf.putMetadata(HEIGHT, 2); - buf.putMetadata(SRC_X, 2); - buf.putMetadata(SRC_Y, 2); + renderer.handleData(buf, null); - renderer.handleData(buf, null); + data = ((DataBufferInt)canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); + String actualData = Arrays.toString(data); + String expectedData = Arrays.toString(pixelsAfterCopy); + if (!actualData.equals(expectedData)) + System.err.println("Actual image: " + actualData + "\nExpected image: " + expectedData + "."); - data = ((DataBufferInt) canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); - String actualData = Arrays.toString(data); - String expectedData = Arrays.toString(pixelsAfterCopy); - if (!actualData.equals(expectedData)) - System.err.println("Actual image: " + actualData + "\nExpected image: " + expectedData + "."); - - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java index 95e7738b0e0..e93df3e7add 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java @@ -28,120 +28,123 @@ import streamer.Link; public class BufferedImagePixelsAdapter extends BaseElement { - public static final String TARGET_X = "x"; - public static final String TARGET_Y = "y"; - public static final String WIDTH = "width"; - public static final String HEIGHT = "height"; - public static final String RGB888LE32 = "RGB888LE32"; - public static final String PIXEL_FORMAT = "pixel_format"; + public static final String TARGET_X = "x"; + public static final String TARGET_Y = "y"; + public static final String WIDTH = "width"; + public static final String HEIGHT = "height"; + public static final String RGB888LE32 = "RGB888LE32"; + public static final String PIXEL_FORMAT = "pixel_format"; - protected BufferedImageCanvas canvas; + protected BufferedImageCanvas canvas; - public BufferedImagePixelsAdapter(String id, BufferedImageCanvas canvas) { - super(id); - this.canvas = canvas; - declarePads(); - } + public BufferedImagePixelsAdapter(String id, BufferedImageCanvas canvas) { + super(id); + this.canvas = canvas; + declarePads(); + } - private void declarePads() { - inputPads.put(STDIN, null); - } + private void declarePads() { + inputPads.put(STDIN, null); + } - public String toString() { - return "Renderer(" + id + ")"; - } + @Override + public String toString() { + return "Renderer(" + id + ")"; + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - int x = (Integer) buf.getMetadata(TARGET_X); - int y = (Integer) buf.getMetadata(TARGET_Y); - int rectWidth = (Integer) buf.getMetadata(WIDTH); - int rectHeight = (Integer) buf.getMetadata(HEIGHT); - String format = (String) buf.getMetadata(PIXEL_FORMAT); + int x = (Integer)buf.getMetadata(TARGET_X); + int y = (Integer)buf.getMetadata(TARGET_Y); + int rectWidth = (Integer)buf.getMetadata(WIDTH); + int rectHeight = (Integer)buf.getMetadata(HEIGHT); + String format = (String)buf.getMetadata(PIXEL_FORMAT); - int bpp; - // Support RGB888/32 little endian only - if (format != null && RGB888LE32.equals(format)) { - bpp = 4; - // TODO: support more formats - } else - throw new RuntimeException("Unsupported format: " + format + ". Supported formats: " + RGB888LE32 + "."); + int bpp; + // Support RGB888/32 little endian only + if (format != null && RGB888LE32.equals(format)) { + bpp = 4; + // TODO: support more formats + } else + throw new RuntimeException("Unsupported format: " + format + ". Supported formats: " + RGB888LE32 + "."); - int dataLength = rectWidth * rectHeight * bpp; - if (!cap(buf, dataLength, dataLength, link, false)) - return; + int dataLength = rectWidth * rectHeight * bpp; + if (!cap(buf, dataLength, dataLength, link, false)) + return; - // Draw rectangle on offline buffer - BufferedImage image = canvas.getOfflineImage(); + // Draw rectangle on offline buffer + BufferedImage image = canvas.getOfflineImage(); - DataBuffer dataBuf = image.getRaster().getDataBuffer(); + DataBuffer dataBuf = image.getRaster().getDataBuffer(); - switch (dataBuf.getDataType()) { + switch (dataBuf.getDataType()) { - case DataBuffer.TYPE_INT: { + case DataBuffer.TYPE_INT: { - // Convert array of bytes to array of int's - int[] intArray = buf.toIntLEArray(); + // Convert array of bytes to array of int's + int[] intArray = buf.toIntLEArray(); - // We chose RGB888 model, so Raster will use DataBufferInt type - DataBufferInt dataBuffer = (DataBufferInt) dataBuf; + // We chose RGB888 model, so Raster will use DataBufferInt type + DataBufferInt dataBuffer = (DataBufferInt)dataBuf; - int imageWidth = image.getWidth(); - int imageHeight = image.getHeight(); + int imageWidth = image.getWidth(); + int imageHeight = image.getHeight(); - // Paint rectangle directly on buffer, line by line - int[] imageBuffer = dataBuffer.getData(); + // Paint rectangle directly on buffer, line by line + int[] imageBuffer = dataBuffer.getData(); - for (int srcLine = 0, dstLine = y; srcLine < rectHeight && dstLine < imageHeight; srcLine++, dstLine++) { - try { - System.arraycopy(intArray, srcLine * rectWidth, imageBuffer, x + dstLine * imageWidth, rectWidth); - } catch (IndexOutOfBoundsException e) { + for (int srcLine = 0, dstLine = y; srcLine < rectHeight && dstLine < imageHeight; srcLine++, dstLine++) { + try { + System.arraycopy(intArray, srcLine * rectWidth, imageBuffer, x + dstLine * imageWidth, rectWidth); + } catch (IndexOutOfBoundsException e) { + } + } + break; + } + + default: + throw new RuntimeException("Unsupported data buffer in buffered image: expected data buffer of type int (DataBufferInt). Actual data buffer type: " + + dataBuf.getClass().getSimpleName()); } - } - break; + + // Request update of repainted area + canvas.repaint(x, y, rectWidth, rectHeight); + + buf.unref(); } - default: - throw new RuntimeException("Unsupported data buffer in buffered image: expected data buffer of type int (DataBufferInt). Actual data buffer type: " - + dataBuf.getClass().getSimpleName()); + public static void main(String args[]) { + System.setProperty("streamer.Element.debug", "true"); + + BufferedImageCanvas canvas = new BufferedImageCanvas(4, 4); + + Element renderer = new BufferedImagePixelsAdapter("renderer", canvas); + + byte[] pixels = + new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; + + int[] pixelsLE = + new int[] {0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d, 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d, 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d, + 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d}; + + ByteBuffer buf = new ByteBuffer(pixels); + buf.putMetadata(TARGET_X, 0); + buf.putMetadata(TARGET_Y, 0); + buf.putMetadata(WIDTH, 4); + buf.putMetadata(HEIGHT, 4); + buf.putMetadata(PIXEL_FORMAT, RGB888LE32); + + renderer.handleData(buf, null); + + String actualData = Arrays.toString(((DataBufferInt)canvas.getOfflineImage().getRaster().getDataBuffer()).getData()); + String expectedData = Arrays.toString(pixelsLE); + if (!actualData.equals(expectedData)) + System.err.println("Actual image: " + actualData + "\nExpected image: " + expectedData + "."); + } - // Request update of repainted area - canvas.repaint(x, y, rectWidth, rectHeight); - - buf.unref(); - } - - public static void main(String args[]) { - System.setProperty("streamer.Element.debug", "true"); - - BufferedImageCanvas canvas = new BufferedImageCanvas(4, 4); - - Element renderer = new BufferedImagePixelsAdapter("renderer", canvas); - - byte[] pixels = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; - - int[] pixelsLE = new int[] { 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d, 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d, 0x04030201, 0x08070605, - 0x0c0b0a09, 0x100f0e0d, 0x04030201, 0x08070605, 0x0c0b0a09, 0x100f0e0d }; - - ByteBuffer buf = new ByteBuffer(pixels); - buf.putMetadata(TARGET_X, 0); - buf.putMetadata(TARGET_Y, 0); - buf.putMetadata(WIDTH, 4); - buf.putMetadata(HEIGHT, 4); - buf.putMetadata(PIXEL_FORMAT, RGB888LE32); - - renderer.handleData(buf, null); - - String actualData = Arrays.toString(((DataBufferInt) canvas.getOfflineImage().getRaster().getDataBuffer()).getData()); - String expectedData = Arrays.toString(pixelsLE); - if (!actualData.equals(expectedData)) - System.err.println("Actual image: " + actualData + "\nExpected image: " + expectedData + "."); - - } - } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java index 71c725e11df..b6dc4a26023 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java @@ -32,106 +32,107 @@ import vncclient.VncClient; public class Client { - private static Frame frame; - private static SocketWrapper socket; - private static ScrollPane scroller; - private static ScreenDescription screen; - private static BufferedImageCanvas canvas; + private static Frame frame; + private static SocketWrapper socket; + private static ScrollPane scroller; + private static ScreenDescription screen; + private static BufferedImageCanvas canvas; - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + // System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - try { - if (args.length < 4) { - System.out.println("Usage: \n java common.Client vnc IP PORT PASSWORD\n java common.Client rdp IP PORT username\n"); - System.exit(0); - } + try { + if (args.length < 4) { + System.out.println("Usage: \n java common.Client vnc IP PORT PASSWORD\n java common.Client rdp IP PORT username\n"); + System.exit(0); + } - String connectionType = args[0]; - String hostname = args[1]; - int port = Integer.parseInt(args[2]); - String userNameOrPassword = args[3]; + String connectionType = args[0]; + String hostname = args[1]; + int port = Integer.parseInt(args[2]); + String userNameOrPassword = args[3]; - // Create address from arguments - InetSocketAddress address = new InetSocketAddress(hostname, port); + // Create address from arguments + InetSocketAddress address = new InetSocketAddress(hostname, port); - // Create socket wrapper - socket = new SocketWrapper("socket"); + // Create socket wrapper + socket = new SocketWrapper("socket"); - screen = new ScreenDescription(); - canvas = new BufferedImageCanvas(1024, 768); - screen.addSizeChangeListener(new SizeChangeListener() { - @Override - public void sizeChanged(int width, int height) { - if (canvas != null) { - canvas.setCanvasSize(width, height); - if (scroller != null) - scroller.setSize(canvas.getWidth(), canvas.getHeight()); - } + screen = new ScreenDescription(); + canvas = new BufferedImageCanvas(1024, 768); + screen.addSizeChangeListener(new SizeChangeListener() { + @Override + public void sizeChanged(int width, int height) { + if (canvas != null) { + canvas.setCanvasSize(width, height); + if (scroller != null) + scroller.setSize(canvas.getWidth(), canvas.getHeight()); + } + } + }); + + // Assemble pipeline + Element main; + if ("vnc".equals(connectionType)) { + main = new VncClient("client", userNameOrPassword, screen, canvas); + } else if ("rdp".equals(connectionType)) { + main = new RdpClient("client", userNameOrPassword, screen, canvas); + } else { + throw new RuntimeException("Unknown connection type. Expected value: \"vnc\" or \"rdp\", actual value: \"" + connectionType + "\"."); + } + + Pipeline pipeline = new PipelineImpl("Client"); + pipeline.add(socket, main); + pipeline.link("socket", main.getId(), "socket"); + + pipeline.validate(); + + frame = createVncClientMainWindow(canvas, "VNC", new WindowAdapter() { + @Override + public void windowClosing(WindowEvent evt) { + shutdown(); + } + }); + + try { + // Connect socket to remote server and run main loop(s) + socket.connect(address); + } finally { + shutdown(); + } + + } catch (Exception e) { + e.printStackTrace(System.err); } - }); + } - // Assemble pipeline - Element main; - if ("vnc".equals(connectionType)) { - main = new VncClient("client", userNameOrPassword, screen, canvas); - } else if ("rdp".equals(connectionType)) { - main = new RdpClient("client", userNameOrPassword, screen, canvas); - } else { - throw new RuntimeException("Unknown connection type. Expected value: \"vnc\" or \"rdp\", actual value: \"" + connectionType + "\"."); - } - - Pipeline pipeline = new PipelineImpl("Client"); - pipeline.add(socket, main); - pipeline.link("socket", main.getId(), "socket"); - - pipeline.validate(); - - frame = createVncClientMainWindow(canvas, "VNC", new WindowAdapter() { - public void windowClosing(WindowEvent evt) { - shutdown(); + protected static void shutdown() { + if (frame != null) { + frame.setVisible(false); + frame.dispose(); } - }); - - try { - // Connect socket to remote server and run main loop(s) - socket.connect(address); - } finally { - shutdown(); - } - - } catch (Exception e) { - e.printStackTrace(System.err); + if (socket != null) + socket.shutdown(); } - } - protected static void shutdown() { - if (frame != null) { - frame.setVisible(false); - frame.dispose(); + protected static Frame createVncClientMainWindow(BufferedImageCanvas canvas, String title, WindowListener windowListener) { + // Create AWT windows + Frame frame = new Frame(title + " - RDP"); + + // Use scrolling pane to support screens, which are larger than ours + scroller = new ScrollPane(ScrollPane.SCROLLBARS_AS_NEEDED); + scroller.add(canvas); + scroller.setSize(canvas.getWidth(), canvas.getHeight()); + + frame.add(scroller); + frame.pack(); + frame.setVisible(true); + + frame.addWindowListener(windowListener); + + return frame; } - if (socket != null) - socket.shutdown(); - } - - protected static Frame createVncClientMainWindow(BufferedImageCanvas canvas, String title, WindowListener windowListener) { - // Create AWT windows - Frame frame = new Frame(title + " - RDP"); - - // Use scrolling pane to support screens, which are larger than ours - scroller = new ScrollPane(ScrollPane.SCROLLBARS_AS_NEEDED); - scroller.add(canvas); - scroller.setSize(canvas.getWidth(), canvas.getHeight()); - - frame.add(scroller); - frame.pack(); - frame.setVisible(true); - - frame.addWindowListener(windowListener); - - return frame; - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java index 5f0c0f77ebc..870a347d23e 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java @@ -16,24 +16,23 @@ // under the License. package common; - import streamer.Order; public class CopyRectOrder extends Order { - public int srcX; - public int srcY; - public int width; - public int height; - public int x; - public int y; + public int srcX; + public int srcY; + public int width; + public int height; + public int x; + public int y; - public CopyRectOrder() { - type = OrderType.COPY_RECT; - } + public CopyRectOrder() { + type = OrderType.COPY_RECT; + } - @Override - public String toString() { - return "CopyRectOrder [srcX=" + srcX + ", srcY=" + srcY + ", width=" + width + ", height=" + height + ", x=" + x + ", y=" + y + "]"; - } + @Override + public String toString() { + return "CopyRectOrder [srcX=" + srcX + ", srcY=" + srcY + ", width=" + width + ", height=" + height + ", x=" + x + ", y=" + y + "]"; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java index b0adf7fce13..5630b3556c0 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java @@ -21,25 +21,24 @@ import java.awt.event.KeyEvent; import streamer.Order; public class KeyOrder extends Order { - public KeyOrder() { - type = "key event"; - } + public KeyOrder() { + type = "key event"; + } - public KeyOrder(KeyEvent event, boolean pressed) { - type = "key event"; + public KeyOrder(KeyEvent event, boolean pressed) { + type = "key event"; - this.event = event; - this.pressed = pressed; - } + this.event = event; + this.pressed = pressed; + } - public KeyEvent event; + public KeyEvent event; - public boolean pressed; - - @Override - public String toString() { - return "KeyOrder [event=" + event + ", pressed=" + pressed + "]"; - } + public boolean pressed; + @Override + public String toString() { + return "KeyOrder [event=" + event + ", pressed=" + pressed + "]"; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java index d6670fad58b..6c77a875aff 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java @@ -22,20 +22,21 @@ import streamer.Order; public class MouseOrder extends Order { - public MouseOrder() { - type = "mouse order"; - } + public MouseOrder() { + type = "mouse order"; + } - public MouseOrder(MouseEvent event) { - type = "mouse order"; - this.event = event; - } + public MouseOrder(MouseEvent event) { + type = "mouse order"; + this.event = event; + } - public MouseEvent event; - public boolean pressed; - public boolean released; - @Override - public String toString() { - return "MouseOrder [event=" + event + ", pressed=" + pressed + ", released=" + released + "]"; - } + public MouseEvent event; + public boolean pressed; + public boolean released; + + @Override + public String toString() { + return "MouseOrder [event=" + event + ", pressed=" + pressed + ", released=" + released + "]"; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java index 1e77ea91434..1c8c425aef7 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java @@ -17,6 +17,6 @@ package common; public enum OrderType { - BITMAP_UPDATE, COPY_RECT, + BITMAP_UPDATE, COPY_RECT, } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java index ffbc8dcc2e6..a9155e8dee0 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java @@ -25,144 +25,144 @@ import java.util.Set; */ public class ScreenDescription { - protected Set sizeChangeListeners = new HashSet(); + protected Set sizeChangeListeners = new HashSet(); - // Frame buffer size - protected int framebufferWidth = -1; - protected int framebufferHeight = -1; + // Frame buffer size + protected int framebufferWidth = -1; + protected int framebufferHeight = -1; - // Desktop name - protected String desktopName = null; + // Desktop name + protected String desktopName = null; - // Bytes per pixel - protected int bytesPerPixel; - protected int colorDepth; - protected int bitsPerPixel; - protected int redShift; - protected int greenShift; - protected int blueShift; - protected int redMax; - protected int greenMax; - protected int blueMax; - protected boolean bigEndianFlag; - protected boolean trueColorFlag; + // Bytes per pixel + protected int bytesPerPixel; + protected int colorDepth; + protected int bitsPerPixel; + protected int redShift; + protected int greenShift; + protected int blueShift; + protected int redMax; + protected int greenMax; + protected int blueMax; + protected boolean bigEndianFlag; + protected boolean trueColorFlag; - public IndexColorModel colorMap = null; + public IndexColorModel colorMap = null; - public ScreenDescription() { - } - - /** - * Store information about server pixel format. - */ - public void setPixelFormat(int bitsPerPixel, int depth, boolean bigEndianFlag, boolean trueColorFlag, int redMax, int greenMax, int blueMax, int redShift, - int greenShift, int blueShift) { - - this.bytesPerPixel = (bitsPerPixel + 7) / 8; - - this.bitsPerPixel = bitsPerPixel; - this.colorDepth = depth; - this.bigEndianFlag = bigEndianFlag; - this.trueColorFlag = trueColorFlag; - - this.redMax = redMax; - this.greenMax = greenMax; - this.blueMax = blueMax; - this.redShift = redShift; - this.greenShift = greenShift; - this.blueShift = blueShift; - } - - /** - * Store information about server pixel format. - */ - public void setPixelFormatRGBTrueColor(int bitsPerPixel) { - - switch(bitsPerPixel) { - case 8: - setPixelFormat(8, 8, false, false, -1, -1, -1, -1, -1, -1); - break; - case 15: - setPixelFormat(16, 15, false, true, 31, 31, 31, 0, 5, 10); - break; - case 16: - setPixelFormat(16, 16, false, true, 31, 63, 31, 0, 5, 11); - break; - case 24: - setPixelFormat(24, 24, false, true, 255, 255, 255, 0, 8, 16); - break; - case 32: - setPixelFormat(32, 24, false, true, 255, 255, 255, 0, 8, 16); - break; - default: - throw new RuntimeException("Unknown color depth."); + public ScreenDescription() { } - } + /** + * Store information about server pixel format. + */ + public void setPixelFormat(int bitsPerPixel, int depth, boolean bigEndianFlag, boolean trueColorFlag, int redMax, int greenMax, int blueMax, int redShift, + int greenShift, int blueShift) { - /** - * Store information about server screen size. - */ - public void setFramebufferSize(int width, int height) { - if (height <= 0 || width <= 0) - throw new RuntimeException("Incorrect framebuffer size: " + width + "x" + height + "."); + this.bytesPerPixel = (bitsPerPixel + 7) / 8; - this.framebufferWidth = width; - this.framebufferHeight = height; + this.bitsPerPixel = bitsPerPixel; + this.colorDepth = depth; + this.bigEndianFlag = bigEndianFlag; + this.trueColorFlag = trueColorFlag; - callSizeChangeListeners(width, height); - } - - protected void callSizeChangeListeners(int width, int height) { - for(SizeChangeListener listener:sizeChangeListeners) { - listener.sizeChanged(width, height); + this.redMax = redMax; + this.greenMax = greenMax; + this.blueMax = blueMax; + this.redShift = redShift; + this.greenShift = greenShift; + this.blueShift = blueShift; } - } - /** - * Store server desktop name. - */ - public void setDesktopName(String desktopName) { - this.desktopName = desktopName; - } + /** + * Store information about server pixel format. + */ + public void setPixelFormatRGBTrueColor(int bitsPerPixel) { - // Getters for variables, as usual + switch (bitsPerPixel) { + case 8: + setPixelFormat(8, 8, false, false, -1, -1, -1, -1, -1, -1); + break; + case 15: + setPixelFormat(16, 15, false, true, 31, 31, 31, 0, 5, 10); + break; + case 16: + setPixelFormat(16, 16, false, true, 31, 63, 31, 0, 5, 11); + break; + case 24: + setPixelFormat(24, 24, false, true, 255, 255, 255, 0, 8, 16); + break; + case 32: + setPixelFormat(32, 24, false, true, 255, 255, 255, 0, 8, 16); + break; + default: + throw new RuntimeException("Unknown color depth."); + } - public String getDesktopName() { - return desktopName; - } + } - public int getBytesPerPixel() { - return bytesPerPixel; - } + /** + * Store information about server screen size. + */ + public void setFramebufferSize(int width, int height) { + if (height <= 0 || width <= 0) + throw new RuntimeException("Incorrect framebuffer size: " + width + "x" + height + "."); - public int getFramebufferHeight() { - return framebufferHeight; - } + this.framebufferWidth = width; + this.framebufferHeight = height; - public int getFramebufferWidth() { - return framebufferWidth; - } + callSizeChangeListeners(width, height); + } - public boolean isRGB888_32_LE() { - return (colorDepth == 24 && bitsPerPixel == 32 && redShift == 0 && greenShift == 8 && blueShift == 16 && redMax == 255 && greenMax == 255 && blueMax == 255 - && !bigEndianFlag && trueColorFlag); - } + protected void callSizeChangeListeners(int width, int height) { + for (SizeChangeListener listener : sizeChangeListeners) { + listener.sizeChanged(width, height); + } + } - @Override - public String toString() { - return "ScreenDescription [framebufferWidth=" + framebufferWidth + ", framebufferHeight=" + framebufferHeight + ", desktopName=" + desktopName - + ", bytesPerPixel=" + bytesPerPixel + ", depth=" + colorDepth + ", bitsPerPixel=" + bitsPerPixel + ", redShift=" + redShift + ", greenShift=" + greenShift - + ", blueShift=" + blueShift + ", redMax=" + redMax + ", greenMax=" + greenMax + ", blueMax=" + blueMax + ", bigEndianFlag=" + bigEndianFlag - + ", trueColorFlag=" + trueColorFlag + "]"; - } + /** + * Store server desktop name. + */ + public void setDesktopName(String desktopName) { + this.desktopName = desktopName; + } - public void addSizeChangeListener(SizeChangeListener sizeChangeListener) { - sizeChangeListeners.add(sizeChangeListener); - } + // Getters for variables, as usual - public int getColorDeph() { - return colorDepth; - } + public String getDesktopName() { + return desktopName; + } + + public int getBytesPerPixel() { + return bytesPerPixel; + } + + public int getFramebufferHeight() { + return framebufferHeight; + } + + public int getFramebufferWidth() { + return framebufferWidth; + } + + public boolean isRGB888_32_LE() { + return (colorDepth == 24 && bitsPerPixel == 32 && redShift == 0 && greenShift == 8 && blueShift == 16 && redMax == 255 && greenMax == 255 && blueMax == 255 && + !bigEndianFlag && trueColorFlag); + } + + @Override + public String toString() { + return "ScreenDescription [framebufferWidth=" + framebufferWidth + ", framebufferHeight=" + framebufferHeight + ", desktopName=" + desktopName + + ", bytesPerPixel=" + bytesPerPixel + ", depth=" + colorDepth + ", bitsPerPixel=" + bitsPerPixel + ", redShift=" + redShift + ", greenShift=" + greenShift + + ", blueShift=" + blueShift + ", redMax=" + redMax + ", greenMax=" + greenMax + ", blueMax=" + blueMax + ", bigEndianFlag=" + bigEndianFlag + + ", trueColorFlag=" + trueColorFlag + "]"; + } + + public void addSizeChangeListener(SizeChangeListener sizeChangeListener) { + sizeChangeListeners.add(sizeChangeListener); + } + + public int getColorDeph() { + return colorDepth; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java index d658d1b95f2..0be8761c4c0 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java @@ -18,5 +18,5 @@ package common; public interface SizeChangeListener { - public void sizeChanged(int width, int height); + public void sizeChanged(int width, int height); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpKeyboardAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpKeyboardAdapter.java index f19f09c0b68..06449f6f874 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpKeyboardAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpKeyboardAdapter.java @@ -21,331 +21,330 @@ import java.awt.event.KeyEvent; import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; - import common.KeyOrder; public class AwtRdpKeyboardAdapter extends BaseElement { - /** - * Absence of this flag indicates a key-down event, while its presence - * indicates a key-release event. - */ - public static final int FASTPATH_INPUT_KBDFLAGS_RELEASE = 0x01; + /** + * Absence of this flag indicates a key-down event, while its presence + * indicates a key-release event. + */ + public static final int FASTPATH_INPUT_KBDFLAGS_RELEASE = 0x01; - /** - * Keystroke message contains an extended scancode. For enhanced 101-key and - * 102-key keyboards, extended keys include the right ALT and right CTRL keys - * on the main section of the keyboard; the INS, DEL, HOME, END, PAGE UP, PAGE - * DOWN and ARROW keys in the clusters to the left of the numeric keypad; and - * the Divide ("/") and ENTER keys in the numeric keypad. - */ - public static final int FASTPATH_INPUT_KBDFLAGS_EXTENDED = 0x02; + /** + * Keystroke message contains an extended scancode. For enhanced 101-key and + * 102-key keyboards, extended keys include the right ALT and right CTRL keys + * on the main section of the keyboard; the INS, DEL, HOME, END, PAGE UP, PAGE + * DOWN and ARROW keys in the clusters to the left of the numeric keypad; and + * the Divide ("/") and ENTER keys in the numeric keypad. + */ + public static final int FASTPATH_INPUT_KBDFLAGS_EXTENDED = 0x02; - public static final int FASTPATH_INPUT_EVENT_SCANCODE = 0; + public static final int FASTPATH_INPUT_EVENT_SCANCODE = 0; - public AwtRdpKeyboardAdapter(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - KeyOrder order = (KeyOrder) buf.getOrder(); - buf.unref(); - - ByteBuffer outBuf = new ByteBuffer(2, true); - - int scanCode = map_en_us(order.event); - - // eventHeader (1 byte): An 8-bit, unsigned integer. The format of this - // field is the same as the eventHeader byte field described in section - // 2.2.8.1.2.2. The eventCode bitfield (3 bits in size) MUST be set to - // FASTPATH_INPUT_EVENT_SCANCODE (0). The eventFlags bitfield (5 bits in - // size) contains flags describing the keyboard event. - outBuf.writeByte((scanCode >> 8) | (FASTPATH_INPUT_EVENT_SCANCODE << 5) | ((order.pressed) ? 0 : FASTPATH_INPUT_KBDFLAGS_RELEASE)); - - // keyCode (1 byte): An 8-bit, unsigned integer. The scancode of the key - // which triggered the event. - outBuf.writeByte(scanCode); - - // Push buffer to one pad only, so it can be modified without copying of - // data - pushDataToPad(STDOUT, outBuf); - } - - /** - * Return key scan code (in lower byte) and extended flags (in second byte). - */ - private int map_en_us(KeyEvent event) { - // Also set extended key flag when necessary. - // For enhanced 101-key and 102-key keyboards, extended keys include the - // right ALT and right CTRL keys on the main section of the keyboard; the - // INS, DEL, HOME, END, PAGE UP, PAGE DOWN and ARROW keys in the clusters to - // the left of the numeric keypad; and the Divide ("/") and ENTER keys in - // the numeric keypad. - - switch (event.getKeyCode()) { - // Functional keys - case KeyEvent.VK_ESCAPE: - return 1; - case KeyEvent.VK_F1: - return 59; - case KeyEvent.VK_F2: - return 60; - case KeyEvent.VK_F3: - return 61; - case KeyEvent.VK_F4: - return 62; - case KeyEvent.VK_F5: - return 63; - case KeyEvent.VK_F6: - return 64; - case KeyEvent.VK_F7: - return 65; - case KeyEvent.VK_F8: - return 66; - case KeyEvent.VK_F9: - return 67; - case KeyEvent.VK_F10: - return 68; - case KeyEvent.VK_F11: - return 87; - case KeyEvent.VK_F12: - return 88; - - // Row #1 - case KeyEvent.VK_BACK_QUOTE: - return 41; - case KeyEvent.VK_1: - return 2; - case KeyEvent.VK_2: - return 3; - case KeyEvent.VK_3: - return 4; - case KeyEvent.VK_4: - return 5; - case KeyEvent.VK_5: - return 6; - case KeyEvent.VK_6: - return 7; - case KeyEvent.VK_7: - return 8; - case KeyEvent.VK_8: - return 9; - case KeyEvent.VK_9: - return 10; - case KeyEvent.VK_0: - return 11; - case KeyEvent.VK_MINUS: - return 12; - case KeyEvent.VK_EQUALS: - return 13; - case KeyEvent.VK_BACK_SPACE: - return 14; - - // Row #2 - case KeyEvent.VK_TAB: - return 15; - case KeyEvent.VK_Q: - return 16; - case KeyEvent.VK_W: - return 17; - case KeyEvent.VK_E: - return 18; - case KeyEvent.VK_R: - return 19; - case KeyEvent.VK_T: - return 20; - case KeyEvent.VK_Y: - return 21; - case KeyEvent.VK_U: - return 22; - case KeyEvent.VK_I: - return 23; - case KeyEvent.VK_O: - return 24; - case KeyEvent.VK_P: - return 25; - case KeyEvent.VK_OPEN_BRACKET: - return 26; - case KeyEvent.VK_CLOSE_BRACKET: - return 27; - case KeyEvent.VK_ENTER: - switch (event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_STANDARD: - return 28; - case KeyEvent.KEY_LOCATION_NUMPAD: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 28; - } - - // Row #3 - case KeyEvent.VK_CAPS_LOCK: - return 58; - case KeyEvent.VK_A: - return 30; - case KeyEvent.VK_S: - return 31; - case KeyEvent.VK_D: - return 32; - case KeyEvent.VK_F: - return 33; - case KeyEvent.VK_G: - return 34; - case KeyEvent.VK_H: - return 35; - case KeyEvent.VK_J: - return 36; - case KeyEvent.VK_K: - return 37; - case KeyEvent.VK_L: - return 38; - case KeyEvent.VK_SEMICOLON: - return 39; - case KeyEvent.VK_QUOTE: - return 40; - - // Row #4 - case KeyEvent.VK_SHIFT: - switch (event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 42; - case KeyEvent.KEY_LOCATION_RIGHT: - return 54; - } - case KeyEvent.VK_BACK_SLASH: - return 43; - case KeyEvent.VK_Z: - return 44; - case KeyEvent.VK_X: - return 45; - case KeyEvent.VK_C: - return 46; - case KeyEvent.VK_V: - return 47; - case KeyEvent.VK_B: - return 48; - case KeyEvent.VK_N: - return 49; - case KeyEvent.VK_M: - return 50; - case KeyEvent.VK_COMMA: - return 51; - case KeyEvent.VK_PERIOD: - return 52; - case KeyEvent.VK_SLASH: - return 53; - - // - // Bottom row - case KeyEvent.VK_CONTROL: - switch (event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 29; - case KeyEvent.KEY_LOCATION_RIGHT: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 29; - } - case KeyEvent.VK_WINDOWS: - switch (event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 91; - case KeyEvent.KEY_LOCATION_RIGHT: - return 92; - } - case KeyEvent.VK_ALT: - switch (event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 56; - case KeyEvent.KEY_LOCATION_RIGHT: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 56; - } - case KeyEvent.VK_ALT_GRAPH: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 56; - - case KeyEvent.VK_SPACE: - return 57; - - case KeyEvent.VK_CONTEXT_MENU: - return 93; - - // - // Special keys - case KeyEvent.VK_PRINTSCREEN: - return 55; - case KeyEvent.VK_SCROLL_LOCK: - return 70; - case KeyEvent.VK_PAUSE: - return 29; - - // Text navigation keys - case KeyEvent.VK_INSERT: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 82; - case KeyEvent.VK_HOME: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 71; - case KeyEvent.VK_PAGE_UP: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 73; - case KeyEvent.VK_DELETE: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 83; - case KeyEvent.VK_END: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 79; - case KeyEvent.VK_PAGE_DOWN: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 81; - - // Cursor keys - case KeyEvent.VK_UP: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 72; - case KeyEvent.VK_LEFT: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 75; - case KeyEvent.VK_DOWN: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 80; - case KeyEvent.VK_RIGHT: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 77; - - // Keypad - case KeyEvent.VK_NUM_LOCK: - return 69; - case KeyEvent.VK_DIVIDE: - return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 53; - case KeyEvent.VK_MULTIPLY: - return 55; - case KeyEvent.VK_SUBTRACT: - return 74; - case KeyEvent.VK_ADD: - return 78; - - case KeyEvent.VK_NUMPAD7: - return 71; - case KeyEvent.VK_NUMPAD8: - return 72; - case KeyEvent.VK_NUMPAD9: - return 73; - case KeyEvent.VK_NUMPAD4: - return 75; - case KeyEvent.VK_NUMPAD5: - return 76; - case KeyEvent.VK_NUMPAD6: - return 77; - case KeyEvent.VK_NUMPAD1: - return 79; - case KeyEvent.VK_NUMPAD2: - return 80; - case KeyEvent.VK_NUMPAD3: - return 81; - case KeyEvent.VK_NUMPAD0: - return 82; - case KeyEvent.VK_DECIMAL: - return 83; - - default: - System.err.println("Key is not mapped: " + event + "."); - return 57; // Space + public AwtRdpKeyboardAdapter(String id) { + super(id); + } + + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + KeyOrder order = (KeyOrder)buf.getOrder(); + buf.unref(); + + ByteBuffer outBuf = new ByteBuffer(2, true); + + int scanCode = map_en_us(order.event); + + // eventHeader (1 byte): An 8-bit, unsigned integer. The format of this + // field is the same as the eventHeader byte field described in section + // 2.2.8.1.2.2. The eventCode bitfield (3 bits in size) MUST be set to + // FASTPATH_INPUT_EVENT_SCANCODE (0). The eventFlags bitfield (5 bits in + // size) contains flags describing the keyboard event. + outBuf.writeByte((scanCode >> 8) | (FASTPATH_INPUT_EVENT_SCANCODE << 5) | ((order.pressed) ? 0 : FASTPATH_INPUT_KBDFLAGS_RELEASE)); + + // keyCode (1 byte): An 8-bit, unsigned integer. The scancode of the key + // which triggered the event. + outBuf.writeByte(scanCode); + + // Push buffer to one pad only, so it can be modified without copying of + // data + pushDataToPad(STDOUT, outBuf); + } + + /** + * Return key scan code (in lower byte) and extended flags (in second byte). + */ + private int map_en_us(KeyEvent event) { + // Also set extended key flag when necessary. + // For enhanced 101-key and 102-key keyboards, extended keys include the + // right ALT and right CTRL keys on the main section of the keyboard; the + // INS, DEL, HOME, END, PAGE UP, PAGE DOWN and ARROW keys in the clusters to + // the left of the numeric keypad; and the Divide ("/") and ENTER keys in + // the numeric keypad. + + switch (event.getKeyCode()) { + // Functional keys + case KeyEvent.VK_ESCAPE: + return 1; + case KeyEvent.VK_F1: + return 59; + case KeyEvent.VK_F2: + return 60; + case KeyEvent.VK_F3: + return 61; + case KeyEvent.VK_F4: + return 62; + case KeyEvent.VK_F5: + return 63; + case KeyEvent.VK_F6: + return 64; + case KeyEvent.VK_F7: + return 65; + case KeyEvent.VK_F8: + return 66; + case KeyEvent.VK_F9: + return 67; + case KeyEvent.VK_F10: + return 68; + case KeyEvent.VK_F11: + return 87; + case KeyEvent.VK_F12: + return 88; + + // Row #1 + case KeyEvent.VK_BACK_QUOTE: + return 41; + case KeyEvent.VK_1: + return 2; + case KeyEvent.VK_2: + return 3; + case KeyEvent.VK_3: + return 4; + case KeyEvent.VK_4: + return 5; + case KeyEvent.VK_5: + return 6; + case KeyEvent.VK_6: + return 7; + case KeyEvent.VK_7: + return 8; + case KeyEvent.VK_8: + return 9; + case KeyEvent.VK_9: + return 10; + case KeyEvent.VK_0: + return 11; + case KeyEvent.VK_MINUS: + return 12; + case KeyEvent.VK_EQUALS: + return 13; + case KeyEvent.VK_BACK_SPACE: + return 14; + + // Row #2 + case KeyEvent.VK_TAB: + return 15; + case KeyEvent.VK_Q: + return 16; + case KeyEvent.VK_W: + return 17; + case KeyEvent.VK_E: + return 18; + case KeyEvent.VK_R: + return 19; + case KeyEvent.VK_T: + return 20; + case KeyEvent.VK_Y: + return 21; + case KeyEvent.VK_U: + return 22; + case KeyEvent.VK_I: + return 23; + case KeyEvent.VK_O: + return 24; + case KeyEvent.VK_P: + return 25; + case KeyEvent.VK_OPEN_BRACKET: + return 26; + case KeyEvent.VK_CLOSE_BRACKET: + return 27; + case KeyEvent.VK_ENTER: + switch (event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_STANDARD: + return 28; + case KeyEvent.KEY_LOCATION_NUMPAD: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 28; + } + + // Row #3 + case KeyEvent.VK_CAPS_LOCK: + return 58; + case KeyEvent.VK_A: + return 30; + case KeyEvent.VK_S: + return 31; + case KeyEvent.VK_D: + return 32; + case KeyEvent.VK_F: + return 33; + case KeyEvent.VK_G: + return 34; + case KeyEvent.VK_H: + return 35; + case KeyEvent.VK_J: + return 36; + case KeyEvent.VK_K: + return 37; + case KeyEvent.VK_L: + return 38; + case KeyEvent.VK_SEMICOLON: + return 39; + case KeyEvent.VK_QUOTE: + return 40; + + // Row #4 + case KeyEvent.VK_SHIFT: + switch (event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 42; + case KeyEvent.KEY_LOCATION_RIGHT: + return 54; + } + case KeyEvent.VK_BACK_SLASH: + return 43; + case KeyEvent.VK_Z: + return 44; + case KeyEvent.VK_X: + return 45; + case KeyEvent.VK_C: + return 46; + case KeyEvent.VK_V: + return 47; + case KeyEvent.VK_B: + return 48; + case KeyEvent.VK_N: + return 49; + case KeyEvent.VK_M: + return 50; + case KeyEvent.VK_COMMA: + return 51; + case KeyEvent.VK_PERIOD: + return 52; + case KeyEvent.VK_SLASH: + return 53; + + // + // Bottom row + case KeyEvent.VK_CONTROL: + switch (event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 29; + case KeyEvent.KEY_LOCATION_RIGHT: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 29; + } + case KeyEvent.VK_WINDOWS: + switch (event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 91; + case KeyEvent.KEY_LOCATION_RIGHT: + return 92; + } + case KeyEvent.VK_ALT: + switch (event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 56; + case KeyEvent.KEY_LOCATION_RIGHT: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 56; + } + case KeyEvent.VK_ALT_GRAPH: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 56; + + case KeyEvent.VK_SPACE: + return 57; + + case KeyEvent.VK_CONTEXT_MENU: + return 93; + + // + // Special keys + case KeyEvent.VK_PRINTSCREEN: + return 55; + case KeyEvent.VK_SCROLL_LOCK: + return 70; + case KeyEvent.VK_PAUSE: + return 29; + + // Text navigation keys + case KeyEvent.VK_INSERT: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 82; + case KeyEvent.VK_HOME: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 71; + case KeyEvent.VK_PAGE_UP: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 73; + case KeyEvent.VK_DELETE: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 83; + case KeyEvent.VK_END: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 79; + case KeyEvent.VK_PAGE_DOWN: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 81; + + // Cursor keys + case KeyEvent.VK_UP: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 72; + case KeyEvent.VK_LEFT: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 75; + case KeyEvent.VK_DOWN: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 80; + case KeyEvent.VK_RIGHT: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 77; + + // Keypad + case KeyEvent.VK_NUM_LOCK: + return 69; + case KeyEvent.VK_DIVIDE: + return (FASTPATH_INPUT_KBDFLAGS_EXTENDED << 8) | 53; + case KeyEvent.VK_MULTIPLY: + return 55; + case KeyEvent.VK_SUBTRACT: + return 74; + case KeyEvent.VK_ADD: + return 78; + + case KeyEvent.VK_NUMPAD7: + return 71; + case KeyEvent.VK_NUMPAD8: + return 72; + case KeyEvent.VK_NUMPAD9: + return 73; + case KeyEvent.VK_NUMPAD4: + return 75; + case KeyEvent.VK_NUMPAD5: + return 76; + case KeyEvent.VK_NUMPAD6: + return 77; + case KeyEvent.VK_NUMPAD1: + return 79; + case KeyEvent.VK_NUMPAD2: + return 80; + case KeyEvent.VK_NUMPAD3: + return 81; + case KeyEvent.VK_NUMPAD0: + return 82; + case KeyEvent.VK_DECIMAL: + return 83; + + default: + System.err.println("Key is not mapped: " + event + "."); + return 57; // Space + } } - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java index 09608bcc958..bb7c5867a22 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java @@ -16,165 +16,165 @@ // under the License. package rdpclient; +import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; - import common.MouseOrder; /** * @see http://msdn.microsoft.com/en-us/library/cc240594.aspx */ public class AwtRdpMouseAdapter extends BaseElement { - public static int FASTPATH_INPUT_EVENT_MOUSE = 0x01; + public static int FASTPATH_INPUT_EVENT_MOUSE = 0x01; - /** - * Event is a mouse wheel rotation. The only valid flags in a wheel rotation - * event are PTRFLAGS_WHEEL_NEGATIVE and the WheelRotationMask; all other - * pointer flags are ignored. - */ - public static int PTRFLAGS_WHEEL = 0x0200; + /** + * Event is a mouse wheel rotation. The only valid flags in a wheel rotation + * event are PTRFLAGS_WHEEL_NEGATIVE and the WheelRotationMask; all other + * pointer flags are ignored. + */ + public static int PTRFLAGS_WHEEL = 0x0200; - /** - * Wheel rotation value (contained in the WheelRotationMask bit field) is - * negative and MUST be sign-extended before injection at the server. - */ - public static int PTRFLAGS_WHEEL_NEGATIVE = 0x0100; + /** + * Wheel rotation value (contained in the WheelRotationMask bit field) is + * negative and MUST be sign-extended before injection at the server. + */ + public static int PTRFLAGS_WHEEL_NEGATIVE = 0x0100; - /** - * Bit field describing the number of rotation units the mouse wheel was - * rotated. The value is negative if the PTRFLAGS_WHEEL_NEGATIVE flag is set. - */ - public static int WHEEL_ROTATION_MASK = 0x01FF; + /** + * Bit field describing the number of rotation units the mouse wheel was + * rotated. The value is negative if the PTRFLAGS_WHEEL_NEGATIVE flag is set. + */ + public static int WHEEL_ROTATION_MASK = 0x01FF; - /** - * Indicates that the mouse position MUST be updated to the location specified - * by the xPos and yPos fields. - */ - public static int PTRFLAGS_MOVE = 0x0800; + /** + * Indicates that the mouse position MUST be updated to the location specified + * by the xPos and yPos fields. + */ + public static int PTRFLAGS_MOVE = 0x0800; - /** - * Indicates that a click event has occurred at the position specified by the - * xPos and yPos fields. The button flags indicate which button has been - * clicked and at least one of these flags MUST be set. - */ - public static int PTRFLAGS_DOWN = 0x8000; + /** + * Indicates that a click event has occurred at the position specified by the + * xPos and yPos fields. The button flags indicate which button has been + * clicked and at least one of these flags MUST be set. + */ + public static int PTRFLAGS_DOWN = 0x8000; - /** - * Mouse button 1 (left button) was clicked or released. If the PTRFLAGS_DOWN - * flag is set, then the button was clicked, otherwise it was released. - */ - public static int PTRFLAGS_BUTTON1 = 0x1000; + /** + * Mouse button 1 (left button) was clicked or released. If the PTRFLAGS_DOWN + * flag is set, then the button was clicked, otherwise it was released. + */ + public static int PTRFLAGS_BUTTON1 = 0x1000; - /** - * Mouse button 2 (right button) was clicked or released. If the PTRFLAGS_DOWN - * flag is set, then the button was clicked, otherwise it was released. - */ - public static int PTRFLAGS_BUTTON2 = 0x2000; + /** + * Mouse button 2 (right button) was clicked or released. If the PTRFLAGS_DOWN + * flag is set, then the button was clicked, otherwise it was released. + */ + public static int PTRFLAGS_BUTTON2 = 0x2000; - /** - * Mouse button 3 (middle button or wheel) was clicked or released. If the - * PTRFLAGS_DOWN flag is set, then the button was clicked, otherwise it was - * released. - */ - public static int PTRFLAGS_BUTTON3 = 0x4000; + /** + * Mouse button 3 (middle button or wheel) was clicked or released. If the + * PTRFLAGS_DOWN flag is set, then the button was clicked, otherwise it was + * released. + */ + public static int PTRFLAGS_BUTTON3 = 0x4000; - public AwtRdpMouseAdapter(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // Get mouse event - MouseOrder order = (MouseOrder) buf.getOrder(); - - ByteBuffer outBuf = new ByteBuffer(7, true); - - // eventHeader (1 byte): An 8-bit, unsigned integer. EventCode bitfield (top - // 3 bits) MUST be set to FASTPATH_INPUT_EVENT_MOUSE (1). The - // eventFlags bitfield (low 5 bits) MUST be zeroed out. - outBuf.writeByte(FASTPATH_INPUT_EVENT_MOUSE << 5); - - // pointerFlags (2 bytes): A 16-bit, unsigned integer. - outBuf.writeShortLE(getPointerFlags(order)); - - // xPos (2 bytes): A 16-bit, unsigned integer. The x-coordinate of the - // pointer. - outBuf.writeShortLE(order.event.getX()); - - // yPos (2 bytes): A 16-bit, unsigned integer. The y-coordinate of the - // pointer. - outBuf.writeShortLE(order.event.getY()); - - // Push buffer to one pad only, so it can be modified without copying of - // data - pushDataToPad(STDOUT, outBuf); - } - - // Remember mouse buttons - protected boolean button1, button2, button3; - - protected int getPointerFlags(MouseOrder order) { - int flags = 0; - - int modifiers = order.event.getModifiersEx(); - - if (order.pressed) { - // Mouse pressed - flags |= PTRFLAGS_DOWN; - - // Check, which one of buttons is released - boolean b1 = ((modifiers & MouseEvent.BUTTON1_DOWN_MASK) > 0) && !button1; - boolean b2 = ((modifiers & MouseEvent.BUTTON2_DOWN_MASK) > 0) && !button2; - boolean b3 = ((modifiers & MouseEvent.BUTTON3_DOWN_MASK) > 0) && !button3; - - if (b1) { - flags |= PTRFLAGS_BUTTON1; - button1 = true; - } - - if (b2) { - flags |= PTRFLAGS_BUTTON3; - button2 = true; - } - - if (b3) { - flags |= PTRFLAGS_BUTTON2; - button3 = true; - } - } else if (order.released) { - // Mouse released - - // Check, which one of buttons is released - boolean b1 = !((modifiers & MouseEvent.BUTTON1_DOWN_MASK) > 0) && button1; - boolean b2 = !((modifiers & MouseEvent.BUTTON2_DOWN_MASK) > 0) && button2; - boolean b3 = !((modifiers & MouseEvent.BUTTON3_DOWN_MASK) > 0) && button3; - - if (b1) { - flags |= PTRFLAGS_BUTTON1; - button1 = false; - } - - if (b2) { - flags |= PTRFLAGS_BUTTON3; - button2 = false; - } - - if (b3) { - flags |= PTRFLAGS_BUTTON2; - button3 = false; - } - } else { - // Mouse moved - flags |= PTRFLAGS_MOVE; + public AwtRdpMouseAdapter(String id) { + super(id); } - return flags; - } + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + // Get mouse event + MouseOrder order = (MouseOrder)buf.getOrder(); + + ByteBuffer outBuf = new ByteBuffer(7, true); + + // eventHeader (1 byte): An 8-bit, unsigned integer. EventCode bitfield (top + // 3 bits) MUST be set to FASTPATH_INPUT_EVENT_MOUSE (1). The + // eventFlags bitfield (low 5 bits) MUST be zeroed out. + outBuf.writeByte(FASTPATH_INPUT_EVENT_MOUSE << 5); + + // pointerFlags (2 bytes): A 16-bit, unsigned integer. + outBuf.writeShortLE(getPointerFlags(order)); + + // xPos (2 bytes): A 16-bit, unsigned integer. The x-coordinate of the + // pointer. + outBuf.writeShortLE(order.event.getX()); + + // yPos (2 bytes): A 16-bit, unsigned integer. The y-coordinate of the + // pointer. + outBuf.writeShortLE(order.event.getY()); + + // Push buffer to one pad only, so it can be modified without copying of + // data + pushDataToPad(STDOUT, outBuf); + } + + // Remember mouse buttons + protected boolean button1, button2, button3; + + protected int getPointerFlags(MouseOrder order) { + int flags = 0; + + int modifiers = order.event.getModifiersEx(); + + if (order.pressed) { + // Mouse pressed + flags |= PTRFLAGS_DOWN; + + // Check, which one of buttons is released + boolean b1 = ((modifiers & InputEvent.BUTTON1_DOWN_MASK) > 0) && !button1; + boolean b2 = ((modifiers & InputEvent.BUTTON2_DOWN_MASK) > 0) && !button2; + boolean b3 = ((modifiers & InputEvent.BUTTON3_DOWN_MASK) > 0) && !button3; + + if (b1) { + flags |= PTRFLAGS_BUTTON1; + button1 = true; + } + + if (b2) { + flags |= PTRFLAGS_BUTTON3; + button2 = true; + } + + if (b3) { + flags |= PTRFLAGS_BUTTON2; + button3 = true; + } + } else if (order.released) { + // Mouse released + + // Check, which one of buttons is released + boolean b1 = !((modifiers & InputEvent.BUTTON1_DOWN_MASK) > 0) && button1; + boolean b2 = !((modifiers & InputEvent.BUTTON2_DOWN_MASK) > 0) && button2; + boolean b3 = !((modifiers & InputEvent.BUTTON3_DOWN_MASK) > 0) && button3; + + if (b1) { + flags |= PTRFLAGS_BUTTON1; + button1 = false; + } + + if (b2) { + flags |= PTRFLAGS_BUTTON3; + button2 = false; + } + + if (b3) { + flags |= PTRFLAGS_BUTTON2; + button3 = false; + } + } else { + // Mouse moved + flags |= PTRFLAGS_MOVE; + } + + return flags; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java index 6c174961eb0..d757e8e7950 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java @@ -24,7 +24,6 @@ import streamer.MockSink; import streamer.MockSource; import streamer.Pipeline; import streamer.PipelineImpl; - import common.ScreenDescription; /** @@ -32,118 +31,118 @@ import common.ScreenDescription; */ public class ClientConfirmActivePDU extends BaseElement { - public static final String SOURCE_DESC = "MSTSC"; + public static final String SOURCE_DESC = "MSTSC"; - public static final int CAPSTYPE_BITMAP = 0x2; + public static final int CAPSTYPE_BITMAP = 0x2; - protected int numberCapabilities; + protected int numberCapabilities; - protected RdpState state; - protected ScreenDescription screen; + protected RdpState state; + protected ScreenDescription screen; - protected boolean desktopResize = false; - protected int prefferedBitsPerPixel = 16; + protected boolean desktopResize = false; + protected int prefferedBitsPerPixel = 16; - public ClientConfirmActivePDU(String id, ScreenDescription screen, RdpState state) { - super(id); - this.state = state; - this.screen = screen; - } + public ClientConfirmActivePDU(String id, ScreenDescription screen, RdpState state) { + super(id); + this.state = state; + this.screen = screen; + } - @Override - public void handleData(ByteBuffer aBuf, Link link) { + @Override + public void handleData(ByteBuffer aBuf, Link link) { - // Body - ByteBuffer buf = new ByteBuffer(1024, true); - numberCapabilities = 0; - writeCapabilities(buf); - buf.trimAtCursor(); + // Body + ByteBuffer buf = new ByteBuffer(1024, true); + numberCapabilities = 0; + writeCapabilities(buf); + buf.trimAtCursor(); - // Header - ByteBuffer header = createMCSHeader(buf); + // Header + ByteBuffer header = createMCSHeader(buf); - // Length of source descriptor, including NULL character (LE) - header.writeShortLE(SOURCE_DESC.length() + 1); + // Length of source descriptor, including NULL character (LE) + header.writeShortLE(SOURCE_DESC.length() + 1); - // Length of combined capabilities + 4 bytes (number of capabilities and - // padding) (LE) - header.writeShortLE(buf.length + 4); + // Length of combined capabilities + 4 bytes (number of capabilities and + // padding) (LE) + header.writeShortLE(buf.length + 4); - header.writeString(SOURCE_DESC, RdpConstants.CHARSET_8); - header.writeByte(0); + header.writeString(SOURCE_DESC, RdpConstants.CHARSET_8); + header.writeByte(0); - // Number of capabilities - header.writeShortLE(numberCapabilities); + // Number of capabilities + header.writeShortLE(numberCapabilities); - // Padding 2 bytes - header.writeShortLE(0); + // Padding 2 bytes + header.writeShortLE(0); - header.trimAtCursor(); + header.trimAtCursor(); - // Prepend header to capabilities - buf.prepend(header); + // Prepend header to capabilities + buf.prepend(header); - // Trim buffer to actual length of data written - buf.length = buf.cursor; + // Trim buffer to actual length of data written + buf.length = buf.cursor; - pushDataToPad(STDOUT, buf); + pushDataToPad(STDOUT, buf); - sendOtherRequredPackets(); + sendOtherRequredPackets(); - } + } - private ByteBuffer createMCSHeader(ByteBuffer buf) { - ByteBuffer header = new ByteBuffer(100); - // MCS Send Data Request - header.writeByte(0x64); + private ByteBuffer createMCSHeader(ByteBuffer buf) { + ByteBuffer header = new ByteBuffer(100); + // MCS Send Data Request + header.writeByte(0x64); - // Initiator: 1004 (1001+3) - header.writeShort(3); + // Initiator: 1004 (1001+3) + header.writeShort(3); - // Channel ID: 1003 (I/O channel) - header.writeShort(1003); + // Channel ID: 1003 (I/O channel) + header.writeShort(1003); - // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - header.writeByte(0x70); + // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) + header.writeByte(0x70); - int length = buf.length + 26; + int length = buf.length + 26; - // User data length: (variable length field, LE) - header.writeVariableShort(length); + // User data length: (variable length field, LE) + header.writeVariableShort(length); - // Total length: (LE) - header.writeShortLE(length); + // Total length: (LE) + header.writeShortLE(length); - // PDU type: Confirm Active PDU (0x3), TS_PROTOCOL_VERSION (0x10) (LE) - header.writeShortLE(0x13); + // PDU type: Confirm Active PDU (0x3), TS_PROTOCOL_VERSION (0x10) (LE) + header.writeShortLE(0x13); - // PDU source: 1004 (LE) - header.writeShortLE(1004); + // PDU source: 1004 (LE) + header.writeShortLE(1004); - // Share ID, e.g. 0x000103ea (LE) - header.writeIntLE((int) state.serverShareId); + // Share ID, e.g. 0x000103ea (LE) + header.writeIntLE((int)state.serverShareId); - // Originator ID: 1002 (LE) - header.writeShortLE(1002); - return header; - } + // Originator ID: 1002 (LE) + header.writeShortLE(1002); + return header; + } - private void sendOtherRequredPackets() { - // Send sequence in bulk + private void sendOtherRequredPackets() { + // Send sequence in bulk - sendSynchronizePDU(); - sendControlPDUActionCooperate(); - sendControlPDUActionRequestControl(); - // sendBitmapCachePersistentListPDU(); - sendFontListPDU(); - } + sendSynchronizePDU(); + sendControlPDUActionCooperate(); + sendControlPDUActionRequestControl(); + // sendBitmapCachePersistentListPDU(); + sendFontListPDU(); + } - private void sendFontListPDU() { - { - int length = 1024; // Large enough - ByteBuffer buf = new ByteBuffer(length, true); + private void sendFontListPDU() { + { + int length = 1024; // Large enough + ByteBuffer buf = new ByteBuffer(length, true); - /* @formatter:off */ + /* @formatter:off */ buf.writeBytes(new byte[] { // MCS Send Data Request (byte)0x64, @@ -192,18 +191,18 @@ public class ClientConfirmActivePDU extends BaseElement { }); /* @formatter:on */ - // Trim buffer to actual length of data written - buf.trimAtCursor(); + // Trim buffer to actual length of data written + buf.trimAtCursor(); - pushDataToPad(STDOUT, buf); + pushDataToPad(STDOUT, buf); + } } - } - private void sendControlPDUActionRequestControl() { - int length = 1024; // Large enough - ByteBuffer buf = new ByteBuffer(length, true); + private void sendControlPDUActionRequestControl() { + int length = 1024; // Large enough + ByteBuffer buf = new ByteBuffer(length, true); - /* @formatter:off */ + /* @formatter:off */ buf.writeBytes(new byte[] { // MCS Send Data Request (byte)0x64, @@ -249,17 +248,17 @@ public class ClientConfirmActivePDU extends BaseElement { }); /* @formatter:on */ - // Trim buffer to actual length of data written - buf.trimAtCursor(); + // Trim buffer to actual length of data written + buf.trimAtCursor(); - pushDataToPad(STDOUT, buf); - } + pushDataToPad(STDOUT, buf); + } - private void sendControlPDUActionCooperate() { - int length = 1024; // Large enough - ByteBuffer buf = new ByteBuffer(length, true); + private void sendControlPDUActionCooperate() { + int length = 1024; // Large enough + ByteBuffer buf = new ByteBuffer(length, true); - /* @formatter:off */ + /* @formatter:off */ buf.writeBytes(new byte[] { // MCS Send Data Request (byte)0x64, @@ -304,15 +303,15 @@ public class ClientConfirmActivePDU extends BaseElement { }); /* @formatter:on */ - buf.trimAtCursor(); + buf.trimAtCursor(); - pushDataToPad(STDOUT, buf); - } + pushDataToPad(STDOUT, buf); + } - private void sendSynchronizePDU() { + private void sendSynchronizePDU() { - ByteBuffer buf = new ByteBuffer(1024, true); - /* @formatter:off */ + ByteBuffer buf = new ByteBuffer(1024, true); + /* @formatter:off */ buf.writeBytes(new byte[] { // MCS send data request (byte)0x64, @@ -356,478 +355,476 @@ public class ClientConfirmActivePDU extends BaseElement { (byte)0xea, (byte)0x03, }); /* @formatter:on */ - buf.trimAtCursor(); - pushDataToPad(STDOUT, buf); - } + buf.trimAtCursor(); + pushDataToPad(STDOUT, buf); + } - private void writeCapabilities(ByteBuffer buf) { - writeGeneralCS(buf); + private void writeCapabilities(ByteBuffer buf) { + writeGeneralCS(buf); - writeBitmapCS(buf); + writeBitmapCS(buf); - writeOrderCS(buf); + writeOrderCS(buf); - writeBitmapCache2CS(buf); + writeBitmapCache2CS(buf); - writeColorTableCacheCS(buf); + writeColorTableCacheCS(buf); - writeWindowActivationCS(buf); + writeWindowActivationCS(buf); - writeControlCS(buf); + writeControlCS(buf); - writePointerCS(buf); + writePointerCS(buf); - writeShareCS(buf); + writeShareCS(buf); - writeInputCS(buf); + writeInputCS(buf); - writeBrushCS(buf); + writeBrushCS(buf); - writeSoundCS(buf); + writeSoundCS(buf); - writeFontCS(buf); + writeFontCS(buf); - writeOffscreenBitmapCS(buf); + writeOffscreenBitmapCS(buf); - writeGlyphCacheCS(buf); - } + writeGlyphCacheCS(buf); + } - private void writeBrushCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Brush Capability Set (8 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240564.aspx - (byte) 0x0f, (byte) 0x00, // capability set type: CAPSTYPE_BRUSH (15, - // LE) - (byte) 0x08, (byte) 0x00, // length of capability set: 8 bytes (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // brushSupportLevel: + private void writeBrushCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Brush Capability Set (8 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240564.aspx + (byte)0x0f, (byte)0x00, // capability set type: CAPSTYPE_BRUSH (15, + // LE) + (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // brushSupportLevel: // BRUSH_DEFAULT // (0x0, LE) - }); - } + }); + } - private void writeInputCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Input Capability Set (88 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240563.aspx - (byte) 0x0d, - (byte) 0x00, // capability set type: CAPSTYPE_INPUT (13, LE) - (byte) 0x58, - (byte) 0x00, // length of capability set: 88 bytes (LE) - (byte) 0x35, - (byte) 0x00, // inputFlags: 0x0035 (LE), INPUT_FLAG_FASTPATH_INPUT2 - // (0x20), INPUT_FLAG_VKPACKET (0x10), INPUT_FLAG_MOUSEX - // (0x4), INPUT_FLAG_SCANCODES (0x1) - (byte) 0x00, - (byte) 0x00, // Padding 2 bytes - (byte) 0x09, - (byte) 0x04, - (byte) 0x00, - (byte) 0x00, // keyboardLayout: "US" keyboard layout (0x000409, LE) - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, // keyboardType: unknown (LE) - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, // keyboardSubType: unknown (LE) - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, - (byte) 0x00, // keyboardFunctionKey: unknown (LE) - // imeFileName: "", (64 bytes, including trailing NULL characters, UCS2) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + private void writeInputCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Input Capability Set (88 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240563.aspx + (byte)0x0d, + (byte)0x00, // capability set type: CAPSTYPE_INPUT (13, LE) + (byte)0x58, + (byte)0x00, // length of capability set: 88 bytes (LE) + (byte)0x35, + (byte)0x00, // inputFlags: 0x0035 (LE), INPUT_FLAG_FASTPATH_INPUT2 + // (0x20), INPUT_FLAG_VKPACKET (0x10), INPUT_FLAG_MOUSEX + // (0x4), INPUT_FLAG_SCANCODES (0x1) + (byte)0x00, + (byte)0x00, // Padding 2 bytes + (byte)0x09, + (byte)0x04, + (byte)0x00, + (byte)0x00, // keyboardLayout: "US" keyboard layout (0x000409, LE) + (byte)0x00, + (byte)0x00, + (byte)0x00, + (byte)0x00, // keyboardType: unknown (LE) + (byte)0x00, + (byte)0x00, + (byte)0x00, + (byte)0x00, // keyboardSubType: unknown (LE) + (byte)0x00, + (byte)0x00, + (byte)0x00, + (byte)0x00, // keyboardFunctionKey: unknown (LE) + // imeFileName: "", (64 bytes, including trailing NULL characters, UCS2) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - }); - } + }); + } - private void writeShareCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Share Capability Set (8 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240570.aspx - (byte) 0x09, (byte) 0x00, // capability set type: CAPSTYPE_SHARE (9, LE) - (byte) 0x08, (byte) 0x00, // length of capability set: 8 bytes (LE) - (byte) 0x00, (byte) 0x00, // nodeID (must be set to 0 by client): 0 (LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes (LE) + private void writeShareCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Share Capability Set (8 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240570.aspx + (byte)0x09, (byte)0x00, // capability set type: CAPSTYPE_SHARE (9, LE) + (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) + (byte)0x00, (byte)0x00, // nodeID (must be set to 0 by client): 0 (LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes (LE) - }); - } + }); + } - private void writePointerCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Pointer Capability Set (10 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240562.aspx - (byte) 0x08, (byte) 0x00, // capability set type: CAPSTYPE_POINTER (8, - // LE) - (byte) 0x0a, (byte) 0x00, // length of capability set: 10 bytes (LE) - (byte) 0x00, (byte) 0x00, // colorPointerFlag: FALSE (LE) - (byte) 0x00, (byte) 0x00, // colorPointerCacheSize: 0 (LE) - (byte) 0x14, (byte) 0x00, // pointerCacheSize: 20 (LE) + private void writePointerCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Pointer Capability Set (10 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240562.aspx + (byte)0x08, (byte)0x00, // capability set type: CAPSTYPE_POINTER (8, + // LE) + (byte)0x0a, (byte)0x00, // length of capability set: 10 bytes (LE) + (byte)0x00, (byte)0x00, // colorPointerFlag: FALSE (LE) + (byte)0x00, (byte)0x00, // colorPointerCacheSize: 0 (LE) + (byte)0x14, (byte)0x00, // pointerCacheSize: 20 (LE) - }); - } + }); + } - private void writeControlCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Control Capability Set (12 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240568.aspx - (byte) 0x05, (byte) 0x00, // capability set type: CAPSTYPE_ACTIVATION - // (7) - (byte) 0x0c, (byte) 0x00, // length of capability set: 12 bytes (LE) - (byte) 0x00, (byte) 0x00, // controlFlags (should be set to 0): 0 (LE) - (byte) 0x00, (byte) 0x00, // remoteDetachFlag (should be set to 0): 0 - // (LE) - (byte) 0x02, (byte) 0x00, // controlInterest (should be set to - // CONTROLPRIORITY_NEVER): - // CONTROLPRIORITY_NEVER (2) (LE) - (byte) 0x02, (byte) 0x00, // detachInterest (should be set to - // CONTROLPRIORITY_NEVER): - // CONTROLPRIORITY_NEVER (2) (LE) + private void writeControlCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Control Capability Set (12 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240568.aspx + (byte)0x05, (byte)0x00, // capability set type: CAPSTYPE_ACTIVATION + // (7) + (byte)0x0c, (byte)0x00, // length of capability set: 12 bytes (LE) + (byte)0x00, (byte)0x00, // controlFlags (should be set to 0): 0 (LE) + (byte)0x00, (byte)0x00, // remoteDetachFlag (should be set to 0): 0 + // (LE) + (byte)0x02, (byte)0x00, // controlInterest (should be set to + // CONTROLPRIORITY_NEVER): + // CONTROLPRIORITY_NEVER (2) (LE) + (byte)0x02, (byte)0x00, // detachInterest (should be set to + // CONTROLPRIORITY_NEVER): + // CONTROLPRIORITY_NEVER (2) (LE) - }); - } + }); + } - private void writeWindowActivationCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Window Activation Capability Set (12 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240569.aspx - (byte) 0x07, (byte) 0x00, // capability set type: CAPSTYPE_ACTIVATION - // (7) (LE) - (byte) 0x0c, (byte) 0x00, // length of capability set: 12 bytes (LE) - (byte) 0x00, (byte) 0x00, // helpKeyFlag (should be set to FALSE (0)): - // FALSE (0, LE) - (byte) 0x00, (byte) 0x00, // helpKeyIndexFlag (should be set to FALSE - // (0)): FALSE (0, LE) - (byte) 0x00, (byte) 0x00, // helpExtendedKeyFlag (should be set to FALSE - // (0)): FALSE (0, LE) - (byte) 0x00, (byte) 0x00, // windowManagerKeyFlag (should be set to - // FALSE (0)): FALSE (0, LE) + private void writeWindowActivationCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Window Activation Capability Set (12 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240569.aspx + (byte)0x07, (byte)0x00, // capability set type: CAPSTYPE_ACTIVATION + // (7) (LE) + (byte)0x0c, (byte)0x00, // length of capability set: 12 bytes (LE) + (byte)0x00, (byte)0x00, // helpKeyFlag (should be set to FALSE (0)): + // FALSE (0, LE) + (byte)0x00, (byte)0x00, // helpKeyIndexFlag (should be set to FALSE + // (0)): FALSE (0, LE) + (byte)0x00, (byte)0x00, // helpExtendedKeyFlag (should be set to FALSE + // (0)): FALSE (0, LE) + (byte)0x00, (byte)0x00, // windowManagerKeyFlag (should be set to + // FALSE (0)): FALSE (0, LE) - }); - } + }); + } - private void writeColorTableCacheCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { + private void writeColorTableCacheCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { - // - // Color Table Cache Capability Set (8 bytes), see - // http://msdn.microsoft.com/en-us/library/cc241564.aspx - (byte) 0x0a, (byte) 0x00, // capability set type: CAPSTYPE_COLORCACHE - // (10) (LE) - (byte) 0x08, (byte) 0x00, // length of capability set: 8 bytes (LE) - (byte) 0x06, (byte) 0x00, // Color table cache size (must be ignored - // during capability exchange and is assumed - // to be 0x0006): 6 (LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes + // + // Color Table Cache Capability Set (8 bytes), see + // http://msdn.microsoft.com/en-us/library/cc241564.aspx + (byte)0x0a, (byte)0x00, // capability set type: CAPSTYPE_COLORCACHE + // (10) (LE) + (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) + (byte)0x06, (byte)0x00, // Color table cache size (must be ignored + // during capability exchange and is assumed + // to be 0x0006): 6 (LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes - }); - } + }); + } - private void writeBitmapCache2CS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Bitmap Cache Rev. 2 Capability Set (40 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240560.aspx - (byte) 0x13, (byte) 0x00, // capability set type: - // CAPSTYPE_BITMAPCACHE_REV2 (19) (LE) - (byte) 0x28, (byte) 0x00, // length of capability set: 40 bytes (LE) - (byte) 0x00, (byte) 0x00, // Cache flags: 0 (LE) - (byte) 0x00, // Padding 1 byte - (byte) 0x00, // Number of cell caches: 0 - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Bitmap cache0 + private void writeBitmapCache2CS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Bitmap Cache Rev. 2 Capability Set (40 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240560.aspx + (byte)0x13, (byte)0x00, // capability set type: + // CAPSTYPE_BITMAPCACHE_REV2 (19) (LE) + (byte)0x28, (byte)0x00, // length of capability set: 40 bytes (LE) + (byte)0x00, (byte)0x00, // Cache flags: 0 (LE) + (byte)0x00, // Padding 1 byte + (byte)0x00, // Number of cell caches: 0 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache0 // cell info: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Bitmap cache1 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache1 // cell info: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Bitmap cache2 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache2 // cell info: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Bitmap cache3 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache3 // cell info: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Bitmap cache4 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache4 // cell info: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Padding 12 bytes - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Padding - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Padding - }); - } + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding 12 bytes + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding + }); + } - private void writeGeneralCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // Capabilities, see - // http://msdn.microsoft.com/en-us/library/cc240486.aspx + private void writeGeneralCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // Capabilities, see + // http://msdn.microsoft.com/en-us/library/cc240486.aspx - // - // General capability set (24 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240549.aspx - (byte) 0x01, (byte) 0x00, // capability set type: CAPSTYPE_GENERAL (1) - // (LE) - (byte) 0x18, (byte) 0x00, // length of capability set: 24 bytes (LE) - (byte) 0x01, (byte) 0x00, // TS_OSMAJORTYPE_WINDOWS (1) (LE) - (byte) 0x03, (byte) 0x00, // TS_OSMINORTYPE_WINDOWS_NT (3) (LE) - (byte) 0x00, (byte) 0x02, // TS_CAPS_PROTOCOLVERSION (0x0200) (LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes - (byte) 0x00, (byte) 0x00, // generalCompressionTypes: 0 (LE) + // + // General capability set (24 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240549.aspx + (byte)0x01, (byte)0x00, // capability set type: CAPSTYPE_GENERAL (1) + // (LE) + (byte)0x18, (byte)0x00, // length of capability set: 24 bytes (LE) + (byte)0x01, (byte)0x00, // TS_OSMAJORTYPE_WINDOWS (1) (LE) + (byte)0x03, (byte)0x00, // TS_OSMINORTYPE_WINDOWS_NT (3) (LE) + (byte)0x00, (byte)0x02, // TS_CAPS_PROTOCOLVERSION (0x0200) (LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes + (byte)0x00, (byte)0x00, // generalCompressionTypes: 0 (LE) - // Extra flags: 0x040d (LE) - // FastPathOutput: (...............1) Advertiser supports fast-path - // output - // ShadowCompression: (..............0.) Advertiser NOT supports shadow - // compression - // LongLengthCredentials: (.............1..) Advertiser supports - // long-length credentials for the user name, password, or domain name - // SessionAutoreconnection: (............1...) Advertiser supports - // session auto-reconnection - // ImprovedEncryptionChecksum: (...........0....) Client and server NOT - // support improved encryption checksum - // Reserved1: (......00000.....) - // CompressedBitMapDataFlag: (.....1..........) No 8-UINT8 header is - // present for compressed bitmap data - // Reserved2: (00000...........) - (byte) 0x0d, (byte) 0x04, + // Extra flags: 0x040d (LE) + // FastPathOutput: (...............1) Advertiser supports fast-path + // output + // ShadowCompression: (..............0.) Advertiser NOT supports shadow + // compression + // LongLengthCredentials: (.............1..) Advertiser supports + // long-length credentials for the user name, password, or domain name + // SessionAutoreconnection: (............1...) Advertiser supports + // session auto-reconnection + // ImprovedEncryptionChecksum: (...........0....) Client and server NOT + // support improved encryption checksum + // Reserved1: (......00000.....) + // CompressedBitMapDataFlag: (.....1..........) No 8-UINT8 header is + // present for compressed bitmap data + // Reserved2: (00000...........) + (byte)0x0d, (byte)0x04, - (byte) 0x00, (byte) 0x00, // updateCapabilityFlag: 0 (LE) - (byte) 0x00, (byte) 0x00, // remoteUnshareFlag: 0 (LE) - (byte) 0x00, (byte) 0x00, // generalCompressionLevel: 0 (LE) - (byte) 0x00, // refreshRectSupport: FALSE (0) - (byte) 0x00, // suppressOutputSupport: FALSE (0) + (byte)0x00, (byte)0x00, // updateCapabilityFlag: 0 (LE) + (byte)0x00, (byte)0x00, // remoteUnshareFlag: 0 (LE) + (byte)0x00, (byte)0x00, // generalCompressionLevel: 0 (LE) + (byte)0x00, // refreshRectSupport: FALSE (0) + (byte)0x00, // suppressOutputSupport: FALSE (0) - }); - } + }); + } - private void writeBitmapCS(ByteBuffer buf) { - // Bitmap capability set (28 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240554.aspx + private void writeBitmapCS(ByteBuffer buf) { + // Bitmap capability set (28 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240554.aspx - numberCapabilities++; + numberCapabilities++; - // Capability set type: CAPSTYPE_BITMAP (2) (LE) - buf.writeShortLE(CAPSTYPE_BITMAP); + // Capability set type: CAPSTYPE_BITMAP (2) (LE) + buf.writeShortLE(CAPSTYPE_BITMAP); - // Length of capability set: 28 bytes (LE) - buf.writeShortLE(28); + // Length of capability set: 28 bytes (LE) + buf.writeShortLE(28); - // preferredBitsPerPixel: 16 bpp (LE) - buf.writeShortLE(prefferedBitsPerPixel); + // preferredBitsPerPixel: 16 bpp (LE) + buf.writeShortLE(prefferedBitsPerPixel); - // receive1BitPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) - buf.writeShortLE(1); + // receive1BitPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) + buf.writeShortLE(1); - // receive4BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) - buf.writeShortLE(1); + // receive4BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) + buf.writeShortLE(1); - // receive8BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) - buf.writeShortLE(1); + // receive8BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) + buf.writeShortLE(1); - // Desktop width and height (LE) - buf.writeShortLE(screen.getFramebufferWidth()); - buf.writeShortLE(screen.getFramebufferHeight()); + // Desktop width and height (LE) + buf.writeShortLE(screen.getFramebufferWidth()); + buf.writeShortLE(screen.getFramebufferHeight()); - // Padding 2 bytes - buf.writeShortLE(0); + // Padding 2 bytes + buf.writeShortLE(0); - // desktopResizeFlag (LE) - buf.writeShortLE((desktopResize )?1:0); + // desktopResizeFlag (LE) + buf.writeShortLE((desktopResize) ? 1 : 0); - buf.writeBytes(new byte[] { - (byte) 0x01, (byte) 0x00, // bitmapCompressionFlag (must be set to TRUE - // (0x1)): TRUE (0x1) (LE) - (byte) 0x00, // highColorFlags (field is ignored and SHOULD be set to - // zero): 0 - (byte) 0x01, // drawingFlags: 0x1 TODO: padding, why 0x1 ??? - (byte) 0x01, (byte) 0x00, // multipleRectangleSupport: TRUE (LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes + buf.writeBytes(new byte[] {(byte)0x01, (byte)0x00, // bitmapCompressionFlag (must be set to TRUE + // (0x1)): TRUE (0x1) (LE) + (byte)0x00, // highColorFlags (field is ignored and SHOULD be set to + // zero): 0 + (byte)0x01, // drawingFlags: 0x1 TODO: padding, why 0x1 ??? + (byte)0x01, (byte)0x00, // multipleRectangleSupport: TRUE (LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes - }); - } + }); + } - private void writeOrderCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Order Capability Set (88 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240556.aspx - (byte) 0x03, - (byte) 0x00, // capability set type: CAPSTYPE_ORDER (3) (LE) - (byte) 0x58, - (byte) 0x00, // length of capability set: 88 bytes (LE) - // terminalDescriptor = "" (16 bytes, UCS2) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // pad4octetsA - (byte) 0x01, (byte) 0x00, // desktopSaveXGranularity (ignored): 1 (LE) - (byte) 0x14, (byte) 0x00, // desktopSaveYGranularity (ignored): 20 (LE) - (byte) 0x00, (byte) 0x00, // pad2octetsA (ignored) - (byte) 0x01, (byte) 0x00, // maximumOrderLevel: ORD_LEVEL_1_ORDERS (1) - (byte) 0x00, (byte) 0x00, // number of fonts (ignored): 0 - (byte) 0x4a, (byte) 0x00, // orderFlags = 0x004a (LE), - // SOLIDPATTERNBRUSHONLY (0x40), - // ZEROBOUNDSDELTASSUPPORT (0x8, MUST), - // NEGOTIATEORDERSUPPORT (0x2, MUST) - // Order support: 32 bytes (no primary drawing orders are supported, so - // this array MUST be initialized to all zeros, use 0x01 for TRUE). - (byte) 0x00, // TS_NEG_DSTBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_PATBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_SCRBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MEMBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MEM3BLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_ATEXTOUT_INDEX: FALSE - (byte) 0x00, // TS_NEG_AEXTTEXTOUT_INDEX: FALSE - (byte) 0x00, // TS_NEG_DRAWNINEGRID_INDEX: FALSE - (byte) 0x00, // TS_NEG_LINETO_INDEX: FALSE - (byte) 0x00, // TS_NEG_MULTI_DRAWNINEGRID_INDEX: FALSE - (byte) 0x00, // TS_NEG_OPAQUERECT_INDEX: FALSE - (byte) 0x00, // TS_NEG_SAVEBITMAP_INDEX: FALSE - (byte) 0x00, // TS_NEG_WTEXTOUT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MEMBLT_R2_INDEX: FALSE - (byte) 0x00, // TS_NEG_MEM3BLT_R2_INDEX: FALSE - (byte) 0x00, // TS_NEG_MULTIDSTBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MULTIPATBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MULTISCRBLT_INDEX: FALSE - (byte) 0x00, // TS_NEG_MULTIOPAQUERECT_INDEX: FALSE - (byte) 0x00, // TS_NEG_FAST_INDEX_INDEX: FALSE - (byte) 0x00, // TS_NEG_POLYGON_SC_INDEX: FALSE - (byte) 0x00, // TS_NEG_POLYGON_CB_INDEX: FALSE - (byte) 0x00, // TS_NEG_POLYLINE_INDEX: TRUE - (byte) 0x00, // Unused: 0 - (byte) 0x00, // TS_NEG_FAST_GLYPH_INDEX: FALSE - (byte) 0x00, // TS_NEG_ELLIPSE_SC_INDEX: FALSE - (byte) 0x00, // TS_NEG_ELLIPSE_CB_INDEX: FALSE - (byte) 0x00, // TS_NEG_INDEX_INDEX: FALSE - (byte) 0x00, // TS_NEG_WEXTTEXTOUT_INDEX: FALSE - (byte) 0x00, // TS_NEG_WLONGTEXTOUT_INDEX: FALSE - (byte) 0x00, // TS_NEG_WLONGEXTTEXTOUT_INDEX: FALSE - (byte) 0x00, // Unused: 0 - (byte) 0x00, (byte) 0x00, // Text flags (ignored): 0 (LE) - (byte) 0x00, (byte) 0x00, // Order support extra flags: 0 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Padding 4 bytes - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Desktop save size + private void writeOrderCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Order Capability Set (88 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240556.aspx + (byte)0x03, + (byte)0x00, // capability set type: CAPSTYPE_ORDER (3) (LE) + (byte)0x58, + (byte)0x00, // length of capability set: 88 bytes (LE) + // terminalDescriptor = "" (16 bytes, UCS2) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // pad4octetsA + (byte)0x01, (byte)0x00, // desktopSaveXGranularity (ignored): 1 (LE) + (byte)0x14, (byte)0x00, // desktopSaveYGranularity (ignored): 20 (LE) + (byte)0x00, (byte)0x00, // pad2octetsA (ignored) + (byte)0x01, (byte)0x00, // maximumOrderLevel: ORD_LEVEL_1_ORDERS (1) + (byte)0x00, (byte)0x00, // number of fonts (ignored): 0 + (byte)0x4a, (byte)0x00, // orderFlags = 0x004a (LE), + // SOLIDPATTERNBRUSHONLY (0x40), + // ZEROBOUNDSDELTASSUPPORT (0x8, MUST), + // NEGOTIATEORDERSUPPORT (0x2, MUST) + // Order support: 32 bytes (no primary drawing orders are supported, so + // this array MUST be initialized to all zeros, use 0x01 for TRUE). + (byte)0x00, // TS_NEG_DSTBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_PATBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_SCRBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MEMBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MEM3BLT_INDEX: FALSE + (byte)0x00, // TS_NEG_ATEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_AEXTTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_DRAWNINEGRID_INDEX: FALSE + (byte)0x00, // TS_NEG_LINETO_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTI_DRAWNINEGRID_INDEX: FALSE + (byte)0x00, // TS_NEG_OPAQUERECT_INDEX: FALSE + (byte)0x00, // TS_NEG_SAVEBITMAP_INDEX: FALSE + (byte)0x00, // TS_NEG_WTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_MEMBLT_R2_INDEX: FALSE + (byte)0x00, // TS_NEG_MEM3BLT_R2_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTIDSTBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTIPATBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTISCRBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTIOPAQUERECT_INDEX: FALSE + (byte)0x00, // TS_NEG_FAST_INDEX_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYGON_SC_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYGON_CB_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYLINE_INDEX: TRUE + (byte)0x00, // Unused: 0 + (byte)0x00, // TS_NEG_FAST_GLYPH_INDEX: FALSE + (byte)0x00, // TS_NEG_ELLIPSE_SC_INDEX: FALSE + (byte)0x00, // TS_NEG_ELLIPSE_CB_INDEX: FALSE + (byte)0x00, // TS_NEG_INDEX_INDEX: FALSE + (byte)0x00, // TS_NEG_WEXTTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_WLONGTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_WLONGEXTTEXTOUT_INDEX: FALSE + (byte)0x00, // Unused: 0 + (byte)0x00, (byte)0x00, // Text flags (ignored): 0 (LE) + (byte)0x00, (byte)0x00, // Order support extra flags: 0 (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding 4 bytes + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Desktop save size // (ignored): 0 // (assumed to be // 230400 bytes // (480*480, // 0x38400, LE)) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes - (byte) 0x00, (byte) 0x00, // Padding 2 bytes - (byte) 0xe4, (byte) 0x04, // Text ANSI Code Page: 1252, ANSI - Latin I - // (0x04e4, LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes + (byte)0x00, (byte)0x00, // Padding 2 bytes + (byte)0x00, (byte)0x00, // Padding 2 bytes + (byte)0xe4, (byte)0x04, // Text ANSI Code Page: 1252, ANSI - Latin I + // (0x04e4, LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes - }); - } + }); + } - private void writeSoundCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Sound Capability Set (8 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240552.aspx - (byte) 0x0c, (byte) 0x00, // capability set type: CAPSTYPE_SOUND (12, - // LE) - (byte) 0x08, (byte) 0x00, // length of capability set: 8 bytes (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // soundFlags: + private void writeSoundCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Sound Capability Set (8 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240552.aspx + (byte)0x0c, (byte)0x00, // capability set type: CAPSTYPE_SOUND (12, + // LE) + (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // soundFlags: // 0x0000 (LE) // // SOUND_FLAG_BEEPS // (0x1) - }); - } + }); + } - private void writeFontCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Font Capability Set (8 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240571.aspx - (byte) 0x0e, (byte) 0x00, (byte) 0x08, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, + private void writeFontCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Font Capability Set (8 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240571.aspx + (byte)0x0e, (byte)0x00, (byte)0x08, (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, - }); - } + }); + } - private void writeOffscreenBitmapCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Offscreen Bitmap Cache Capability Set (12 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240550.aspx - (byte) 0x11, (byte) 0x00, // capability set type: - // CAPSTYPE_OFFSCREENCACHE (17, LE) - (byte) 0x0c, (byte) 0x00, // length of capability set: 12 bytes (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, // offscreenSupportLevel: + private void writeOffscreenBitmapCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Offscreen Bitmap Cache Capability Set (12 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240550.aspx + (byte)0x11, (byte)0x00, // capability set type: + // CAPSTYPE_OFFSCREENCACHE (17, LE) + (byte)0x0c, (byte)0x00, // length of capability set: 12 bytes (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // offscreenSupportLevel: // FALSE (LE) - (byte) 0x00, (byte) 0x00, // offscreenCacheSize: 0 (LE) - (byte) 0x00, (byte) 0x00, // offscreenCacheEntries: 0 (LE) + (byte)0x00, (byte)0x00, // offscreenCacheSize: 0 (LE) + (byte)0x00, (byte)0x00, // offscreenCacheEntries: 0 (LE) - }); - } + }); + } - private void writeGlyphCacheCS(ByteBuffer buf) { - numberCapabilities++; - buf.writeBytes(new byte[] { - // - // Glyph Cache Capability Set (52 bytes), see - // http://msdn.microsoft.com/en-us/library/cc240565.aspx - (byte) 0x10, (byte) 0x00, // capability set type: - // CAPSTYPE_OFFSCREENCACHE (16, LE) - (byte) 0x34, (byte) 0x00, // length of capability set: 52 bytes (LE) - // Glyph Cache (40 bytes) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x04, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x04, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x08, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x08, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x10, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x20, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x40, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x80, (byte) 0x00, // CacheMaximumCellSize: 4 (LE) - (byte) 0xfe, (byte) 0x00, // CacheEntries: 254 (LE) - (byte) 0x00, (byte) 0x01, // CacheMaximumCellSize: 4 (LE) - (byte) 0x40, (byte) 0x00, // CacheEntries: 64 (LE) - (byte) 0x00, (byte) 0x08, // CacheMaximumCellSize: 2048 (LE) - // FragCache - (byte) 0x00, (byte) 0x01, // CacheEntries: 256 (LE) - (byte) 0x00, (byte) 0x01, // CacheMaximumCellSize: 256 (LE) - // - (byte) 0x00, (byte) 0x00, // GlyphSupportLevel: GLYPH_SUPPORT_NONE (0x0, - // LE) - (byte) 0x00, (byte) 0x00, // Padding 2 bytes - }); - } + private void writeGlyphCacheCS(ByteBuffer buf) { + numberCapabilities++; + buf.writeBytes(new byte[] { + // + // Glyph Cache Capability Set (52 bytes), see + // http://msdn.microsoft.com/en-us/library/cc240565.aspx + (byte)0x10, (byte)0x00, // capability set type: + // CAPSTYPE_OFFSCREENCACHE (16, LE) + (byte)0x34, (byte)0x00, // length of capability set: 52 bytes (LE) + // Glyph Cache (40 bytes) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x04, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x04, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x08, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x08, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x10, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x20, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x40, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x80, (byte)0x00, // CacheMaximumCellSize: 4 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0x00, (byte)0x01, // CacheMaximumCellSize: 4 (LE) + (byte)0x40, (byte)0x00, // CacheEntries: 64 (LE) + (byte)0x00, (byte)0x08, // CacheMaximumCellSize: 2048 (LE) + // FragCache + (byte)0x00, (byte)0x01, // CacheEntries: 256 (LE) + (byte)0x00, (byte)0x01, // CacheMaximumCellSize: 256 (LE) + // + (byte)0x00, (byte)0x00, // GlyphSupportLevel: GLYPH_SUPPORT_NONE (0x0, + // LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes + }); + } - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { // MCS Send Data Request (byte)0x64, @@ -1113,20 +1110,20 @@ public class ClientConfirmActivePDU extends BaseElement { }; /* @formatter:on */ - RdpState rdpState = new RdpState(); - ScreenDescription screenDescription = new ScreenDescription(); - screenDescription.setFramebufferSize(1024, 768); + RdpState rdpState = new RdpState(); + ScreenDescription screenDescription = new ScreenDescription(); + screenDescription.setFramebufferSize(1024, 768); - rdpState.serverShareId = 0x000103ea; + rdpState.serverShareId = 0x000103ea; - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {})); - Element confirm_active = new ClientConfirmActivePDU("confirm_active", screenDescription, rdpState); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {})); + Element confirm_active = new ClientConfirmActivePDU("confirm_active", screenDescription, rdpState); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, confirm_active, sink); - pipeline.link("source", "confirm_active", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, confirm_active, sink); + pipeline.link("source", "confirm_active", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientFastPathPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientFastPathPDU.java index 4c7dcfc50b7..39dc81a2f9c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientFastPathPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientFastPathPDU.java @@ -25,31 +25,31 @@ import streamer.Link; */ public class ClientFastPathPDU extends BaseElement { - public ClientFastPathPDU(String id) { - super(id); - } + public ClientFastPathPDU(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (buf.length > 32767-3) - throw new RuntimeException("Packet is too long: " + buf + "."); + if (buf.length > 32767 - 3) + throw new RuntimeException("Packet is too long: " + buf + "."); - ByteBuffer data = new ByteBuffer(6); + ByteBuffer data = new ByteBuffer(6); - // FastPath, 1 event, no checksum, not encrypted - data.writeByte(0x4); + // FastPath, 1 event, no checksum, not encrypted + data.writeByte(0x4); - // Length of full packet, including length field, in network order. - // Topmost bit of first byte indicates that field has 2 bytes - data.writeShort((1 + 2 + buf.length) | 0x8000); - data.trimAtCursor(); + // Length of full packet, including length field, in network order. + // Topmost bit of first byte indicates that field has 2 bytes + data.writeShort((1 + 2 + buf.length) | 0x8000); + data.trimAtCursor(); - buf.prepend(data); + buf.prepend(data); - pushDataToAllOuts(buf); - } + pushDataToAllOuts(buf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java index 4410f70804f..12692840906 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java @@ -30,232 +30,231 @@ import streamer.PipelineImpl; */ public class ClientInfoPDU extends OneTimeSwitch { - public static final int INFO_MOUSE = 0x1; - public static final int INFO_DISABLECTRLALTDEL = 0x2; - public static final int INFO_UNICODE = 0x10; + public static final int INFO_MOUSE = 0x1; + public static final int INFO_DISABLECTRLALTDEL = 0x2; + public static final int INFO_UNICODE = 0x10; - public static final int INFO_MAXIMIZESHELL = 0x20; - public static final int INFO_LOGONNOTIFY = 0x40; - public static final int INFO_ENABLEWINDOWSKEY = 0x100; - public static final int INFO_MOUSE_HAS_WHEEL = 0x00020000; - public static final int INFO_NOAUDIOPLAYBACK = 0x00080000; + public static final int INFO_MAXIMIZESHELL = 0x20; + public static final int INFO_LOGONNOTIFY = 0x40; + public static final int INFO_ENABLEWINDOWSKEY = 0x100; + public static final int INFO_MOUSE_HAS_WHEEL = 0x00020000; + public static final int INFO_NOAUDIOPLAYBACK = 0x00080000; - public static final int PERF_DISABLE_WALLPAPER = 0x1; - public static final int PERF_DISABLE_FULLWINDOWDRAG = 0x2; - public static final int PERF_DISABLE_MENUANIMATIONS = 0x4; + public static final int PERF_DISABLE_WALLPAPER = 0x1; + public static final int PERF_DISABLE_FULLWINDOWDRAG = 0x2; + public static final int PERF_DISABLE_MENUANIMATIONS = 0x4; - protected byte[] userName = "".getBytes(RdpConstants.CHARSET_16); - protected byte[] password = "".getBytes(RdpConstants.CHARSET_16); // No effect - protected byte[] alternateShell = "".getBytes(RdpConstants.CHARSET_16); - protected byte[] domain = "".getBytes(RdpConstants.CHARSET_16); - protected byte[] workingDir = "".getBytes(RdpConstants.CHARSET_16); - protected byte[] clientAddress = "192.168.0.100".getBytes(RdpConstants.CHARSET_16); - protected byte[] clientDir = "C:\\Windows\\System32\\mstscax.dll".getBytes(RdpConstants.CHARSET_16); + protected byte[] userName = "".getBytes(RdpConstants.CHARSET_16); + protected byte[] password = "".getBytes(RdpConstants.CHARSET_16); // No effect + protected byte[] alternateShell = "".getBytes(RdpConstants.CHARSET_16); + protected byte[] domain = "".getBytes(RdpConstants.CHARSET_16); + protected byte[] workingDir = "".getBytes(RdpConstants.CHARSET_16); + protected byte[] clientAddress = "192.168.0.100".getBytes(RdpConstants.CHARSET_16); + protected byte[] clientDir = "C:\\Windows\\System32\\mstscax.dll".getBytes(RdpConstants.CHARSET_16); - protected String standardTimeZoneName = "EET, Standard Time"; - protected String daylightTimeZoneName = "EET, Summer Time"; - protected int standardTimeZoneBias = 0; /* in minutes */ - protected int daylightTimeZoneBias = 60; /* in minutes */ + protected String standardTimeZoneName = "EET, Standard Time"; + protected String daylightTimeZoneName = "EET, Summer Time"; + protected int standardTimeZoneBias = 0; /* in minutes */ + protected int daylightTimeZoneBias = 60; /* in minutes */ - public ClientInfoPDU(String id, String userName) { - super(id); - this.userName = userName.getBytes(RdpConstants.CHARSET_16); - } + public ClientInfoPDU(String id, String userName) { + super(id); + this.userName = userName.getBytes(RdpConstants.CHARSET_16); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - // Length of packet - ByteBuffer buf = new ByteBuffer(1024, true); + // Length of packet + ByteBuffer buf = new ByteBuffer(1024, true); - // MCS Send Data Request PDU - buf.writeByte(0x64); + // MCS Send Data Request PDU + buf.writeByte(0x64); - // Initiator: 0x03 + 1001 = 1004 - buf.writeShort(3); + // Initiator: 0x03 + 1001 = 1004 + buf.writeShort(3); - // Channel ID: 1003 - buf.writeShort(1003); + // Channel ID: 1003 + buf.writeShort(1003); - // Data priority: high, segmentation: begin | end (0x40 | 0x20 | 0x10 = 0x70) - buf.writeByte(0x70); + // Data priority: high, segmentation: begin | end (0x40 | 0x20 | 0x10 = 0x70) + buf.writeByte(0x70); - // User data length: (variable length field) - int length=224+userName.length + password.length+alternateShell.length+domain.length+workingDir.length+clientAddress.length+clientDir.length; - buf.writeShort(length | 0x8000); + // User data length: (variable length field) + int length = 224 + userName.length + password.length + alternateShell.length + domain.length + workingDir.length + clientAddress.length + clientDir.length; + buf.writeShort(length | 0x8000); - // Flags: SEC_INFO_PKT (0x4000) - buf.writeShort(0x4000); + // Flags: SEC_INFO_PKT (0x4000) + buf.writeShort(0x4000); - // TS_SECURITY_HEADER::flagsHi - ignored - buf.writeShort(0x0000); + // TS_SECURITY_HEADER::flagsHi - ignored + buf.writeShort(0x0000); - // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) - buf.writeIntLE(0x0000); + // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) + buf.writeIntLE(0x0000); - // Flags - buf.writeIntLE(INFO_MOUSE | INFO_DISABLECTRLALTDEL | INFO_UNICODE | - INFO_MAXIMIZESHELL | INFO_LOGONNOTIFY | INFO_ENABLEWINDOWSKEY | - INFO_MOUSE_HAS_WHEEL | INFO_NOAUDIOPLAYBACK ); + // Flags + buf.writeIntLE(INFO_MOUSE | INFO_DISABLECTRLALTDEL | INFO_UNICODE | INFO_MAXIMIZESHELL | INFO_LOGONNOTIFY | INFO_ENABLEWINDOWSKEY | INFO_MOUSE_HAS_WHEEL | + INFO_NOAUDIOPLAYBACK); - // - // Lengths - // + // + // Lengths + // - // cbDomain length: 0 bytes (LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(domain.length); + // cbDomain length: 0 bytes (LE) (NOT including size of mandatory NULL terminator) + buf.writeShortLE(domain.length); - // cbUserName length: 16 bytes (0x10, LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(userName.length); + // cbUserName length: 16 bytes (0x10, LE) (NOT including size of mandatory NULL terminator) + buf.writeShortLE(userName.length); - // cbPassword length: (LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(password.length); + // cbPassword length: (LE) (NOT including size of mandatory NULL terminator) + buf.writeShortLE(password.length); - // cbAlternateShell: (LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(alternateShell.length); + // cbAlternateShell: (LE) (NOT including size of mandatory NULL terminator) + buf.writeShortLE(alternateShell.length); - // cbWorkingDir: (LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(workingDir.length); + // cbWorkingDir: (LE) (NOT including size of mandatory NULL terminator) + buf.writeShortLE(workingDir.length); - // - // Values - // + // + // Values + // - // Domain: (UCS2), see cbDomain - buf.writeBytes(domain); - buf.writeShort(0); + // Domain: (UCS2), see cbDomain + buf.writeBytes(domain); + buf.writeShort(0); - // User name: (UCS2), see cbUserName - buf.writeBytes(userName); - buf.writeShort(0); + // User name: (UCS2), see cbUserName + buf.writeBytes(userName); + buf.writeShort(0); - // Password: (UCS2), see cbPassword - buf.writeBytes(password); - buf.writeShort(0); + // Password: (UCS2), see cbPassword + buf.writeBytes(password); + buf.writeShort(0); - // Alternate shell: (UCS2), see cbAlternateShell - buf.writeBytes(alternateShell); - buf.writeShort(0); + // Alternate shell: (UCS2), see cbAlternateShell + buf.writeBytes(alternateShell); + buf.writeShort(0); - // Working directory: (UCS2), see cbWorkingDir - buf.writeBytes(workingDir); - buf.writeShort(0); + // Working directory: (UCS2), see cbWorkingDir + buf.writeBytes(workingDir); + buf.writeShort(0); - // Client address family: 2 (AF_INET, LE) - buf.writeShortLE(2); + // Client address family: 2 (AF_INET, LE) + buf.writeShortLE(2); - // cbClientAddress: ( LE) (including the size of the mandatory NULL terminator) - buf.writeShortLE(clientAddress.length+2); + // cbClientAddress: ( LE) (including the size of the mandatory NULL terminator) + buf.writeShortLE(clientAddress.length + 2); - // Client address: (UCS2) - buf.writeBytes(clientAddress); - buf.writeShort(0); + // Client address: (UCS2) + buf.writeBytes(clientAddress); + buf.writeShort(0); - // cbClientDir: 64 bytes (0x40, LE) (including the size of the mandatory NULL terminator) - buf.writeShortLE(clientDir.length+2); + // cbClientDir: 64 bytes (0x40, LE) (including the size of the mandatory NULL terminator) + buf.writeShortLE(clientDir.length + 2); - // Client directory: (UCS2) - buf.writeBytes(clientDir); - buf.writeShort(0); + // Client directory: (UCS2) + buf.writeBytes(clientDir); + buf.writeShort(0); - // - // Client time zone: - // + // + // Client time zone: + // - // Bias: 0 minutes (LE) - buf.writeIntLE(0); + // Bias: 0 minutes (LE) + buf.writeIntLE(0); - // Standard name: "EET, Standard Time" (fixed string: 64 bytes, UCS2) - buf.writeFixedString(62, standardTimeZoneName, RdpConstants.CHARSET_16); - buf.writeShort(0); + // Standard name: "EET, Standard Time" (fixed string: 64 bytes, UCS2) + buf.writeFixedString(62, standardTimeZoneName, RdpConstants.CHARSET_16); + buf.writeShort(0); - // Standard date - buf.writeBytes(new byte[] { - // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMonth: unknown (LE) - (byte) 0x00, (byte) 0x00, - // wDayOfWeek: Sunday (LE) - (byte) 0x00, (byte) 0x00, - // wDay: unknown (LE) - (byte) 0x00, (byte) 0x00, - // wHour: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMinute: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wSecond: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMilliseconds: 0 - (byte) 0x00, (byte) 0x00, + // Standard date + buf.writeBytes(new byte[] { + // wYear: 0 (LE) + (byte)0x00, (byte)0x00, + // wMonth: unknown (LE) + (byte)0x00, (byte)0x00, + // wDayOfWeek: Sunday (LE) + (byte)0x00, (byte)0x00, + // wDay: unknown (LE) + (byte)0x00, (byte)0x00, + // wHour: 0 (LE) + (byte)0x00, (byte)0x00, + // wMinute: 0 (LE) + (byte)0x00, (byte)0x00, + // wSecond: 0 (LE) + (byte)0x00, (byte)0x00, + // wMilliseconds: 0 + (byte)0x00, (byte)0x00, - }); + }); - // StandardBias: 0 minutes (LE) - buf.writeIntLE(standardTimeZoneBias); + // StandardBias: 0 minutes (LE) + buf.writeIntLE(standardTimeZoneBias); - // Daylight name: "EET, Summer Time" (fixed string: 64 bytes, UCS2) - buf.writeFixedString(62, daylightTimeZoneName, RdpConstants.CHARSET_16); - buf.writeShort(0); + // Daylight name: "EET, Summer Time" (fixed string: 64 bytes, UCS2) + buf.writeFixedString(62, daylightTimeZoneName, RdpConstants.CHARSET_16); + buf.writeShort(0); - // Daylight date - buf.writeBytes(new byte[] { - // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMonth: unknown (LE) - (byte) 0x00, (byte) 0x00, - // wDayOfWeek: Sunday (LE) - (byte) 0x00, (byte) 0x00, - // wDay: unknown (LE) - (byte) 0x00, (byte) 0x00, - // wHour: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMinute: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wSecond: 0 (LE) - (byte) 0x00, (byte) 0x00, - // wMilliseconds: 0 - (byte) 0x00, (byte) 0x00, + // Daylight date + buf.writeBytes(new byte[] { + // wYear: 0 (LE) + (byte)0x00, (byte)0x00, + // wMonth: unknown (LE) + (byte)0x00, (byte)0x00, + // wDayOfWeek: Sunday (LE) + (byte)0x00, (byte)0x00, + // wDay: unknown (LE) + (byte)0x00, (byte)0x00, + // wHour: 0 (LE) + (byte)0x00, (byte)0x00, + // wMinute: 0 (LE) + (byte)0x00, (byte)0x00, + // wSecond: 0 (LE) + (byte)0x00, (byte)0x00, + // wMilliseconds: 0 + (byte)0x00, (byte)0x00, - }); + }); - // Daylight bias: 60 minutes (LE) - buf.writeIntLE(daylightTimeZoneBias); + // Daylight bias: 60 minutes (LE) + buf.writeIntLE(daylightTimeZoneBias); - // Client session ID: 0x00000000 (LE) - buf.writeIntLE(0); + // Client session ID: 0x00000000 (LE) + buf.writeIntLE(0); - // Performance flags: 0x7 (LE) = PERF_DISABLE_WALLPAPER (0x1), PERF_DISABLE_FULLWINDOWDRAG (0x2), PERF_DISABLE_MENUANIMATIONS (0x4) - buf.writeIntLE(PERF_DISABLE_WALLPAPER | PERF_DISABLE_FULLWINDOWDRAG | PERF_DISABLE_MENUANIMATIONS); + // Performance flags: 0x7 (LE) = PERF_DISABLE_WALLPAPER (0x1), PERF_DISABLE_FULLWINDOWDRAG (0x2), PERF_DISABLE_MENUANIMATIONS (0x4) + buf.writeIntLE(PERF_DISABLE_WALLPAPER | PERF_DISABLE_FULLWINDOWDRAG | PERF_DISABLE_MENUANIMATIONS); - // cbAutoReconnectCookie: 0 bytes (LE) - buf.writeShortLE(0); + // cbAutoReconnectCookie: 0 bytes (LE) + buf.writeShortLE(0); - // Trim buffer to actual length of data written - buf.length = buf.cursor; + // Trim buffer to actual length of data written + buf.length = buf.cursor; - pushDataToOTOut(buf); + pushDataToOTOut(buf); - switchOff(); - } + switchOff(); + } - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { // TPKT @@ -439,18 +438,18 @@ public class ClientInfoPDU extends OneTimeSwitch { }; /* @formatter:on */ - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element todo = new ClientInfoPDU("client_info", "vlisivka"); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element todo = new ClientInfoPDU("client_info", "vlisivka"); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "client_info", "mainSink"); - pipeline.link("client_info >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "client_info", "mainSink"); + pipeline.link("client_info >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java index edd3f13bf0c..55ca08acb53 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java @@ -24,46 +24,47 @@ import streamer.MockSource; import streamer.OneTimeSwitch; import streamer.Pipeline; import streamer.PipelineImpl; + /** * @see http://msdn.microsoft.com/en-us/library/cc240684.aspx */ public class ClientMCSAttachUserRequest extends OneTimeSwitch { - public ClientMCSAttachUserRequest(String id) { - super(id); - } + public ClientMCSAttachUserRequest(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - int length = 1; - ByteBuffer buf = new ByteBuffer(length, true); + int length = 1; + ByteBuffer buf = new ByteBuffer(length, true); - buf.writeByte(0x28); // AttachUserRequest + buf.writeByte(0x28); // AttachUserRequest - pushDataToOTOut(buf); + pushDataToOTOut(buf); - switchOff(); - } + switchOff(); + } - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { 0x03, 0x00, 0x00, 0x08, // TPKT Header (length = 8 bytes) @@ -85,18 +86,18 @@ public class ClientMCSAttachUserRequest extends OneTimeSwitch { }; /* @formatter:on */ - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element todo = new ClientMCSAttachUserRequest("TODO"); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element todo = new ClientMCSAttachUserRequest("TODO"); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "TODO", "mainSink"); - pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "TODO", "mainSink"); + pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java index 849f4e95df6..0b902a32326 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java @@ -36,98 +36,98 @@ import streamer.PipelineImpl; */ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends OneTimeSwitch { - private static final int MCS_CHANNEL_CONFIRM_PDU = 15; + private static final int MCS_CHANNEL_CONFIRM_PDU = 15; - protected int[] channels; - protected int channelRequestsSent = 0; + protected int[] channels; + protected int channelRequestsSent = 0; - protected RdpState state; + protected RdpState state; - public ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs(String id, int[] channels, RdpState state) { - super(id); - this.channels = channels; - this.state=state; - } + public ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs(String id, int[] channels, RdpState state) { + super(id); + this.channels = channels; + this.state = state; + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - // Parse channel confirm response - int typeAndFlags = buf.readUnsignedByte(); - int type = typeAndFlags >> 2; - // int flags = typeAndFlags & 0x3; + // Parse channel confirm response + int typeAndFlags = buf.readUnsignedByte(); + int type = typeAndFlags >> 2; + // int flags = typeAndFlags & 0x3; - if (type != MCS_CHANNEL_CONFIRM_PDU) - throw new RuntimeException("["+this+"] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 15, actual value: " + type + ", data: " + buf + "."); + if (type != MCS_CHANNEL_CONFIRM_PDU) + throw new RuntimeException("[" + this + "] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 15, actual value: " + type + ", data: " + buf + + "."); - int rtSuccess = buf.readUnsignedByte() >> 4; - if (rtSuccess != 0) - throw new RuntimeException("["+this+"] ERROR: Cannot connect to channel: request failed. Error code: " + rtSuccess + ", channel ID: " + channels[channelRequestsSent - 1] - + ", data: " + buf + "."); + int rtSuccess = buf.readUnsignedByte() >> 4; + if (rtSuccess != 0) + throw new RuntimeException("[" + this + "] ERROR: Cannot connect to channel: request failed. Error code: " + rtSuccess + ", channel ID: " + + channels[channelRequestsSent - 1] + ", data: " + buf + "."); - // Initiator and requested fields MAY be ignored, however, the channelId - // field MUST be examined. If the value of the channelId field does not - // correspond with the value of the channelId field sent in the previous MCS - // Channel Join Request PDU the connection SHOULD be dropped. + // Initiator and requested fields MAY be ignored, however, the channelId + // field MUST be examined. If the value of the channelId field does not + // correspond with the value of the channelId field sent in the previous MCS + // Channel Join Request PDU the connection SHOULD be dropped. - // Initiator: 1007 (6+1001) - // int initator=buf.readUnsignedShort(); - buf.skipBytes(2); + // Initiator: 1007 (6+1001) + // int initator=buf.readUnsignedShort(); + buf.skipBytes(2); - // Requested channel - // int requestedChannel=buf.readUnsignedShort(); - buf.skipBytes(2); + // Requested channel + // int requestedChannel=buf.readUnsignedShort(); + buf.skipBytes(2); - // Actual channel - int actualChannel = buf.readUnsignedShort(); - if (actualChannel != channels[channelRequestsSent - 1]) - throw new RuntimeException("Unexpeceted channeld ID returned. Expected channeld ID: " + channels[channelRequestsSent - 1] + ", actual channel ID: " - + actualChannel + ", data: " + buf + "."); + // Actual channel + int actualChannel = buf.readUnsignedShort(); + if (actualChannel != channels[channelRequestsSent - 1]) + throw new RuntimeException("Unexpeceted channeld ID returned. Expected channeld ID: " + channels[channelRequestsSent - 1] + ", actual channel ID: " + + actualChannel + ", data: " + buf + "."); - state.channelJoined(actualChannel); + state.channelJoined(actualChannel); - buf.unref(); + buf.unref(); + if (channelRequestsSent < channels.length) + sendChannelRequest(channels[channelRequestsSent++]); + else + switchOff(); + } - if (channelRequestsSent < channels.length) - sendChannelRequest(channels[channelRequestsSent++]); - else - switchOff(); - } + @Override + protected void onStart() { + super.onStart(); - @Override - protected void onStart() { - super.onStart(); + sendChannelRequest(channels[channelRequestsSent++]); - sendChannelRequest(channels[channelRequestsSent++]); + // Switch off after receiving response(s) + } - // Switch off after receiving response(s) - } + private void sendChannelRequest(int channel) { + ByteBuffer buf = new ByteBuffer(5, true); - private void sendChannelRequest(int channel) { - ByteBuffer buf = new ByteBuffer(5, true); + buf.writeByte(0x38); // Channel Join request - buf.writeByte(0x38); // Channel Join request + buf.writeShort(0x03); // ChannelJoinRequest::initiator: 1004 + buf.writeShort(channel); - buf.writeShort(0x03); // ChannelJoinRequest::initiator: 1004 - buf.writeShort(channel); + pushDataToOTOut(buf); + } - pushDataToOTOut(buf); - } + /** + * Example. + * + * @see http://msdn.microsoft.com/en-us/library/cc240834.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /** - * Example. - * - * @see http://msdn.microsoft.com/en-us/library/cc240834.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - - /* @formatter:off */ + /* @formatter:off */ byte[] clientRequestPacket = new byte[] { 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes) 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU @@ -204,19 +204,19 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One }; /* @formatter:on */ - RdpState rdpState = new RdpState(); - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(serverResponsePacket, new byte[] { 1, 2, 3 })); - Element todo = new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("channels", new int[] { 1007 }, rdpState); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(clientRequestPacket)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + RdpState rdpState = new RdpState(); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(serverResponsePacket, new byte[] {1, 2, 3})); + Element todo = new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("channels", new int[] {1007}, rdpState); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(clientRequestPacket)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "channels", "mainSink"); - pipeline.link("channels >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "channels", "mainSink"); + pipeline.link("channels >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java index b7cf36cd9aa..e910c10fcea 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java @@ -27,26 +27,26 @@ import streamer.PipelineImpl; public class ClientMCSConnectInitial extends OneTimeSwitch { - public ClientMCSConnectInitial(String id) { - super(id); - } + public ClientMCSConnectInitial(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - int length = 1024; // Large enough - ByteBuffer buf = new ByteBuffer(length, true); + int length = 1024; // Large enough + ByteBuffer buf = new ByteBuffer(length, true); - /* @formatter:off */ + /* @formatter:off */ buf.writeBytes(new byte[] { // - T125: MCSConnect Initial // - MCSConnectInitial: Identifier=Generic Conference Control (0.0.20.124.0.1), ConnectPDULength=254 @@ -591,24 +591,24 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { }); /* @formatter:on */ - buf.length = buf.cursor; + buf.length = buf.cursor; - pushDataToOTOut(buf); + pushDataToOTOut(buf); - switchOff(); - } + switchOff(); + } - /** - * Example. - * - * @see http://msdn.microsoft.com/en-us/library/cc240836.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + * + * @see http://msdn.microsoft.com/en-us/library/cc240836.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { // TPKT: TPKT version = 3 (byte) 0x03, (byte) 0x00, @@ -650,20 +650,20 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { }; /* @formatter:on */ - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element todo = new ClientMCSConnectInitial("ClientMCSConnectInitial"); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element todo = new ClientMCSConnectInitial("ClientMCSConnectInitial"); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "ClientMCSConnectInitial", "mainSink"); - pipeline.link("ClientMCSConnectInitial >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "ClientMCSConnectInitial", "mainSink"); + pipeline.link("ClientMCSConnectInitial >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java index 6b891c02f9a..4cb00aad2ae 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java @@ -30,51 +30,50 @@ import streamer.PipelineImpl; */ public class ClientMCSErectDomainRequest extends OneTimeSwitch { - public ClientMCSErectDomainRequest(String id) { - super(id); - } + public ClientMCSErectDomainRequest(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - int length = 5; - ByteBuffer buf = new ByteBuffer(length, true); + int length = 5; + ByteBuffer buf = new ByteBuffer(length, true); - buf.writeByte(0x04); // Erect Domain Request + buf.writeByte(0x04); // Erect Domain Request - // Client SHOULD initialize both the subHeight and subinterval fields of the MCS Erect Domain Request PDU to zero. + // Client SHOULD initialize both the subHeight and subinterval fields of the MCS Erect Domain Request PDU to zero. - buf.writeByte(1); // ErectDomainRequest::subHeight length = 1 byte - buf.writeByte(0); // ErectDomainRequest::subHeight + buf.writeByte(1); // ErectDomainRequest::subHeight length = 1 byte + buf.writeByte(0); // ErectDomainRequest::subHeight - buf.writeByte(1); // ErectDomainRequest::subInterval length = 1 byte - buf.writeByte(0); // ErectDomainRequest::subInterval + buf.writeByte(1); // ErectDomainRequest::subInterval length = 1 byte + buf.writeByte(0); // ErectDomainRequest::subInterval + pushDataToOTOut(buf); - pushDataToOTOut(buf); + switchOff(); + } - switchOff(); - } + /** + * Example. + * @see http://msdn.microsoft.com/en-us/library/cc240837.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /** - * Example. - * @see http://msdn.microsoft.com/en-us/library/cc240837.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes) @@ -137,19 +136,19 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { }; /* @formatter:on */ - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element todo = new ClientMCSErectDomainRequest("TODO"); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element todo = new ClientMCSErectDomainRequest("TODO"); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "TODO", "mainSink"); - pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "TODO", "mainSink"); + pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java index fbf4d46bf54..ce517d2acea 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java @@ -16,13 +16,12 @@ // under the License. package rdpclient; - /** * Try to determine packet content by it header fingerprint. */ public class ClientPacketSniffer extends PacketSniffer { - private static final Pair[] clientRegexps = new Pair[] { + private static final Pair[] clientRegexps = new Pair[] { // @formatter:off new Pair("Client FastPath input", "04"), new Pair("Client X224ConnectionRequest", "03 00 XX XX 27 E0"), @@ -41,10 +40,10 @@ public class ClientPacketSniffer extends PacketSniffer { // new Pair("Client UNKNOWN PACKET (ERROR)", ".*"), // @formatter:on - }; + }; - public ClientPacketSniffer(String id) { - super(id, clientRegexps); - } + public ClientPacketSniffer(String id) { + super(id, clientRegexps); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java index b6a42479418..5b370b5cd21 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java @@ -30,26 +30,26 @@ import streamer.PipelineImpl; */ public class ClientSynchronizePDU extends OneTimeSwitch { - public ClientSynchronizePDU(String id) { - super(id); - } + public ClientSynchronizePDU(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - int length = 1024; // Large enough - ByteBuffer buf = new ByteBuffer(length, true); + int length = 1024; // Large enough + ByteBuffer buf = new ByteBuffer(length, true); - /* @formatter:off */ + /* @formatter:off */ buf.writeBytes(new byte[] { // MCS send data request (byte)0x64, @@ -91,25 +91,25 @@ public class ClientSynchronizePDU extends OneTimeSwitch { }); /* @formatter:on */ - // Trim buffer to actual length of data written - buf.trimAtCursor(); + // Trim buffer to actual length of data written + buf.trimAtCursor(); - pushDataToOTOut(buf); + pushDataToOTOut(buf); - switchOff(); - } + switchOff(); + } - /** - * Example. - * - * @see http://msdn.microsoft.com/en-us/library/cc240841.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + * + * @see http://msdn.microsoft.com/en-us/library/cc240841.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - /* @formatter:off */ + /* @formatter:off */ byte[] packet = new byte[] { // TPKT (byte)0x03, (byte)0x00, @@ -157,19 +157,19 @@ public class ClientSynchronizePDU extends OneTimeSwitch { }; /* @formatter:on */ - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element todo = new ClientSynchronizePDU("TODO"); - Element x224 = new ClientX224DataPdu("x224"); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element todo = new ClientSynchronizePDU("TODO"); + Element x224 = new ClientX224DataPdu("x224"); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, todo, x224, tpkt, sink, mainSink); - pipeline.link("source", "TODO", "mainSink"); - pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, todo, x224, tpkt, sink, mainSink); + pipeline.link("source", "TODO", "mainSink"); + pipeline.link("TODO >" + OTOUT, "x224", "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientTpkt.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientTpkt.java index c92d8321a8f..036c9591e6f 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientTpkt.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientTpkt.java @@ -22,33 +22,33 @@ import streamer.Link; public class ClientTpkt extends BaseElement { - public ClientTpkt(String id) { - super(id); - } + public ClientTpkt(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (buf.length + 4 > 65535) - throw new RuntimeException("Packet is too long for TPKT (max length 65535-4): " + buf + "."); + if (buf.length + 4 > 65535) + throw new RuntimeException("Packet is too long for TPKT (max length 65535-4): " + buf + "."); - ByteBuffer data = new ByteBuffer(4); - // TPKT version - data.writeByte(3); - // Reserved - data.writeByte(0); - // Packet length, including length of the header - data.writeShort(buf.length + 4); + ByteBuffer data = new ByteBuffer(4); + // TPKT version + data.writeByte(3); + // Reserved + data.writeByte(0); + // Packet length, including length of the header + data.writeShort(buf.length + 4); - buf.prepend(data); - data.unref(); + buf.prepend(data); + data.unref(); - pushDataToPad(STDOUT, buf); - } + pushDataToPad(STDOUT, buf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java index 641ed02aa65..fbbfecbc341 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java @@ -31,126 +31,126 @@ import streamer.PipelineImpl; */ public class ClientX224ConnectionRequestPDU extends OneTimeSwitch { - public static final int X224_TPDU_CONNECTION_REQUEST = 0xe0; - public static final int X224_TPDU_CONNECTION_CONFIRM = 0xd0; - public static final int X224_TPDU_DISCONNECTION_REQUEST = 0x80; - public static final int X224_TPDU_DISCONNECTION_CONFIRM = 0xc0; - public static final int X224_TPDU_EXPEDITED_DATA = 0x10; - public static final int X224_TPDU_DATA_ACKNOWLEDGE = 0x61; - public static final int X224_TPDU_EXPEDITET_ACKNOWLEDGE = 0x40; - public static final int X224_TPDU_REJECT = 0x51; - public static final int X224_TPDU_ERROR = 0x70; - public static final int X224_TPDU_PROTOCOL_IDENTIFIER = 0x01; + public static final int X224_TPDU_CONNECTION_REQUEST = 0xe0; + public static final int X224_TPDU_CONNECTION_CONFIRM = 0xd0; + public static final int X224_TPDU_DISCONNECTION_REQUEST = 0x80; + public static final int X224_TPDU_DISCONNECTION_CONFIRM = 0xc0; + public static final int X224_TPDU_EXPEDITED_DATA = 0x10; + public static final int X224_TPDU_DATA_ACKNOWLEDGE = 0x61; + public static final int X224_TPDU_EXPEDITET_ACKNOWLEDGE = 0x40; + public static final int X224_TPDU_REJECT = 0x51; + public static final int X224_TPDU_ERROR = 0x70; + public static final int X224_TPDU_PROTOCOL_IDENTIFIER = 0x01; - /** - * Reconnection cookie. - */ - protected String userName; + /** + * Reconnection cookie. + */ + protected String userName; - public ClientX224ConnectionRequestPDU(String id, String userName) { - super(id); - this.userName = userName; - } + public ClientX224ConnectionRequestPDU(String id, String userName) { + super(id); + this.userName = userName; + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - throw new RuntimeException("Unexpected packet: " + buf + "."); - } + throw new RuntimeException("Unexpected packet: " + buf + "."); + } - @Override - protected void onStart() { - super.onStart(); + @Override + protected void onStart() { + super.onStart(); - // Length of packet without length field - int length = 33 + userName.length(); - ByteBuffer buf = new ByteBuffer(length, true); + // Length of packet without length field + int length = 33 + userName.length(); + ByteBuffer buf = new ByteBuffer(length, true); - // Type (high nibble) = 0xe = CR TPDU; credit (low nibble) = 0 - buf.writeByte(X224_TPDU_CONNECTION_REQUEST); + // Type (high nibble) = 0xe = CR TPDU; credit (low nibble) = 0 + buf.writeByte(X224_TPDU_CONNECTION_REQUEST); - buf.writeShort(0); // Destination reference = 0 - buf.writeShort(0); // Source reference = 0 - buf.writeByte(0); // Class and options = 0 - buf.writeString("Cookie: mstshash=" + userName + "\r\n", RdpConstants.CHARSET_8); // Cookie + buf.writeShort(0); // Destination reference = 0 + buf.writeShort(0); // Source reference = 0 + buf.writeByte(0); // Class and options = 0 + buf.writeString("Cookie: mstshash=" + userName + "\r\n", RdpConstants.CHARSET_8); // Cookie - // RDP_NEG_REQ::type - buf.writeByte(RdpConstants.RDP_NEG_REQ_TYPE_NEG_REQ); - // RDP_NEG_REQ::flags (0) - buf.writeByte(RdpConstants.RDP_NEG_REQ_FLAGS); - // RDP_NEG_REQ::length (constant: 8) short int in LE format - buf.writeByte(0x08); - buf.writeByte(0x00); + // RDP_NEG_REQ::type + buf.writeByte(RdpConstants.RDP_NEG_REQ_TYPE_NEG_REQ); + // RDP_NEG_REQ::flags (0) + buf.writeByte(RdpConstants.RDP_NEG_REQ_FLAGS); + // RDP_NEG_REQ::length (constant: 8) short int in LE format + buf.writeByte(0x08); + buf.writeByte(0x00); - // RDP_NEG_REQ: Requested protocols: PROTOCOL_SSL - buf.writeIntLE(RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL); + // RDP_NEG_REQ: Requested protocols: PROTOCOL_SSL + buf.writeIntLE(RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL); - // Calculate length of packet and prepend it to buffer - ByteBuffer data = new ByteBuffer(5); + // Calculate length of packet and prepend it to buffer + ByteBuffer data = new ByteBuffer(5); - // Write length - data.writeVariableIntLE(buf.length); + // Write length + data.writeVariableIntLE(buf.length); - // Reset length of buffer to actual length of data written - data.length = data.cursor; + // Reset length of buffer to actual length of data written + data.length = data.cursor; - buf.prepend(data); - data.unref(); + buf.prepend(data); + data.unref(); - pushDataToOTOut(buf); + pushDataToOTOut(buf); - switchOff(); - } + switchOff(); + } - /** - * Example. - * - * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + * + * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - String cookie = "eltons"; + String cookie = "eltons"; - byte[] packet = new byte[] { + byte[] packet = new byte[] { - 0x03, // TPKT Header: version = 3 - 0x00, // TPKT Header: Reserved = 0 - 0x00, // TPKT Header: Packet length - high part - 0x2c, // TPKT Header: Packet length - low part (total = 44 bytes) - 0x27, // X.224: Length indicator (39 bytes) - (byte) 0xe0, // X.224: Type (high nibble) = 0xe = CR TPDU; - // credit (low nibble) = 0 - 0x00, 0x00, // X.224: Destination reference = 0 - 0x00, 0x00, // X.224: Source reference = 0 - 0x00, // X.224: Class and options = 0 + 0x03, // TPKT Header: version = 3 + 0x00, // TPKT Header: Reserved = 0 + 0x00, // TPKT Header: Packet length - high part + 0x2c, // TPKT Header: Packet length - low part (total = 44 bytes) + 0x27, // X.224: Length indicator (39 bytes) + (byte)0xe0, // X.224: Type (high nibble) = 0xe = CR TPDU; + // credit (low nibble) = 0 + 0x00, 0x00, // X.224: Destination reference = 0 + 0x00, 0x00, // X.224: Source reference = 0 + 0x00, // X.224: Class and options = 0 - 'C', 'o', 'o', 'k', 'i', 'e', ':', ' ', 'm', 's', 't', 's', 'h', 'a', 's', 'h', '=', 'e', 'l', 't', 'o', 'n', 's', // "Cookie: mstshash=eltons" - '\r', '\n', // -Cookie terminator sequence + 'C', 'o', 'o', 'k', 'i', 'e', ':', ' ', 'm', 's', 't', 's', 'h', 'a', 's', 'h', '=', 'e', 'l', 't', 'o', 'n', 's', // "Cookie: mstshash=eltons" + '\r', '\n', // -Cookie terminator sequence - 0x01, // RDP_NEG_REQ::type (TYPE_RDP_NEG_REQ) - 0x00, // RDP_NEG_REQ::flags (0) - 0x08, 0x00, // RDP_NEG_REQ::length (8 bytes) - 0x01, 0x00, 0x00, 0x00 // RDP_NEG_REQ: Requested protocols - // (PROTOCOL_SSL in little endian format) - }; + 0x01, // RDP_NEG_REQ::type (TYPE_RDP_NEG_REQ) + 0x00, // RDP_NEG_REQ::flags (0) + 0x08, 0x00, // RDP_NEG_REQ::length (8 bytes) + 0x01, 0x00, 0x00, 0x00 // RDP_NEG_REQ: Requested protocols + // (PROTOCOL_SSL in little endian format) + }; - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); - Element cr = new ClientX224ConnectionRequestPDU("cr", cookie); - Element tpkt = new ClientTpkt("tpkt"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); + Element cr = new ClientX224ConnectionRequestPDU("cr", cookie); + Element tpkt = new ClientTpkt("tpkt"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, cr, tpkt, sink, mainSink); - pipeline.link("source", "cr", "mainSink"); - pipeline.link("cr >" + OTOUT, "tpkt", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, cr, tpkt, sink, mainSink); + pipeline.link("source", "cr", "mainSink"); + pipeline.link("cr >" + OTOUT, "tpkt", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java index d792ccd8fe2..fc22c430758 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java @@ -22,33 +22,31 @@ import streamer.Link; public class ClientX224DataPdu extends BaseElement { - public static final int X224_TPDU_DATA = 0xF0; - public static final int X224_TPDU_LAST_DATA_UNIT = 0x80; + public static final int X224_TPDU_DATA = 0xF0; + public static final int X224_TPDU_LAST_DATA_UNIT = 0x80; - public ClientX224DataPdu(String id) { - super(id); - } + public ClientX224DataPdu(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - ByteBuffer data = new ByteBuffer(3); - // X224 header - data.writeByte(2); // Header length indicator - data.writeByte(X224_TPDU_DATA); - data.writeByte(X224_TPDU_LAST_DATA_UNIT); - - buf.prepend(data); - data.unref(); - - pushDataToPad(STDOUT, buf); - } + ByteBuffer data = new ByteBuffer(3); + // X224 header + data.writeByte(2); // Header length indicator + data.writeByte(X224_TPDU_DATA); + data.writeByte(X224_TPDU_LAST_DATA_UNIT); + buf.prepend(data); + data.unref(); + pushDataToPad(STDOUT, buf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/HandshakeEnd.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/HandshakeEnd.java index 62242de7943..3a8b4b6d1c2 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/HandshakeEnd.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/HandshakeEnd.java @@ -20,8 +20,8 @@ import streamer.BaseElement; public class HandshakeEnd extends BaseElement { - public HandshakeEnd(String id) { - super(id); - } + public HandshakeEnd(String id) { + super(id); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/MockServer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/MockServer.java index 4db900c1c6b..72e4a6f182c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/MockServer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/MockServer.java @@ -41,157 +41,158 @@ public class MockServer implements Runnable { protected boolean verbose = System.getProperty("rdpclient.MockServer.debug", "false").equals("true"); public MockServer(Packet packets[]) { - this.packets = packets; + this.packets = packets; } public void start() throws IOException { - serverSocket = new ServerSocket(0); + serverSocket = new ServerSocket(0); - shutdown = false; - exception = null; - shutdowned = false; + shutdown = false; + exception = null; + shutdowned = false; - new Thread(this).start(); + new Thread(this).start(); } + @Override public void run() { - try { - Socket socket = serverSocket.accept(); - - InputStream is = socket.getInputStream(); - OutputStream os = socket.getOutputStream(); - try { - for (int i = 0; i < packets.length && !shutdown; i++) { + Socket socket = serverSocket.accept(); - Packet packet = packets[i]; - switch (packet.type) { - case CLIENT: { - // Read client data and compare it with mock data - // (unless "ignore" option is set) - byte actualData[] = new byte[packet.data.length]; - int actualDataLength = is.read(actualData); + InputStream is = socket.getInputStream(); + OutputStream os = socket.getOutputStream(); - if (verbose) - System.out.println("[" + this + "] INFO: Data is read: {" + Arrays.toString(Arrays.copyOf(actualData, actualDataLength)) + "}."); + try { + for (int i = 0; i < packets.length && !shutdown; i++) { + + Packet packet = packets[i]; + switch (packet.type) { + case CLIENT: { + // Read client data and compare it with mock data + // (unless "ignore" option is set) + byte actualData[] = new byte[packet.data.length]; + int actualDataLength = is.read(actualData); + + if (verbose) + System.out.println("[" + this + "] INFO: Data is read: {" + Arrays.toString(Arrays.copyOf(actualData, actualDataLength)) + "}."); + + if (!packet.ignore) { + // Compare actual data with expected data + if (actualDataLength != packet.data.length) { + throw new AssertionError("Actual length of client request for packet #" + (i + 1) + " (\"" + packet.id + "\")" + + " does not match length of expected client request. Actual length: " + actualDataLength + ", expected legnth: " + + packet.data.length + "."); + } + + for (int j = 0; j < packet.data.length; j++) { + + if (packet.data[j] != actualData[j]) { + throw new AssertionError("Actual byte #" + (j + 1) + " of client request for packet #" + (i + 1) + " (\"" + packet.id + "\")" + + " does not match corresponding byte of expected client request. Actual byte: " + actualData[j] + ", expected byte: " + + packet.data[j] + "."); + } + } + } + break; + } + case SERVER: { + // Send mock data to client + os.write(packet.data); + + if (verbose) + System.out.println("[" + this + "] INFO: Data is written: {" + Arrays.toString(packet.data) + "}."); + + break; + } + case UPGRADE_TO_SSL: { + // Attach SSL context to socket + + final SSLSocketFactory sslSocketFactory = (SSLSocketFactory)SSLSocketFactory.getDefault(); + SSLSocket sslSocket = (SSLSocket)sslSocketFactory.createSocket(socket, null, serverSocket.getLocalPort(), true); + sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites()); + sslSocket.setUseClientMode(false); + sslSocket.startHandshake(); + is = sslSocket.getInputStream(); + os = sslSocket.getOutputStream(); + + break; + } + default: + throw new RuntimeException("Unknown packet type: " + packet.type); + } - if (!packet.ignore) { - // Compare actual data with expected data - if (actualDataLength != packet.data.length) { - throw new AssertionError("Actual length of client request for packet #" + (i + 1) + " (\"" + packet.id + "\")" - + " does not match length of expected client request. Actual length: " + actualDataLength + ", expected legnth: " - + packet.data.length + "."); } - - for (int j = 0; j < packet.data.length; j++) { - - if (packet.data[j] != actualData[j]) { - throw new AssertionError("Actual byte #" + (j + 1) + " of client request for packet #" + (i + 1) + " (\"" + packet.id - + "\")" + " does not match corresponding byte of expected client request. Actual byte: " + actualData[j] - + ", expected byte: " + packet.data[j] + "."); + } finally { + try { + is.close(); + } catch (Throwable e) { } + try { + os.close(); + } catch (Throwable e) { + } + try { + socket.close(); + } catch (Throwable e) { + } + try { + serverSocket.close(); + } catch (Throwable e) { } } - break; - } - case SERVER: { - // Send mock data to client - os.write(packet.data); - - if (verbose) - System.out.println("[" + this + "] INFO: Data is written: {" + Arrays.toString(packet.data) + "}."); - - break; - } - case UPGRADE_TO_SSL: { - // Attach SSL context to socket - - final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault(); - SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, null, serverSocket.getLocalPort(), true); - sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites()); - sslSocket.setUseClientMode(false); - sslSocket.startHandshake(); - is = sslSocket.getInputStream(); - os = sslSocket.getOutputStream(); - - break; - } - default: - throw new RuntimeException("Unknown packet type: " + packet.type); - } - - } - } finally { - try { - is.close(); } catch (Throwable e) { + System.err.println("Error in mock server: " + e.getMessage()); + e.printStackTrace(System.err); + exception = e; } - try { - os.close(); - } catch (Throwable e) { - } - try { - socket.close(); - } catch (Throwable e) { - } - try { - serverSocket.close(); - } catch (Throwable e) { - } - } - } catch (Throwable e) { - System.err.println("Error in mock server: " + e.getMessage()); - e.printStackTrace(System.err); - exception = e; - } - shutdowned = true; - if (verbose) - System.out.println("[" + this + "] INFO: Mock server shutdowned."); + shutdowned = true; + if (verbose) + System.out.println("[" + this + "] INFO: Mock server shutdowned."); } public void shutdown() { - shutdown = true; + shutdown = true; } public InetSocketAddress getAddress() { - return (InetSocketAddress) serverSocket.getLocalSocketAddress(); + return (InetSocketAddress)serverSocket.getLocalSocketAddress(); } public Throwable getException() { - return exception; + return exception; } public static class Packet { - public static enum PacketType { - SERVER, CLIENT, UPGRADE_TO_SSL; - } + public static enum PacketType { + SERVER, CLIENT, UPGRADE_TO_SSL; + } - public String id = ""; + public String id = ""; - public Packet() { - } + public Packet() { + } - public Packet(String id) { - this.id = id; - } + public Packet(String id) { + this.id = id; + } - public PacketType type; + public PacketType type; - public boolean ignore = false; + public boolean ignore = false; - public byte data[]; + public byte data[]; } public boolean isShutdowned() { - return shutdowned; + return shutdowned; } public void waitUntilShutdowned(long timeToWaitMiliseconds) throws InterruptedException { - long deadline = System.currentTimeMillis() + timeToWaitMiliseconds; - while (!shutdowned && System.currentTimeMillis() < deadline) { - Thread.sleep(10); - } + long deadline = System.currentTimeMillis() + timeToWaitMiliseconds; + while (!shutdowned && System.currentTimeMillis() < deadline) { + Thread.sleep(10); + } } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java index 516c1fd137c..12fa8e33720 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java @@ -25,51 +25,51 @@ import streamer.Link; /** * Try to determine packet content by it header fingerprint. */ -public class PacketSniffer extends BaseElement { +public class PacketSniffer extends BaseElement { - protected Pair regexps[]=null; + protected Pair regexps[] = null; - public PacketSniffer(String id, Pair[] regexps) { - super(id); - this.regexps=regexps; - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - - matchPacket(buf); - - super.handleData(buf, link); - } - - private void matchPacket(ByteBuffer buf) { - String header = buf.toPlainHexString(100); - for (Pair pair : regexps) { - if (pair.regexp.matcher(header).find()) { - System.out.println("[" + this + "] INFO: Packet: " + pair.name + "."); - return; - } + public PacketSniffer(String id, Pair[] regexps) { + super(id); + this.regexps = regexps; } - System.out.println("[" + this + "] INFO: Unknown packet: " + header + "."); - } + @Override + public void handleData(ByteBuffer buf, Link link) { - protected static class Pair { - String name; - Pattern regexp; + matchPacket(buf); - protected Pair(String name, String regexp) { - this.name = name; - this.regexp = Pattern.compile("^" + replaceShortcuts(regexp), Pattern.CASE_INSENSITIVE); + super.handleData(buf, link); } - private static String replaceShortcuts(String regexp) { - String result = regexp; - result = result.replaceAll("XX\\*", "([0-9a-fA-F]{2} )*?"); - result = result.replaceAll("XX\\?", "([0-9a-fA-F]{2} )?"); - result = result.replaceAll("XX", "[0-9a-fA-F]{2}"); - return result; + private void matchPacket(ByteBuffer buf) { + String header = buf.toPlainHexString(100); + for (Pair pair : regexps) { + if (pair.regexp.matcher(header).find()) { + System.out.println("[" + this + "] INFO: Packet: " + pair.name + "."); + return; + } + } + + System.out.println("[" + this + "] INFO: Unknown packet: " + header + "."); + } + + protected static class Pair { + String name; + Pattern regexp; + + protected Pair(String name, String regexp) { + this.name = name; + this.regexp = Pattern.compile("^" + replaceShortcuts(regexp), Pattern.CASE_INSENSITIVE); + } + + private static String replaceShortcuts(String regexp) { + String result = regexp; + result = result.replaceAll("XX\\*", "([0-9a-fA-F]{2} )*?"); + result = result.replaceAll("XX\\?", "([0-9a-fA-F]{2} )?"); + result = result.replaceAll("XX", "[0-9a-fA-F]{2}"); + return result; + } } - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java index 60060fbe96b..cd3a5ed8af2 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java @@ -25,990 +25,961 @@ import streamer.ByteBuffer; */ public class RLEBitmapDecompression { - public static final int g_MaskRegularRunLength = 0x1F; - public static final int g_MaskLiteRunLength = 0x0F; + public static final int g_MaskRegularRunLength = 0x1F; + public static final int g_MaskLiteRunLength = 0x0F; - public static final int g_MaskSpecialFgBg1 = 0x03; - public static final int g_MaskSpecialFgBg2 = 0x05; + public static final int g_MaskSpecialFgBg1 = 0x03; + public static final int g_MaskSpecialFgBg2 = 0x05; - public static final int REGULAR_BG_RUN = 0x00; - public static final int REGULAR_FG_RUN = 0x01; - public static final int REGULAR_FGBG_IMAGE = 0x02; - public static final int REGULAR_COLOR_RUN = 0x03; - public static final int REGULAR_COLOR_IMAGE = 0x04; + public static final int REGULAR_BG_RUN = 0x00; + public static final int REGULAR_FG_RUN = 0x01; + public static final int REGULAR_FGBG_IMAGE = 0x02; + public static final int REGULAR_COLOR_RUN = 0x03; + public static final int REGULAR_COLOR_IMAGE = 0x04; - public static final int LITE_SET_FG_FG_RUN = 0x0C; - public static final int LITE_SET_FG_FGBG_IMAGE = 0x0D; - public static final int LITE_DITHERED_RUN = 0x0E; + public static final int LITE_SET_FG_FG_RUN = 0x0C; + public static final int LITE_SET_FG_FGBG_IMAGE = 0x0D; + public static final int LITE_DITHERED_RUN = 0x0E; - public static final int MEGA_MEGA_BG_RUN = 0xF0; - public static final int MEGA_MEGA_FG_RUN = 0xF1; - public static final int MEGA_MEGA_FGBG_IMAGE = 0xF2; - public static final int MEGA_MEGA_COLOR_RUN = 0xF3; - public static final int MEGA_MEGA_COLOR_IMAGE = 0xF4; - public static final int MEGA_MEGA_SET_FG_RUN = 0xF6; - public static final int MEGA_MEGA_SET_FGBG_IMAGE = 0xF7; - public static final int MEGA_MEGA_DITHERED_RUN = 0xF8; + public static final int MEGA_MEGA_BG_RUN = 0xF0; + public static final int MEGA_MEGA_FG_RUN = 0xF1; + public static final int MEGA_MEGA_FGBG_IMAGE = 0xF2; + public static final int MEGA_MEGA_COLOR_RUN = 0xF3; + public static final int MEGA_MEGA_COLOR_IMAGE = 0xF4; + public static final int MEGA_MEGA_SET_FG_RUN = 0xF6; + public static final int MEGA_MEGA_SET_FGBG_IMAGE = 0xF7; + public static final int MEGA_MEGA_DITHERED_RUN = 0xF8; - public static final int SPECIAL_FGBG_1 = 0xF9; - public static final int SPECIAL_FGBG_2 = 0xFA; + public static final int SPECIAL_FGBG_1 = 0xF9; + public static final int SPECIAL_FGBG_2 = 0xFA; - public static final int SPECIAL_WHITE = 0xFD; - public static final int SPECIAL_BLACK = 0xFE; + public static final int SPECIAL_WHITE = 0xFD; + public static final int SPECIAL_BLACK = 0xFE; - /** - * Writes a pixel to the specified buffer and advance cursor by bpp. - * - * @param bpp - * bytes per pixel - */ - private static void writePixel(int bpp, ByteBuffer destBuf, int pixel) { - switch (bpp) { - case 1: - destBuf.writeByte(pixel); - break; - case 2: - destBuf.writeShortLE(pixel); - break; - case 3: - destBuf.writeByte(pixel); - destBuf.writeShortLE(pixel >> 8); - break; - case 4: - destBuf.writeIntLE(pixel); - break; - default: - throw new RuntimeException("Unsupported color depth."); - } - } - - /** - * Reads a pixel from the specified buffer at given offset without changing of - * cursor. - * - * @param bpp - * bytes per pixel - * @param offset - * -rowDelta (i.e. (-width*bpp)) - */ - private static int peekPixel(int bpp, ByteBuffer destBuf, int offset) { - if (offset >= 0 || (-offset) > destBuf.cursor) - throw new RuntimeException("Incorrect value for offset: offset in destination buffer must point to pixel in previous row."); - - // Adjust cursor to point to pixel in previous row - int oldCursor = destBuf.cursor; - destBuf.cursor += offset; - - int pixel; - switch (bpp) { - case 1: - pixel = destBuf.readUnsignedByte(); - break; - case 2: - pixel = destBuf.readUnsignedShortLE(); - break; - case 3: - pixel = destBuf.readUnsignedByte() | (destBuf.readUnsignedShortLE() >> 8); - break; - case 4: - pixel = destBuf.readSignedIntLE(); - break; - default: - throw new RuntimeException("Unsupported color depth."); - } - destBuf.cursor = oldCursor; - - return pixel; - } - - /** - * Reads a pixel from the specified buffer and advance cursor by bpp value. - * - * @param bpp - * bytes per pixel - */ - private static int readPixel(int bpp, ByteBuffer srcBuf) { - int pixel; - switch (bpp) { - case 1: - pixel = srcBuf.readUnsignedByte(); - break; - case 2: - pixel = srcBuf.readUnsignedShortLE(); - break; - case 3: - pixel = srcBuf.readUnsignedByte() | (srcBuf.readUnsignedShortLE() >> 8); - break; - case 4: - pixel = srcBuf.readSignedIntLE(); - break; - default: - throw new RuntimeException("Unsupported color depth."); - } - - return pixel; - } - - /** - * Returns the size of a pixel in bytes. - */ - private static int getPixelSize(int colorDepth) { - switch (colorDepth) { - case 8: - return 1; - case 15: - case 16: - return 2; - case 24: - return 3; - default: - throw new RuntimeException("Unsupported pixel color depth: " + colorDepth + " bpp."); - } - } - - /** - * Reads the supplied order header & extracts the compression order code ID. - */ - private static int extractCodeId(int orderHeader) { - // Taken from FreeRDP code, bitmap.c - switch (orderHeader) { - case MEGA_MEGA_BG_RUN: - case MEGA_MEGA_FG_RUN: - case MEGA_MEGA_SET_FG_RUN: - case MEGA_MEGA_DITHERED_RUN: - case MEGA_MEGA_COLOR_RUN: - case MEGA_MEGA_FGBG_IMAGE: - case MEGA_MEGA_SET_FGBG_IMAGE: - case MEGA_MEGA_COLOR_IMAGE: - case SPECIAL_FGBG_1: - case SPECIAL_FGBG_2: - case SPECIAL_WHITE: - case SPECIAL_BLACK: - return orderHeader; - } - - int code = orderHeader >> 5; - switch (code) { - case REGULAR_BG_RUN: - case REGULAR_FG_RUN: - case REGULAR_COLOR_RUN: - case REGULAR_FGBG_IMAGE: - case REGULAR_COLOR_IMAGE: - return code; - } - - return orderHeader >> 4; - } - - /** - * Returns a black pixel. - */ - private static int getColorBlack() { - return 0x000000; - } - - /** - * Returns a white pixel. - */ - private static int getColorWhite(int colorDepth) { - if (colorDepth == 8) { - // - // Palette entry #255 holds white. - // - return 0xFF; - } else if (colorDepth == 15) { - // - // 5 bits per RGB component: - // 0111 1111 1111 1111 (binary) - // - return 0x7FFF; - } else if (colorDepth == 16) { - // - // 5 bits for red, 6 bits for green, 5 bits for green: - // 1111 1111 1111 1111 (binary) - // - return 0xFFFF; - } else if (colorDepth == 24) { - // - // 8 bits per RGB component: - // 1111 1111 1111 1111 1111 1111 (binary) - // - return 0xFFFFFF; - } else - throw new RuntimeException("Unsupported color depth."); - } - - /** - * Extract the run length of a compression order. - */ - private static int extractRunLength(int code, int orderHeader, ByteBuffer srcBuf) { - switch (code) { - case REGULAR_FGBG_IMAGE: { - int runLength = orderHeader & g_MaskRegularRunLength; - if (runLength == 0) - runLength = srcBuf.readUnsignedByte() + 1; - else - runLength = runLength * 8; - return runLength; - } - case LITE_SET_FG_FGBG_IMAGE: { - int runLength = orderHeader & g_MaskLiteRunLength; - if (runLength == 0) - runLength = srcBuf.readUnsignedByte() + 1; - else - runLength = runLength * 8; - return runLength; - } - case REGULAR_BG_RUN: - case REGULAR_COLOR_IMAGE: - case REGULAR_COLOR_RUN: - case REGULAR_FG_RUN: { - int runLength = orderHeader & g_MaskRegularRunLength; - if (runLength == 0) - // An extended (MEGA) run. - runLength = srcBuf.readUnsignedByte() + 32; - return runLength; - } - case LITE_DITHERED_RUN: - case LITE_SET_FG_FG_RUN: { - int runLength = orderHeader & g_MaskLiteRunLength; - if (runLength == 0) - // An extended (MEGA) run. - runLength = srcBuf.readUnsignedByte() + 16; - return runLength; - } - case MEGA_MEGA_BG_RUN: - case MEGA_MEGA_COLOR_IMAGE: - case MEGA_MEGA_COLOR_RUN: - case MEGA_MEGA_DITHERED_RUN: - case MEGA_MEGA_FG_RUN: - case MEGA_MEGA_FGBG_IMAGE: - case MEGA_MEGA_SET_FG_RUN: - case MEGA_MEGA_SET_FGBG_IMAGE: { - return srcBuf.readUnsignedShortLE(); - } - default: - return 0; - } - - } - - /** - * Write a foreground/background image to a destination buffer. - */ - private static void writeFgBgImage(int bpp, ByteBuffer destBuf, int rowDelta, int bitmask, int fgPel, int cBits) { - for (; cBits > 0; cBits--, bitmask >>= 1) { - int xorPixel = peekPixel(bpp, destBuf, -rowDelta); - writePixel(bpp, destBuf, ((bitmask & 0x1) > 0) ? xorPixel ^ fgPel : xorPixel); - } - } - - /** - * Write a foreground/background image to a destination buffer for the first - * line of compressed data. - */ - private static void writeFirstLineFgBgImage(int bpp, ByteBuffer destBuf, int bitmask, int fgPel, int cBits) { - for (; cBits > 0; cBits--, bitmask >>= 1) { - writePixel(bpp, destBuf, ((bitmask & 0x1) > 0) ? fgPel : getColorBlack()); - } - } - - /** - * Decompress a RLE compressed bitmap and flip decompressed image. - * - * @param srcBuf - * source buffer containing compressed bitmap - * @param imageWidth - * width of destination image in pixels - * @param imageHeight - * height of destination image in pixels - * @param colorDepth - * bits per pixel - * @return destination image buffer - */ - public static ByteBuffer rleDecompress(ByteBuffer srcBuf, int imageWidth, int imageHeight, int colorDepth) { - int bpp = getPixelSize(colorDepth); - - // Decompress image - ByteBuffer destBuf = new ByteBuffer(new byte[imageWidth * imageHeight * bpp]); - rleDecompress(srcBuf, destBuf, imageWidth, imageHeight, colorDepth); - - // Flip image - return flipRawImage(destBuf, imageWidth, imageHeight, bpp); - } - - /** - * Decompress a RLE compressed bitmap. - * - * @param srcBuf - * source buffer containing compressed bitmap - * @param destBuf - * destination buffer - * @param imageWidth - * width of destination image in pixels - * @param imageHeight - * height of destination image in pixels - * @param colorDepth - * bits per pixel - */ - protected static void rleDecompress(final ByteBuffer srcBuf, final ByteBuffer destBuf, final int imageWidth, final int imageHeight, final int colorDepth) { - final int bpp = getPixelSize(colorDepth); - final int rowDelta = imageWidth * bpp; - final int whitePixel = getColorWhite(colorDepth); - final int blackPixel = getColorBlack(); - - int fgPel = whitePixel; - boolean insertFgPel = false; - boolean firstLine = true; - - if (destBuf.length != imageWidth * imageHeight * bpp) - throw new RuntimeException("Incorrect size of destination buffer. Expected size (imageWidth*imageHeight*bpp): " + (imageWidth * imageHeight * bpp) - + ", actual size: " + destBuf.length + "."); - - while (srcBuf.cursor < srcBuf.length) { - // Watch out for the end of the first scanline in destination buffer. - if (firstLine) { - if (destBuf.cursor >= rowDelta) { - firstLine = false; - insertFgPel = false; + /** + * Writes a pixel to the specified buffer and advance cursor by bpp. + * + * @param bpp + * bytes per pixel + */ + private static void writePixel(int bpp, ByteBuffer destBuf, int pixel) { + switch (bpp) { + case 1: + destBuf.writeByte(pixel); + break; + case 2: + destBuf.writeShortLE(pixel); + break; + case 3: + destBuf.writeByte(pixel); + destBuf.writeShortLE(pixel >> 8); + break; + case 4: + destBuf.writeIntLE(pixel); + break; + default: + throw new RuntimeException("Unsupported color depth."); } - } + } - // Extract the compression order code ID from the compression - // order header. - int orderHeader = srcBuf.readUnsignedByte(); - int code = extractCodeId(orderHeader); + /** + * Reads a pixel from the specified buffer at given offset without changing of + * cursor. + * + * @param bpp + * bytes per pixel + * @param offset + * -rowDelta (i.e. (-width*bpp)) + */ + private static int peekPixel(int bpp, ByteBuffer destBuf, int offset) { + if (offset >= 0 || (-offset) > destBuf.cursor) + throw new RuntimeException("Incorrect value for offset: offset in destination buffer must point to pixel in previous row."); - // Handle Background Run Orders. - if (code == REGULAR_BG_RUN | code == MEGA_MEGA_BG_RUN) { - int runLength = extractRunLength(code, orderHeader, srcBuf); + // Adjust cursor to point to pixel in previous row + int oldCursor = destBuf.cursor; + destBuf.cursor += offset; - if (firstLine) { - if (insertFgPel) { - writePixel(bpp, destBuf, fgPel); - runLength--; - } + int pixel; + switch (bpp) { + case 1: + pixel = destBuf.readUnsignedByte(); + break; + case 2: + pixel = destBuf.readUnsignedShortLE(); + break; + case 3: + pixel = destBuf.readUnsignedByte() | (destBuf.readUnsignedShortLE() >> 8); + break; + case 4: + pixel = destBuf.readSignedIntLE(); + break; + default: + throw new RuntimeException("Unsupported color depth."); + } + destBuf.cursor = oldCursor; - for (; runLength > 0; runLength--) - writePixel(bpp, destBuf, blackPixel); + return pixel; + } - } else { - if (insertFgPel) { - writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta) ^ fgPel); - runLength--; - } - - // Copy pixels from previous row of destination image - for (; runLength > 0; runLength--) - writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta)); + /** + * Reads a pixel from the specified buffer and advance cursor by bpp value. + * + * @param bpp + * bytes per pixel + */ + private static int readPixel(int bpp, ByteBuffer srcBuf) { + int pixel; + switch (bpp) { + case 1: + pixel = srcBuf.readUnsignedByte(); + break; + case 2: + pixel = srcBuf.readUnsignedShortLE(); + break; + case 3: + pixel = srcBuf.readUnsignedByte() | (srcBuf.readUnsignedShortLE() >> 8); + break; + case 4: + pixel = srcBuf.readSignedIntLE(); + break; + default: + throw new RuntimeException("Unsupported color depth."); } - // - // A follow-on background run order will need a - // foreground pel inserted. - // - insertFgPel = true; - continue; - } + return pixel; + } - // - // For any of the other run-types a follow-on background run - // order does not need a foreground pel inserted. - // - insertFgPel = false; + /** + * Returns the size of a pixel in bytes. + */ + private static int getPixelSize(int colorDepth) { + switch (colorDepth) { + case 8: + return 1; + case 15: + case 16: + return 2; + case 24: + return 3; + default: + throw new RuntimeException("Unsupported pixel color depth: " + colorDepth + " bpp."); + } + } - // - // Handle Foreground Run Orders. - // - if (code == REGULAR_FG_RUN | code == MEGA_MEGA_FG_RUN | code == LITE_SET_FG_FG_RUN | code == MEGA_MEGA_SET_FG_RUN) { - int runLength = extractRunLength(code, orderHeader, srcBuf); - - if (code == LITE_SET_FG_FG_RUN | code == MEGA_MEGA_SET_FG_RUN) - fgPel = readPixel(bpp, srcBuf); - - if (firstLine) { - for (; runLength > 0; runLength--) { - writePixel(bpp, destBuf, fgPel); - } - } else { - for (; runLength > 0; runLength--) { - writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta) ^ fgPel); - } + /** + * Reads the supplied order header & extracts the compression order code ID. + */ + private static int extractCodeId(int orderHeader) { + // Taken from FreeRDP code, bitmap.c + switch (orderHeader) { + case MEGA_MEGA_BG_RUN: + case MEGA_MEGA_FG_RUN: + case MEGA_MEGA_SET_FG_RUN: + case MEGA_MEGA_DITHERED_RUN: + case MEGA_MEGA_COLOR_RUN: + case MEGA_MEGA_FGBG_IMAGE: + case MEGA_MEGA_SET_FGBG_IMAGE: + case MEGA_MEGA_COLOR_IMAGE: + case SPECIAL_FGBG_1: + case SPECIAL_FGBG_2: + case SPECIAL_WHITE: + case SPECIAL_BLACK: + return orderHeader; } - continue; - } - - // - // Handle Dithered Run Orders. - // - if (code == LITE_DITHERED_RUN | code == MEGA_MEGA_DITHERED_RUN) { - int runLength = extractRunLength(code, orderHeader, srcBuf); - - int pixelA = readPixel(bpp, srcBuf); - int pixelB = readPixel(bpp, srcBuf); - - for (; runLength > 0; runLength--) { - writePixel(bpp, destBuf, pixelA); - writePixel(bpp, destBuf, pixelB); + int code = orderHeader >> 5; + switch (code) { + case REGULAR_BG_RUN: + case REGULAR_FG_RUN: + case REGULAR_COLOR_RUN: + case REGULAR_FGBG_IMAGE: + case REGULAR_COLOR_IMAGE: + return code; } - continue; - } + return orderHeader >> 4; + } - // - // Handle Color Run Orders. - // - if (code == REGULAR_COLOR_RUN | code == MEGA_MEGA_COLOR_RUN) { - int runLength = extractRunLength(code, orderHeader, srcBuf); + /** + * Returns a black pixel. + */ + private static int getColorBlack() { + return 0x000000; + } - int pixelA = readPixel(bpp, srcBuf); + /** + * Returns a white pixel. + */ + private static int getColorWhite(int colorDepth) { + if (colorDepth == 8) { + // + // Palette entry #255 holds white. + // + return 0xFF; + } else if (colorDepth == 15) { + // + // 5 bits per RGB component: + // 0111 1111 1111 1111 (binary) + // + return 0x7FFF; + } else if (colorDepth == 16) { + // + // 5 bits for red, 6 bits for green, 5 bits for green: + // 1111 1111 1111 1111 (binary) + // + return 0xFFFF; + } else if (colorDepth == 24) { + // + // 8 bits per RGB component: + // 1111 1111 1111 1111 1111 1111 (binary) + // + return 0xFFFFFF; + } else + throw new RuntimeException("Unsupported color depth."); + } - for (; runLength > 0; runLength--) - writePixel(bpp, destBuf, pixelA); - - continue; - } - - // - // Handle Foreground/Background Image Orders. - // - if (code == REGULAR_FGBG_IMAGE | code == MEGA_MEGA_FGBG_IMAGE | code == LITE_SET_FG_FGBG_IMAGE | code == MEGA_MEGA_SET_FGBG_IMAGE) { - int runLength = extractRunLength(code, orderHeader, srcBuf); - - if (code == LITE_SET_FG_FGBG_IMAGE | code == MEGA_MEGA_SET_FGBG_IMAGE) { - fgPel = readPixel(bpp, srcBuf); + /** + * Extract the run length of a compression order. + */ + private static int extractRunLength(int code, int orderHeader, ByteBuffer srcBuf) { + switch (code) { + case REGULAR_FGBG_IMAGE: { + int runLength = orderHeader & g_MaskRegularRunLength; + if (runLength == 0) + runLength = srcBuf.readUnsignedByte() + 1; + else + runLength = runLength * 8; + return runLength; + } + case LITE_SET_FG_FGBG_IMAGE: { + int runLength = orderHeader & g_MaskLiteRunLength; + if (runLength == 0) + runLength = srcBuf.readUnsignedByte() + 1; + else + runLength = runLength * 8; + return runLength; + } + case REGULAR_BG_RUN: + case REGULAR_COLOR_IMAGE: + case REGULAR_COLOR_RUN: + case REGULAR_FG_RUN: { + int runLength = orderHeader & g_MaskRegularRunLength; + if (runLength == 0) + // An extended (MEGA) run. + runLength = srcBuf.readUnsignedByte() + 32; + return runLength; + } + case LITE_DITHERED_RUN: + case LITE_SET_FG_FG_RUN: { + int runLength = orderHeader & g_MaskLiteRunLength; + if (runLength == 0) + // An extended (MEGA) run. + runLength = srcBuf.readUnsignedByte() + 16; + return runLength; + } + case MEGA_MEGA_BG_RUN: + case MEGA_MEGA_COLOR_IMAGE: + case MEGA_MEGA_COLOR_RUN: + case MEGA_MEGA_DITHERED_RUN: + case MEGA_MEGA_FG_RUN: + case MEGA_MEGA_FGBG_IMAGE: + case MEGA_MEGA_SET_FG_RUN: + case MEGA_MEGA_SET_FGBG_IMAGE: { + return srcBuf.readUnsignedShortLE(); + } + default: + return 0; } - for (; runLength > 8; runLength -= 8) { - int bitmask = srcBuf.readUnsignedByte(); + } - if (firstLine) - writeFirstLineFgBgImage(bpp, destBuf, bitmask, fgPel, 8); - else - writeFgBgImage(bpp, destBuf, rowDelta, bitmask, fgPel, 8); + /** + * Write a foreground/background image to a destination buffer. + */ + private static void writeFgBgImage(int bpp, ByteBuffer destBuf, int rowDelta, int bitmask, int fgPel, int cBits) { + for (; cBits > 0; cBits--, bitmask >>= 1) { + int xorPixel = peekPixel(bpp, destBuf, -rowDelta); + writePixel(bpp, destBuf, ((bitmask & 0x1) > 0) ? xorPixel ^ fgPel : xorPixel); + } + } + + /** + * Write a foreground/background image to a destination buffer for the first + * line of compressed data. + */ + private static void writeFirstLineFgBgImage(int bpp, ByteBuffer destBuf, int bitmask, int fgPel, int cBits) { + for (; cBits > 0; cBits--, bitmask >>= 1) { + writePixel(bpp, destBuf, ((bitmask & 0x1) > 0) ? fgPel : getColorBlack()); + } + } + + /** + * Decompress a RLE compressed bitmap and flip decompressed image. + * + * @param srcBuf + * source buffer containing compressed bitmap + * @param imageWidth + * width of destination image in pixels + * @param imageHeight + * height of destination image in pixels + * @param colorDepth + * bits per pixel + * @return destination image buffer + */ + public static ByteBuffer rleDecompress(ByteBuffer srcBuf, int imageWidth, int imageHeight, int colorDepth) { + int bpp = getPixelSize(colorDepth); + + // Decompress image + ByteBuffer destBuf = new ByteBuffer(new byte[imageWidth * imageHeight * bpp]); + rleDecompress(srcBuf, destBuf, imageWidth, imageHeight, colorDepth); + + // Flip image + return flipRawImage(destBuf, imageWidth, imageHeight, bpp); + } + + /** + * Decompress a RLE compressed bitmap. + * + * @param srcBuf + * source buffer containing compressed bitmap + * @param destBuf + * destination buffer + * @param imageWidth + * width of destination image in pixels + * @param imageHeight + * height of destination image in pixels + * @param colorDepth + * bits per pixel + */ + protected static void rleDecompress(final ByteBuffer srcBuf, final ByteBuffer destBuf, final int imageWidth, final int imageHeight, final int colorDepth) { + final int bpp = getPixelSize(colorDepth); + final int rowDelta = imageWidth * bpp; + final int whitePixel = getColorWhite(colorDepth); + final int blackPixel = getColorBlack(); + + int fgPel = whitePixel; + boolean insertFgPel = false; + boolean firstLine = true; + + if (destBuf.length != imageWidth * imageHeight * bpp) + throw new RuntimeException("Incorrect size of destination buffer. Expected size (imageWidth*imageHeight*bpp): " + (imageWidth * imageHeight * bpp) + + ", actual size: " + destBuf.length + "."); + + while (srcBuf.cursor < srcBuf.length) { + // Watch out for the end of the first scanline in destination buffer. + if (firstLine) { + if (destBuf.cursor >= rowDelta) { + firstLine = false; + insertFgPel = false; + } + } + + // Extract the compression order code ID from the compression + // order header. + int orderHeader = srcBuf.readUnsignedByte(); + int code = extractCodeId(orderHeader); + + // Handle Background Run Orders. + if (code == REGULAR_BG_RUN | code == MEGA_MEGA_BG_RUN) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + if (firstLine) { + if (insertFgPel) { + writePixel(bpp, destBuf, fgPel); + runLength--; + } + + for (; runLength > 0; runLength--) + writePixel(bpp, destBuf, blackPixel); + + } else { + if (insertFgPel) { + writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta) ^ fgPel); + runLength--; + } + + // Copy pixels from previous row of destination image + for (; runLength > 0; runLength--) + writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta)); + } + + // + // A follow-on background run order will need a + // foreground pel inserted. + // + insertFgPel = true; + continue; + } + + // + // For any of the other run-types a follow-on background run + // order does not need a foreground pel inserted. + // + insertFgPel = false; + + // + // Handle Foreground Run Orders. + // + if (code == REGULAR_FG_RUN | code == MEGA_MEGA_FG_RUN | code == LITE_SET_FG_FG_RUN | code == MEGA_MEGA_SET_FG_RUN) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + if (code == LITE_SET_FG_FG_RUN | code == MEGA_MEGA_SET_FG_RUN) + fgPel = readPixel(bpp, srcBuf); + + if (firstLine) { + for (; runLength > 0; runLength--) { + writePixel(bpp, destBuf, fgPel); + } + } else { + for (; runLength > 0; runLength--) { + writePixel(bpp, destBuf, peekPixel(bpp, destBuf, -rowDelta) ^ fgPel); + } + } + + continue; + } + + // + // Handle Dithered Run Orders. + // + if (code == LITE_DITHERED_RUN | code == MEGA_MEGA_DITHERED_RUN) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + int pixelA = readPixel(bpp, srcBuf); + int pixelB = readPixel(bpp, srcBuf); + + for (; runLength > 0; runLength--) { + writePixel(bpp, destBuf, pixelA); + writePixel(bpp, destBuf, pixelB); + } + + continue; + } + + // + // Handle Color Run Orders. + // + if (code == REGULAR_COLOR_RUN | code == MEGA_MEGA_COLOR_RUN) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + int pixelA = readPixel(bpp, srcBuf); + + for (; runLength > 0; runLength--) + writePixel(bpp, destBuf, pixelA); + + continue; + } + + // + // Handle Foreground/Background Image Orders. + // + if (code == REGULAR_FGBG_IMAGE | code == MEGA_MEGA_FGBG_IMAGE | code == LITE_SET_FG_FGBG_IMAGE | code == MEGA_MEGA_SET_FGBG_IMAGE) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + if (code == LITE_SET_FG_FGBG_IMAGE | code == MEGA_MEGA_SET_FGBG_IMAGE) { + fgPel = readPixel(bpp, srcBuf); + } + + for (; runLength > 8; runLength -= 8) { + int bitmask = srcBuf.readUnsignedByte(); + + if (firstLine) + writeFirstLineFgBgImage(bpp, destBuf, bitmask, fgPel, 8); + else + writeFgBgImage(bpp, destBuf, rowDelta, bitmask, fgPel, 8); + } + + if (runLength > 0) { + int bitmask = srcBuf.readUnsignedByte(); + + if (firstLine) + writeFirstLineFgBgImage(bpp, destBuf, bitmask, fgPel, runLength); + else + writeFgBgImage(bpp, destBuf, rowDelta, bitmask, fgPel, runLength); + } + + continue; + } + + // + // Handle Color Image Orders. + // + if (code == REGULAR_COLOR_IMAGE | code == MEGA_MEGA_COLOR_IMAGE) { + int runLength = extractRunLength(code, orderHeader, srcBuf); + + /* DEBUG */ + // Copy bytes from source to destination using writeByte(readByte()) + // for (int byteCount = runLength * bpp; byteCount > 0; byteCount--) { + // destBuf.writeByte(srcBuf.readUnsignedByte()); + // } + /* DEBUG */ + + // Copy bytes from source to destination directly using arraycopy() + int lengthInBytes = runLength * bpp; + System.arraycopy(srcBuf.data, srcBuf.offset + srcBuf.cursor, destBuf.data, destBuf.offset + destBuf.cursor, lengthInBytes); + srcBuf.cursor += lengthInBytes; + destBuf.cursor += lengthInBytes; + + continue; + } + + // + // Handle Special Order 1. + // + if (code == SPECIAL_FGBG_1) { + if (firstLine) + writeFirstLineFgBgImage(bpp, destBuf, g_MaskSpecialFgBg1, fgPel, 8); + else + writeFgBgImage(bpp, destBuf, rowDelta, g_MaskSpecialFgBg1, fgPel, 8); + + continue; + } + + // + // Handle Special Order 2. + // + if (code == SPECIAL_FGBG_2) { + if (firstLine) + writeFirstLineFgBgImage(bpp, destBuf, g_MaskSpecialFgBg2, fgPel, 8); + else + writeFgBgImage(bpp, destBuf, rowDelta, g_MaskSpecialFgBg2, fgPel, 8); + + continue; + } + + // + // Handle White Order. + // + if (code == SPECIAL_WHITE) { + writePixel(bpp, destBuf, whitePixel); + + continue; + } + + // + // Handle Black Order. + // + if (code == SPECIAL_BLACK) { + writePixel(bpp, destBuf, blackPixel); + + continue; + } + + throw new RuntimeException("Unknown code: " + code + "."); + } + } + + /** + * Flip image in vertical direction. + */ + public static ByteBuffer flipRawImage(ByteBuffer src, int width, int height, int bpp) { + if (width * height * bpp != src.length) + throw new RuntimeException("Incorrect size of buffer. Expected size (imageWidth*imageHeight*bpp): " + (width * height * bpp) + ", actual size: " + + src.length + "."); + ByteBuffer dest = new ByteBuffer(new byte[src.length]); + + int scanLine = width * bpp; + + for (int i = 0; i < height; i++) { + // Copy one row + System.arraycopy(src.data, (height - i - 1) * scanLine, dest.data, i * scanLine, scanLine); } - if (runLength > 0) { - int bitmask = srcBuf.readUnsignedByte(); + return dest; - if (firstLine) - writeFirstLineFgBgImage(bpp, destBuf, bitmask, fgPel, runLength); - else - writeFgBgImage(bpp, destBuf, rowDelta, bitmask, fgPel, runLength); + } + + /** + * Example. + */ + public static void main(String args[]) { + + if (true) { + // 16x1@8bpp, all black + int width = 16, height = 1, depth = 8, bpp = depth / 8; + ByteBuffer src = new ByteBuffer(new byte[] {0x10}); + ByteBuffer dest = new AssertingByteBuffer(new byte[width * height * bpp]); + rleDecompress(src, dest, width, height, depth); } - continue; - } + if (true) { + // 16x1@16bpp, all black + int width = 16, height = 1, depth = 16, bpp = depth / 8; + ByteBuffer src = new ByteBuffer(new byte[] {0x0c, (byte)0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); + ByteBuffer dest = new AssertingByteBuffer(new byte[width * height * bpp]); + rleDecompress(src, dest, width, height, depth); + } - // - // Handle Color Image Orders. - // - if (code == REGULAR_COLOR_IMAGE | code == MEGA_MEGA_COLOR_IMAGE) { - int runLength = extractRunLength(code, orderHeader, srcBuf); + if (true) { + // 32x32@8 + int width = 32, height = 32, depth = 8, bpp = depth / 8; - /* DEBUG */ - // Copy bytes from source to destination using writeByte(readByte()) - // for (int byteCount = runLength * bpp; byteCount > 0; byteCount--) { - // destBuf.writeByte(srcBuf.readUnsignedByte()); - // } - /* DEBUG */ + ByteBuffer src = + new ByteBuffer(new byte[] {(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, + (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xec, (byte)0x6c, (byte)0x0e, (byte)0x0e, (byte)0x44, (byte)0x0e, + (byte)0x0e, (byte)0x0e, (byte)0x13, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, + (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xe4, (byte)0x04, (byte)0x06, (byte)0x8e, (byte)0x60, (byte)0x0e, (byte)0x60, (byte)0x8c, + (byte)0xb4, (byte)0xb5, (byte)0xdc, (byte)0xdc, (byte)0xbb, (byte)0xb4, (byte)0x8c, (byte)0x66, (byte)0x0b, (byte)0x6c, (byte)0xe4, (byte)0x04, + (byte)0x06, (byte)0x02, (byte)0x8b, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xf8, (byte)0x0e, (byte)0x66, + (byte)0xb4, (byte)0xdc, (byte)0x68, (byte)0xe2, (byte)0x97, (byte)0xdd, (byte)0xb4, (byte)0xa7, (byte)0x16, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x0b, (byte)0xae, (byte)0xdc, (byte)0xe9, (byte)0x6a, (byte)0xdc, (byte)0x96, (byte)0xe9, (byte)0xe9, (byte)0xb4, (byte)0x0e, (byte)0x00, + (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, + (byte)0x0e, (byte)0xae, (byte)0xdc, (byte)0xdb, (byte)0xdb, (byte)0xd0, (byte)0x09, (byte)0x07, (byte)0xcf, (byte)0x03, (byte)0x95, (byte)0xdb, + (byte)0xdb, (byte)0xdc, (byte)0xb4, (byte)0x66, (byte)0x6c, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, + (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x0b, (byte)0xae, (byte)0xdb, (byte)0xd4, (byte)0xd5, (byte)0x6c, (byte)0xdb, (byte)0x80, (byte)0xaf, + (byte)0xd5, (byte)0xd4, (byte)0xdb, (byte)0xb4, (byte)0x66, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xed, + (byte)0x06, (byte)0xed, (byte)0x66, (byte)0xae, (byte)0xd5, (byte)0xad, (byte)0xd4, (byte)0xd4, (byte)0xd5, (byte)0xd5, (byte)0xd5, (byte)0xdb, + (byte)0xb4, (byte)0xb4, (byte)0xb4, (byte)0xb4, (byte)0xb4, (byte)0xd5, (byte)0xd5, (byte)0xd5, (byte)0xd4, (byte)0xd4, (byte)0xad, (byte)0xd5, + (byte)0xb4, (byte)0x0e, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x60, (byte)0xa7, (byte)0xb4, + (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xb3, (byte)0xb3, (byte)0xd4, (byte)0xd4, (byte)0xb3, (byte)0x8c, (byte)0xb6, (byte)0x07, (byte)0xb6, + (byte)0x8c, (byte)0xb3, (byte)0xd4, (byte)0xb3, (byte)0xb3, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xb4, (byte)0xad, (byte)0x66, (byte)0x00, + (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0x66, (byte)0xae, (byte)0xad, (byte)0x8b, (byte)0xad, (byte)0xad, (byte)0xad, + (byte)0xad, (byte)0xad, (byte)0xb3, (byte)0xad, (byte)0xb5, (byte)0x07, (byte)0x07, (byte)0x07, (byte)0xf0, (byte)0x8b, (byte)0xad, (byte)0xad, + (byte)0xad, (byte)0xad, (byte)0xad, (byte)0x8b, (byte)0xa7, (byte)0xae, (byte)0xa7, (byte)0x6c, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, + (byte)0x6c, (byte)0xa7, (byte)0xad, (byte)0xa7, (byte)0xa7, (byte)0x8b, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, + (byte)0xb5, (byte)0xbd, (byte)0xbd, (byte)0xbd, (byte)0xbd, (byte)0xf0, (byte)0x8b, (byte)0x8b, (byte)0xad, (byte)0x8b, (byte)0x8b, (byte)0xa7, + (byte)0xa7, (byte)0xc8, (byte)0xc8, (byte)0x60, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x66, (byte)0xc8, (byte)0xa7, (byte)0x66, + (byte)0xa7, (byte)0xa7, (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0xad, (byte)0x8b, (byte)0x92, (byte)0xf1, (byte)0xf1, (byte)0xf1, + (byte)0xf1, (byte)0xf2, (byte)0x07, (byte)0xa7, (byte)0xa7, (byte)0x8b, (byte)0xa7, (byte)0xa7, (byte)0x66, (byte)0x66, (byte)0xc8, (byte)0x66, + (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x60, (byte)0xa7, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0xa7, + (byte)0xa7, (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0xa7, (byte)0xb6, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0x07, + (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0x6c, (byte)0x00, (byte)0x00, (byte)0x6c, + (byte)0x04, (byte)0xa7, (byte)0x60, (byte)0x6b, (byte)0x66, (byte)0x99, (byte)0xb6, (byte)0xf5, (byte)0xf5, (byte)0xf5, (byte)0xf5, (byte)0xf5, + (byte)0xef, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x60, + (byte)0xa7, (byte)0x66, (byte)0x60, (byte)0x66, (byte)0x66, (byte)0x8c, (byte)0xf1, (byte)0x6e, (byte)0xff, (byte)0x85, (byte)0xbd, (byte)0x66, + (byte)0x66, (byte)0x66, (byte)0x60, (byte)0x05, (byte)0x87, (byte)0x13, (byte)0x04, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xf4, + (byte)0x70, (byte)0xff, (byte)0x84, (byte)0xbd, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x05, (byte)0x85, (byte)0x0b, (byte)0xa7, (byte)0xb5, + (byte)0xae, (byte)0x8c, (byte)0xd0, (byte)0x13, (byte)0xc1, (byte)0x01, (byte)0x00, (byte)0x08, (byte)0x8e, (byte)0x8c, (byte)0xae, (byte)0xb5, + (byte)0xae, (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x6c, (byte)0xae, (byte)0xbc, (byte)0xb5, (byte)0xb5, (byte)0xae, (byte)0xb5, (byte)0xd0, + (byte)0x0e, (byte)0x0c, (byte)0x01, (byte)0x00, (byte)0x90, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xb5, (byte)0xb5, (byte)0xbc, (byte)0xb5, + (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0xae, (byte)0x0a, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0x68, (byte)0xae, (byte)0x82, + (byte)0x8c, (byte)0x0a, (byte)0x05, (byte)0x8c, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xbc, (byte)0xb5, + (byte)0x6c, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x05, (byte)0x81, (byte)0xd0, (byte)0x06, (byte)0x9a, (byte)0x8c, (byte)0x0a, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0x0a, + (byte)0xb5, (byte)0x6c, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x8b, (byte)0x0a, (byte)0xbc, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0x06, + (byte)0x9b, (byte)0xb6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb5, + (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0x0a, (byte)0x8c, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x6c, (byte)0xb5, (byte)0x0a, + (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0x05, (byte)0x80, (byte)0x7d, (byte)0xbc, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0x0a, (byte)0x0a, (byte)0x8b, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, (byte)0x87, (byte)0x0a, (byte)0xbc, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, + (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xd0, (byte)0xae, (byte)0xd0, (byte)0xb5, + (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xbc, (byte)0x1a, (byte)0xb5, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xed, (byte)0x06, + (byte)0x6e, (byte)0xb5, (byte)0x0a, (byte)0xbc, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, (byte)0xd0, (byte)0xd0, (byte)0xb5, + (byte)0xf4, (byte)0xff, (byte)0xf2, (byte)0xd0, (byte)0xd0, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xbc, (byte)0x0a, + (byte)0x0a, (byte)0x8b, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x8b, (byte)0xbc, (byte)0x1a, + (byte)0x0a, (byte)0xb6, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, + (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xb6, (byte)0x0a, (byte)0xde, (byte)0x0a, (byte)0xa7, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x8b, (byte)0xbc, (byte)0xf2, (byte)0x0a, (byte)0xb6, (byte)0xb6, + (byte)0xb6, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, + (byte)0x0a, (byte)0xf2, (byte)0x1a, (byte)0x8c, (byte)0xec, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0xa7, (byte)0xbc, (byte)0x1a, (byte)0x0a, (byte)0x0a, (byte)0x6a, (byte)0xb6, (byte)0x96, (byte)0x0a, + (byte)0x0a, (byte)0xf2, (byte)0x0a, (byte)0x87, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, + (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x8c, (byte)0xb6, (byte)0xf4, (byte)0xf2, (byte)0xd0, (byte)0x09, (byte)0xbc, + (byte)0x87, (byte)0x03, (byte)0x80, (byte)0x2c, (byte)0xde, (byte)0xf4, (byte)0x0a, (byte)0x8b, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x6c, + (byte)0x87, (byte)0x0a, (byte)0xf4, (byte)0xf4, (byte)0xf2, (byte)0xde, (byte)0xbd, (byte)0xbd, (byte)0xde, (byte)0xf2, (byte)0xf4, (byte)0xf4, + (byte)0x0a, (byte)0xd0, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x00, (byte)0x00, + (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x6c, (byte)0x8c, (byte)0xb5, + (byte)0xbc, (byte)0x0a, (byte)0xde, (byte)0xf2, (byte)0xbd, (byte)0x0a, (byte)0xb5, (byte)0x8c, (byte)0x6c, (byte)0x06, (byte)0xed, (byte)0x06, + (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xe6, (byte)0x04, (byte)0x06, (byte)0x86, + (byte)0x04, (byte)0x6c, (byte)0x04, (byte)0x8b, (byte)0x04, (byte)0x6c, (byte)0xe6, (byte)0x04, (byte)0x06, (byte)0x82, (byte)0x00, (byte)0x00 - // Copy bytes from source to destination directly using arraycopy() - int lengthInBytes = runLength * bpp; - System.arraycopy(srcBuf.data, srcBuf.offset + srcBuf.cursor, destBuf.data, destBuf.offset + destBuf.cursor, lengthInBytes); - srcBuf.cursor += lengthInBytes; - destBuf.cursor += lengthInBytes; + }); - continue; - } + ByteBuffer flippedImage = + new ByteBuffer(new byte[] {(byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x6c, (byte)0x04, (byte)0x8b, (byte)0x04, (byte)0x6c, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x6c, (byte)0x8c, (byte)0xb5, (byte)0xbc, (byte)0x0a, + (byte)0xde, (byte)0xf2, (byte)0xbd, (byte)0x0a, (byte)0xb5, (byte)0x8c, (byte)0x6c, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x04, (byte)0x6c, (byte)0x87, (byte)0x0a, (byte)0xf4, (byte)0xf4, (byte)0xf2, (byte)0xde, (byte)0xbd, (byte)0xbd, (byte)0xde, (byte)0xf2, + (byte)0xf4, (byte)0xf4, (byte)0x0a, (byte)0xd0, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x8c, (byte)0xb6, (byte)0xf4, (byte)0xf2, + (byte)0x0a, (byte)0x0a, (byte)0x0a, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0x0a, (byte)0x0a, (byte)0x0a, (byte)0xde, (byte)0xf4, + (byte)0x0a, (byte)0x8b, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0xa7, (byte)0xbc, (byte)0x1a, (byte)0x0a, (byte)0x0a, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, + (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0x0a, (byte)0x0a, (byte)0xf2, (byte)0x0a, (byte)0x87, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x8b, (byte)0xbc, + (byte)0xf2, (byte)0x0a, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, + (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0xb6, (byte)0x0a, (byte)0xf2, (byte)0x1a, (byte)0x8c, (byte)0xec, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x8b, (byte)0xbc, (byte)0x1a, (byte)0x0a, (byte)0xb6, (byte)0xb6, (byte)0xb5, + (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, + (byte)0xb6, (byte)0x0a, (byte)0xde, (byte)0x0a, (byte)0xa7, (byte)0x06, (byte)0x00, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xed, (byte)0x06, + (byte)0x6e, (byte)0xb5, (byte)0x0a, (byte)0xbc, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, (byte)0xd0, (byte)0xd0, (byte)0xb5, + (byte)0xf4, (byte)0xff, (byte)0xf2, (byte)0xd0, (byte)0xd0, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xbc, (byte)0x0a, + (byte)0x0a, (byte)0x8b, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, (byte)0x87, (byte)0x0a, (byte)0xbc, (byte)0xb6, + (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xd0, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, + (byte)0xd0, (byte)0xae, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0xbc, (byte)0x1a, (byte)0xb5, (byte)0x04, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x6c, (byte)0xb5, (byte)0x0a, (byte)0xb6, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xae, (byte)0xae, + (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xbc, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xae, + (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xb6, (byte)0x0a, (byte)0x0a, (byte)0x8b, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x8b, + (byte)0x0a, (byte)0xbc, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb6, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xb5, (byte)0xb5, (byte)0xb5, + (byte)0xb6, (byte)0x0a, (byte)0x8c, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0xae, (byte)0x0a, (byte)0xb5, (byte)0xb5, (byte)0xb5, + (byte)0xd0, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0x8c, (byte)0x0a, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xd0, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0x0a, (byte)0xb5, (byte)0x6c, + (byte)0x00, (byte)0x00, (byte)0x04, (byte)0xae, (byte)0x0a, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, + (byte)0xae, (byte)0xae, (byte)0xae, (byte)0xae, (byte)0x8c, (byte)0x0a, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, + (byte)0xae, (byte)0xae, (byte)0xb5, (byte)0xb5, (byte)0xb5, (byte)0xbc, (byte)0xb5, (byte)0x6c, (byte)0x00, (byte)0x00, (byte)0x6c, (byte)0xae, + (byte)0xbc, (byte)0xb5, (byte)0xb5, (byte)0xae, (byte)0xb5, (byte)0xf3, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xf2, (byte)0xae, (byte)0xae, (byte)0xb5, + (byte)0xb5, (byte)0xbc, (byte)0xb5, (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x0b, (byte)0xa7, (byte)0xb5, (byte)0xae, (byte)0x8c, (byte)0xa7, + (byte)0xf4, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xbd, (byte)0xa7, (byte)0x8c, (byte)0xae, (byte)0xb5, (byte)0xae, (byte)0x66, + (byte)0x00, (byte)0x00, (byte)0x13, (byte)0x04, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xf4, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xbd, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x60, (byte)0xa7, + (byte)0x66, (byte)0x60, (byte)0x66, (byte)0x66, (byte)0x8c, (byte)0xf1, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xbd, (byte)0x66, (byte)0x66, (byte)0x66, + (byte)0x60, (byte)0x66, (byte)0xa7, (byte)0x66, (byte)0x00, (byte)0x00, (byte)0x6c, (byte)0x04, (byte)0xa7, (byte)0x60, (byte)0x66, (byte)0x66, + (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xb6, (byte)0xf5, (byte)0xf5, + (byte)0xf5, (byte)0xf5, (byte)0xf5, (byte)0xef, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0x66, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x60, (byte)0xa7, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0xa7, (byte)0xa7, + (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0xa7, (byte)0xb6, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0xf3, (byte)0x07, (byte)0x66, + (byte)0xa7, (byte)0xa7, (byte)0x66, (byte)0x66, (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0x6c, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x66, + (byte)0xc8, (byte)0xa7, (byte)0x66, (byte)0xa7, (byte)0xa7, (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0x8b, (byte)0xad, (byte)0x8b, (byte)0x92, + (byte)0xf1, (byte)0xf1, (byte)0xf1, (byte)0xf1, (byte)0xf2, (byte)0x07, (byte)0xa7, (byte)0xa7, (byte)0x8b, (byte)0xa7, (byte)0xa7, (byte)0x66, + (byte)0x66, (byte)0xc8, (byte)0x66, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x6c, (byte)0xa7, (byte)0xad, (byte)0xa7, (byte)0xa7, + (byte)0x8b, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xb5, (byte)0xbd, (byte)0xbd, (byte)0xbd, (byte)0xbd, + (byte)0xf0, (byte)0x8b, (byte)0x8b, (byte)0xad, (byte)0x8b, (byte)0x8b, (byte)0xa7, (byte)0xa7, (byte)0xc8, (byte)0xc8, (byte)0x60, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0x66, (byte)0xae, (byte)0xad, (byte)0x8b, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xad, + (byte)0xad, (byte)0xb3, (byte)0xad, (byte)0xb5, (byte)0x07, (byte)0x07, (byte)0x07, (byte)0xf0, (byte)0x8b, (byte)0xad, (byte)0xad, (byte)0xad, + (byte)0xad, (byte)0xad, (byte)0x8b, (byte)0xa7, (byte)0xae, (byte)0xa7, (byte)0x6c, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, + (byte)0x60, (byte)0xa7, (byte)0xb4, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xb3, (byte)0xb3, (byte)0xd4, (byte)0xd4, (byte)0xb3, (byte)0x8c, + (byte)0xb6, (byte)0x07, (byte)0xb6, (byte)0x8c, (byte)0xb3, (byte)0xd4, (byte)0xb3, (byte)0xb3, (byte)0xad, (byte)0xad, (byte)0xad, (byte)0xb4, + (byte)0xad, (byte)0x66, (byte)0x00, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x66, (byte)0xae, (byte)0xd5, + (byte)0xad, (byte)0xd4, (byte)0xd4, (byte)0xd5, (byte)0xd5, (byte)0xd5, (byte)0xdb, (byte)0xb4, (byte)0xb4, (byte)0xb4, (byte)0xb4, (byte)0xb4, + (byte)0xd5, (byte)0xd5, (byte)0xd5, (byte)0xd4, (byte)0xd4, (byte)0xad, (byte)0xd5, (byte)0xb4, (byte)0x0e, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x0b, (byte)0xae, (byte)0xdb, (byte)0xd4, (byte)0xd5, (byte)0xdb, + (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xd5, + (byte)0xd4, (byte)0xdb, (byte)0xb4, (byte)0x66, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x0e, (byte)0xae, (byte)0xdc, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, + (byte)0xdc, (byte)0xdc, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdb, (byte)0xdc, (byte)0xb4, (byte)0x66, (byte)0x6c, + (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x0b, (byte)0xae, (byte)0xdc, (byte)0xe9, (byte)0xdc, (byte)0xdc, (byte)0xdc, (byte)0xdc, (byte)0xdc, (byte)0xdc, (byte)0xdc, (byte)0xdc, + (byte)0xdc, (byte)0xdc, (byte)0xe9, (byte)0xe9, (byte)0xb4, (byte)0x0e, (byte)0x00, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xf8, (byte)0x0e, (byte)0x66, (byte)0xb4, + (byte)0xdc, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xe2, (byte)0xdd, (byte)0xb4, (byte)0xa7, + (byte)0x16, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x60, (byte)0x0e, (byte)0x60, (byte)0x8c, (byte)0xb4, (byte)0xb5, + (byte)0xdc, (byte)0xdc, (byte)0xbb, (byte)0xb4, (byte)0x8c, (byte)0x66, (byte)0x0b, (byte)0x6c, (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, + (byte)0x04, (byte)0x06, (byte)0x04, (byte)0x06, (byte)0x00, (byte)0x00, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xec, (byte)0x6c, (byte)0x0e, (byte)0x0e, (byte)0x44, (byte)0x0e, (byte)0x0e, (byte)0x0e, + (byte)0x13, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, (byte)0xed, (byte)0x06, (byte)0x06, (byte)0x06, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00}); + ByteBuffer dest = new AssertingByteBuffer(flipRawImage(flippedImage, width, height, bpp).data); - // - // Handle Special Order 1. - // - if (code == SPECIAL_FGBG_1) { - if (firstLine) - writeFirstLineFgBgImage(bpp, destBuf, g_MaskSpecialFgBg1, fgPel, 8); - else - writeFgBgImage(bpp, destBuf, rowDelta, g_MaskSpecialFgBg1, fgPel, 8); + rleDecompress(src, dest, width, height, depth); - continue; - } + } - // - // Handle Special Order 2. - // - if (code == SPECIAL_FGBG_2) { - if (firstLine) - writeFirstLineFgBgImage(bpp, destBuf, g_MaskSpecialFgBg2, fgPel, 8); - else - writeFgBgImage(bpp, destBuf, rowDelta, g_MaskSpecialFgBg2, fgPel, 8); + if (true) { + // 32x32@16 + int width = 32, height = 32, depth = 16; - continue; - } + ByteBuffer src = + new ByteBuffer(new byte[] {(byte)0x85, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x06, (byte)0x8b, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x06, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0x16, + (byte)0x69, (byte)0x99, (byte)0xd6, (byte)0x06, (byte)0x69, (byte)0x99, (byte)0xd6, (byte)0x04, (byte)0xcc, (byte)0x89, (byte)0x52, (byte)0x03, + (byte)0x6e, (byte)0xff, (byte)0xff, (byte)0x02, (byte)0x6e, (byte)0x08, (byte)0x42, (byte)0x01, (byte)0x70, (byte)0x08, (byte)0x42, (byte)0x71, + (byte)0xff, (byte)0xff, (byte)0xce, (byte)0x18, (byte)0xc6, (byte)0x01, (byte)0x81, (byte)0x08, (byte)0x42, (byte)0xce, (byte)0x66, (byte)0x29, + (byte)0x02, (byte)0xcd, (byte)0x89, (byte)0x52, (byte)0x03, (byte)0x88, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, + (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0xd8, (byte)0x99, + (byte)0xd6, (byte)0x03, (byte)0xf8, (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x66, (byte)0x99, (byte)0xd6, + (byte)0x05, (byte)0x6a, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0xc4, (byte)0xcc, (byte)0x89, (byte)0x52, (byte)0x03, (byte)0x6e, (byte)0xff, + (byte)0xff, (byte)0x02, (byte)0x6e, (byte)0x08, (byte)0x42, (byte)0x01, (byte)0x70, (byte)0x08, (byte)0x42, (byte)0x71, (byte)0xff, (byte)0xff, + (byte)0xce, (byte)0x18, (byte)0xc6, (byte)0x01, (byte)0x81, (byte)0x08, (byte)0x42, (byte)0xce, (byte)0x66, (byte)0x29, (byte)0x02, (byte)0xcd, + (byte)0x89, (byte)0x52, (byte)0x03, (byte)0x00, (byte)0x04, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xc3, (byte)0x80, (byte)0x61, (byte)0x00, + (byte)0xa5, (byte)0x80, (byte)0x40, (byte)0xec, (byte)0x52, (byte)0x00, (byte)0x5a, (byte)0x00, (byte)0x2d, (byte)0x00, (byte)0x24, (byte)0x00, + (byte)0x12, (byte)0x00, (byte)0x24, (byte)0x00, (byte)0x12, (byte)0x00, (byte)0x5a, (byte)0x00, (byte)0x2d, (byte)0x00, (byte)0xa5, (byte)0x80, + (byte)0x52, (byte)0x00, (byte)0xc3, (byte)0x80, (byte)0x61, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0xcc, (byte)0x89, + (byte)0x52, (byte)0x03, (byte)0x6e, (byte)0xff, (byte)0xff, (byte)0x02, (byte)0xcb, (byte)0x18, (byte)0xc6, (byte)0x84, (byte)0x08, (byte)0x42, + (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0xff, (byte)0xff,}); - // - // Handle White Order. - // - if (code == SPECIAL_WHITE) { - writePixel(bpp, destBuf, whitePixel); + ByteBuffer dest = + new AssertingByteBuffer(new byte[] {(byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0xff, (byte)0xff, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0xff, (byte)0xff, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, + (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, + (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x99, (byte)0xd6, (byte)0x10, (byte)0x84, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x10, + (byte)0x84, (byte)0x10, (byte)0x84, (byte)0x99, (byte)0xd6, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, + (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0x08, (byte)0x42, (byte)0xff, (byte)0xff,}); - continue; - } + rleDecompress(src, dest, width, height, depth); - // - // Handle Black Order. - // - if (code == SPECIAL_BLACK) { - writePixel(bpp, destBuf, blackPixel); - - continue; - } - - throw new RuntimeException("Unknown code: " + code + "."); + } } - } - - /** - * Flip image in vertical direction. - */ - public static ByteBuffer flipRawImage(ByteBuffer src, int width, int height, int bpp) { - if (width * height * bpp != src.length) - throw new RuntimeException("Incorrect size of buffer. Expected size (imageWidth*imageHeight*bpp): " + (width * height * bpp) + ", actual size: " - + src.length + "."); - ByteBuffer dest = new ByteBuffer(new byte[src.length]); - - int scanLine = width * bpp; - - for (int i = 0; i < height; i++) { - // Copy one row - System.arraycopy(src.data, (height - i - 1) * scanLine, dest.data, i * scanLine, scanLine); - } - - return dest; - - } - - /** - * Example. - */ - public static void main(String args[]) { - - if (true) { - // 16x1@8bpp, all black - int width = 16, height = 1, depth = 8, bpp = depth / 8; - ByteBuffer src = new ByteBuffer(new byte[] { 0x10 }); - ByteBuffer dest = new AssertingByteBuffer(new byte[width * height * bpp]); - rleDecompress(src, dest, width, height, depth); - } - - if (true) { - // 16x1@16bpp, all black - int width = 16, height = 1, depth = 16, bpp = depth / 8; - ByteBuffer src = new ByteBuffer(new byte[] { 0x0c, (byte) 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }); - ByteBuffer dest = new AssertingByteBuffer(new byte[width * height * bpp]); - rleDecompress(src, dest, width, height, depth); - } - - if (true) { - // 32x32@8 - int width = 32, height = 32, depth = 8, bpp = depth / 8; - - ByteBuffer src = new ByteBuffer(new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x80, (byte) 0x00, (byte) 0x06, (byte) 0x06, - (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xec, (byte) 0x6c, (byte) 0x0e, - (byte) 0x0e, (byte) 0x44, (byte) 0x0e, (byte) 0x0e, (byte) 0x0e, (byte) 0x13, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, - (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xe4, (byte) 0x04, (byte) 0x06, - (byte) 0x8e, (byte) 0x60, (byte) 0x0e, (byte) 0x60, (byte) 0x8c, (byte) 0xb4, (byte) 0xb5, (byte) 0xdc, (byte) 0xdc, (byte) 0xbb, (byte) 0xb4, - (byte) 0x8c, (byte) 0x66, (byte) 0x0b, (byte) 0x6c, (byte) 0xe4, (byte) 0x04, (byte) 0x06, (byte) 0x02, (byte) 0x8b, (byte) 0x06, (byte) 0x06, - (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xf8, (byte) 0x0e, (byte) 0x66, (byte) 0xb4, (byte) 0xdc, (byte) 0x68, (byte) 0xe2, - (byte) 0x97, (byte) 0xdd, (byte) 0xb4, (byte) 0xa7, (byte) 0x16, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, - (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x0b, (byte) 0xae, - (byte) 0xdc, (byte) 0xe9, (byte) 0x6a, (byte) 0xdc, (byte) 0x96, (byte) 0xe9, (byte) 0xe9, (byte) 0xb4, (byte) 0x0e, (byte) 0x00, (byte) 0x06, - (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, - (byte) 0x0e, (byte) 0xae, (byte) 0xdc, (byte) 0xdb, (byte) 0xdb, (byte) 0xd0, (byte) 0x09, (byte) 0x07, (byte) 0xcf, (byte) 0x03, (byte) 0x95, - (byte) 0xdb, (byte) 0xdb, (byte) 0xdc, (byte) 0xb4, (byte) 0x66, (byte) 0x6c, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, - (byte) 0x00, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x0b, (byte) 0xae, (byte) 0xdb, (byte) 0xd4, (byte) 0xd5, (byte) 0x6c, - (byte) 0xdb, (byte) 0x80, (byte) 0xaf, (byte) 0xd5, (byte) 0xd4, (byte) 0xdb, (byte) 0xb4, (byte) 0x66, (byte) 0x04, (byte) 0x06, (byte) 0x04, - (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x66, (byte) 0xae, (byte) 0xd5, (byte) 0xad, (byte) 0xd4, - (byte) 0xd4, (byte) 0xd5, (byte) 0xd5, (byte) 0xd5, (byte) 0xdb, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xd5, - (byte) 0xd5, (byte) 0xd5, (byte) 0xd4, (byte) 0xd4, (byte) 0xad, (byte) 0xd5, (byte) 0xb4, (byte) 0x0e, (byte) 0x06, (byte) 0x06, (byte) 0x06, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x60, (byte) 0xa7, (byte) 0xb4, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xb3, - (byte) 0xb3, (byte) 0xd4, (byte) 0xd4, (byte) 0xb3, (byte) 0x8c, (byte) 0xb6, (byte) 0x07, (byte) 0xb6, (byte) 0x8c, (byte) 0xb3, (byte) 0xd4, - (byte) 0xb3, (byte) 0xb3, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xb4, (byte) 0xad, (byte) 0x66, (byte) 0x00, (byte) 0x06, (byte) 0x00, - (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0x66, (byte) 0xae, (byte) 0xad, (byte) 0x8b, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, - (byte) 0xad, (byte) 0xb3, (byte) 0xad, (byte) 0xb5, (byte) 0x07, (byte) 0x07, (byte) 0x07, (byte) 0xf0, (byte) 0x8b, (byte) 0xad, (byte) 0xad, - (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0x8b, (byte) 0xa7, (byte) 0xae, (byte) 0xa7, (byte) 0x6c, (byte) 0x06, (byte) 0x00, (byte) 0x00, - (byte) 0x04, (byte) 0x6c, (byte) 0xa7, (byte) 0xad, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, - (byte) 0xad, (byte) 0xad, (byte) 0xb5, (byte) 0xbd, (byte) 0xbd, (byte) 0xbd, (byte) 0xbd, (byte) 0xf0, (byte) 0x8b, (byte) 0x8b, (byte) 0xad, - (byte) 0x8b, (byte) 0x8b, (byte) 0xa7, (byte) 0xa7, (byte) 0xc8, (byte) 0xc8, (byte) 0x60, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, - (byte) 0x66, (byte) 0xc8, (byte) 0xa7, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, (byte) 0xad, - (byte) 0x8b, (byte) 0x92, (byte) 0xf1, (byte) 0xf1, (byte) 0xf1, (byte) 0xf1, (byte) 0xf2, (byte) 0x07, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, - (byte) 0xa7, (byte) 0xa7, (byte) 0x66, (byte) 0x66, (byte) 0xc8, (byte) 0x66, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x60, - (byte) 0xa7, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, - (byte) 0xa7, (byte) 0xb6, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0x07, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0x6c, (byte) 0x00, (byte) 0x00, (byte) 0x6c, (byte) 0x04, (byte) 0xa7, - (byte) 0x60, (byte) 0x6b, (byte) 0x66, (byte) 0x99, (byte) 0xb6, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xef, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x60, - (byte) 0xa7, (byte) 0x66, (byte) 0x60, (byte) 0x66, (byte) 0x66, (byte) 0x8c, (byte) 0xf1, (byte) 0x6e, (byte) 0xff, (byte) 0x85, (byte) 0xbd, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x60, (byte) 0x05, (byte) 0x87, (byte) 0x13, (byte) 0x04, (byte) 0x66, (byte) 0x66, (byte) 0x66, - (byte) 0x66, (byte) 0xf4, (byte) 0x70, (byte) 0xff, (byte) 0x84, (byte) 0xbd, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x05, (byte) 0x85, - (byte) 0x0b, (byte) 0xa7, (byte) 0xb5, (byte) 0xae, (byte) 0x8c, (byte) 0xd0, (byte) 0x13, (byte) 0xc1, (byte) 0x01, (byte) 0x00, (byte) 0x08, - (byte) 0x8e, (byte) 0x8c, (byte) 0xae, (byte) 0xb5, (byte) 0xae, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x6c, (byte) 0xae, (byte) 0xbc, - (byte) 0xb5, (byte) 0xb5, (byte) 0xae, (byte) 0xb5, (byte) 0xd0, (byte) 0x0e, (byte) 0x0c, (byte) 0x01, (byte) 0x00, (byte) 0x90, (byte) 0xf2, - (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xbc, (byte) 0xb5, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0xae, - (byte) 0x0a, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0x68, (byte) 0xae, (byte) 0x82, (byte) 0x8c, (byte) 0x0a, (byte) 0x05, (byte) 0x8c, - (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xbc, (byte) 0xb5, (byte) 0x6c, (byte) 0x00, (byte) 0x00, - (byte) 0x06, (byte) 0x05, (byte) 0x81, (byte) 0xd0, (byte) 0x06, (byte) 0x9a, (byte) 0x8c, (byte) 0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0x0a, (byte) 0xb5, - (byte) 0x6c, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x8b, (byte) 0x0a, (byte) 0xbc, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0x06, - (byte) 0x9b, (byte) 0xb6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xae, - (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0x0a, (byte) 0x8c, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x6c, - (byte) 0xb5, (byte) 0x0a, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0x05, (byte) 0x80, (byte) 0x7d, (byte) 0xbc, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, - (byte) 0x0a, (byte) 0x0a, (byte) 0x8b, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x06, (byte) 0x87, (byte) 0x0a, (byte) 0xbc, - (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb6, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xf2, (byte) 0xd0, (byte) 0xae, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xbc, (byte) 0x1a, - (byte) 0xb5, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xed, (byte) 0x06, (byte) 0x6e, (byte) 0xb5, (byte) 0x0a, (byte) 0xbc, - (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, (byte) 0xd0, (byte) 0xd0, (byte) 0xb5, (byte) 0xf4, (byte) 0xff, (byte) 0xf2, - (byte) 0xd0, (byte) 0xd0, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xbc, (byte) 0x0a, (byte) 0x0a, (byte) 0x8b, - (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x8b, (byte) 0xbc, (byte) 0x1a, (byte) 0x0a, - (byte) 0xb6, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, - (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, (byte) 0xde, (byte) 0x0a, (byte) 0xa7, (byte) 0x06, (byte) 0x00, - (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x8b, (byte) 0xbc, (byte) 0xf2, (byte) 0x0a, - (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, - (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, (byte) 0xf2, (byte) 0x1a, (byte) 0x8c, (byte) 0xec, (byte) 0x06, (byte) 0x06, (byte) 0x06, - (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0xa7, (byte) 0xbc, (byte) 0x1a, (byte) 0x0a, - (byte) 0x0a, (byte) 0x6a, (byte) 0xb6, (byte) 0x96, (byte) 0x0a, (byte) 0x0a, (byte) 0xf2, (byte) 0x0a, (byte) 0x87, (byte) 0x06, (byte) 0x04, - (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, - (byte) 0x8c, (byte) 0xb6, (byte) 0xf4, (byte) 0xf2, (byte) 0xd0, (byte) 0x09, (byte) 0xbc, (byte) 0x87, (byte) 0x03, (byte) 0x80, (byte) 0x2c, - (byte) 0xde, (byte) 0xf4, (byte) 0x0a, (byte) 0x8b, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x6c, (byte) 0x87, (byte) 0x0a, - (byte) 0xf4, (byte) 0xf4, (byte) 0xf2, (byte) 0xde, (byte) 0xbd, (byte) 0xbd, (byte) 0xde, (byte) 0xf2, (byte) 0xf4, (byte) 0xf4, (byte) 0x0a, - (byte) 0xd0, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00, - (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x6c, (byte) 0x8c, - (byte) 0xb5, (byte) 0xbc, (byte) 0x0a, (byte) 0xde, (byte) 0xf2, (byte) 0xbd, (byte) 0x0a, (byte) 0xb5, (byte) 0x8c, (byte) 0x6c, (byte) 0x06, - (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xe6, - (byte) 0x04, (byte) 0x06, (byte) 0x86, (byte) 0x04, (byte) 0x6c, (byte) 0x04, (byte) 0x8b, (byte) 0x04, (byte) 0x6c, (byte) 0xe6, (byte) 0x04, - (byte) 0x06, (byte) 0x82, (byte) 0x00, (byte) 0x00 - - }); - - ByteBuffer flippedImage = new ByteBuffer(new byte[] { (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, - (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x6c, (byte) 0x04, (byte) 0x8b, (byte) 0x04, (byte) 0x6c, - (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, - (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, - (byte) 0x06, (byte) 0x6c, (byte) 0x8c, (byte) 0xb5, (byte) 0xbc, (byte) 0x0a, (byte) 0xde, (byte) 0xf2, (byte) 0xbd, (byte) 0x0a, (byte) 0xb5, - (byte) 0x8c, (byte) 0x6c, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x6c, (byte) 0x87, - (byte) 0x0a, (byte) 0xf4, (byte) 0xf4, (byte) 0xf2, (byte) 0xde, (byte) 0xbd, (byte) 0xbd, (byte) 0xde, (byte) 0xf2, (byte) 0xf4, (byte) 0xf4, - (byte) 0x0a, (byte) 0xd0, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x00, - (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x8c, (byte) 0xb6, (byte) 0xf4, (byte) 0xf2, - (byte) 0x0a, (byte) 0x0a, (byte) 0x0a, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, (byte) 0x0a, (byte) 0x0a, (byte) 0xde, - (byte) 0xf4, (byte) 0x0a, (byte) 0x8b, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x00, (byte) 0x00, - (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0xa7, (byte) 0xbc, (byte) 0x1a, (byte) 0x0a, (byte) 0x0a, (byte) 0xb6, - (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, (byte) 0x0a, - (byte) 0xf2, (byte) 0x0a, (byte) 0x87, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, - (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x8b, (byte) 0xbc, (byte) 0xf2, (byte) 0x0a, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, - (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, - (byte) 0xf2, (byte) 0x1a, (byte) 0x8c, (byte) 0xec, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, - (byte) 0x04, (byte) 0x8b, (byte) 0xbc, (byte) 0x1a, (byte) 0x0a, (byte) 0xb6, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, - (byte) 0xb5, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xb6, (byte) 0x0a, - (byte) 0xde, (byte) 0x0a, (byte) 0xa7, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xed, (byte) 0x06, (byte) 0x6e, - (byte) 0xb5, (byte) 0x0a, (byte) 0xbc, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, (byte) 0xd0, (byte) 0xd0, (byte) 0xb5, - (byte) 0xf4, (byte) 0xff, (byte) 0xf2, (byte) 0xd0, (byte) 0xd0, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xbc, - (byte) 0x0a, (byte) 0x0a, (byte) 0x8b, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x06, (byte) 0x87, (byte) 0x0a, - (byte) 0xbc, (byte) 0xb6, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb6, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xd0, (byte) 0xae, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0xbc, - (byte) 0x1a, (byte) 0xb5, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x6c, (byte) 0xb5, (byte) 0x0a, (byte) 0xb6, - (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xbc, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0x0a, - (byte) 0x0a, (byte) 0x8b, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x8b, (byte) 0x0a, (byte) 0xbc, (byte) 0xb5, (byte) 0xb5, - (byte) 0xb5, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb6, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xb6, (byte) 0x0a, - (byte) 0x8c, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0xae, (byte) 0x0a, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xd0, - (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0x8c, (byte) 0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xd0, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0x0a, (byte) 0xb5, - (byte) 0x6c, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0xae, (byte) 0x0a, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xae, (byte) 0xae, - (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0xae, (byte) 0x8c, (byte) 0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xb5, (byte) 0xbc, (byte) 0xb5, (byte) 0x6c, - (byte) 0x00, (byte) 0x00, (byte) 0x6c, (byte) 0xae, (byte) 0xbc, (byte) 0xb5, (byte) 0xb5, (byte) 0xae, (byte) 0xb5, (byte) 0xf3, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xf2, (byte) 0xae, (byte) 0xae, (byte) 0xb5, (byte) 0xb5, (byte) 0xbc, (byte) 0xb5, (byte) 0x66, (byte) 0x00, - (byte) 0x00, (byte) 0x0b, (byte) 0xa7, (byte) 0xb5, (byte) 0xae, (byte) 0x8c, (byte) 0xa7, (byte) 0xf4, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xbd, (byte) 0xa7, (byte) 0x8c, (byte) 0xae, (byte) 0xb5, (byte) 0xae, (byte) 0x66, (byte) 0x00, (byte) 0x00, - (byte) 0x13, (byte) 0x04, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xf4, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xbd, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x60, - (byte) 0xa7, (byte) 0x66, (byte) 0x60, (byte) 0x66, (byte) 0x66, (byte) 0x8c, (byte) 0xf1, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xbd, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x60, (byte) 0x66, (byte) 0xa7, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x6c, (byte) 0x04, - (byte) 0xa7, (byte) 0x60, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, - (byte) 0x66, (byte) 0x66, (byte) 0xb6, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xf5, (byte) 0xef, (byte) 0x66, (byte) 0x66, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0x66, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x60, (byte) 0xa7, - (byte) 0x66, (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, (byte) 0xa7, - (byte) 0xb6, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0xf3, (byte) 0x07, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0x66, - (byte) 0x66, (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0x6c, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x66, (byte) 0xc8, (byte) 0xa7, - (byte) 0x66, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, (byte) 0x8b, (byte) 0xad, (byte) 0x8b, (byte) 0x92, (byte) 0xf1, - (byte) 0xf1, (byte) 0xf1, (byte) 0xf1, (byte) 0xf2, (byte) 0x07, (byte) 0xa7, (byte) 0xa7, (byte) 0x8b, (byte) 0xa7, (byte) 0xa7, (byte) 0x66, - (byte) 0x66, (byte) 0xc8, (byte) 0x66, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x6c, (byte) 0xa7, (byte) 0xad, (byte) 0xa7, - (byte) 0xa7, (byte) 0x8b, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xb5, (byte) 0xbd, (byte) 0xbd, - (byte) 0xbd, (byte) 0xbd, (byte) 0xf0, (byte) 0x8b, (byte) 0x8b, (byte) 0xad, (byte) 0x8b, (byte) 0x8b, (byte) 0xa7, (byte) 0xa7, (byte) 0xc8, - (byte) 0xc8, (byte) 0x60, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0x66, (byte) 0xae, (byte) 0xad, (byte) 0x8b, - (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xb3, (byte) 0xad, (byte) 0xb5, (byte) 0x07, (byte) 0x07, (byte) 0x07, - (byte) 0xf0, (byte) 0x8b, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0x8b, (byte) 0xa7, (byte) 0xae, (byte) 0xa7, - (byte) 0x6c, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x60, (byte) 0xa7, (byte) 0xb4, (byte) 0xad, (byte) 0xad, - (byte) 0xad, (byte) 0xb3, (byte) 0xb3, (byte) 0xd4, (byte) 0xd4, (byte) 0xb3, (byte) 0x8c, (byte) 0xb6, (byte) 0x07, (byte) 0xb6, (byte) 0x8c, - (byte) 0xb3, (byte) 0xd4, (byte) 0xb3, (byte) 0xb3, (byte) 0xad, (byte) 0xad, (byte) 0xad, (byte) 0xb4, (byte) 0xad, (byte) 0x66, (byte) 0x00, - (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x66, (byte) 0xae, (byte) 0xd5, (byte) 0xad, (byte) 0xd4, - (byte) 0xd4, (byte) 0xd5, (byte) 0xd5, (byte) 0xd5, (byte) 0xdb, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xb4, (byte) 0xd5, - (byte) 0xd5, (byte) 0xd5, (byte) 0xd4, (byte) 0xd4, (byte) 0xad, (byte) 0xd5, (byte) 0xb4, (byte) 0x0e, (byte) 0x06, (byte) 0x06, (byte) 0x06, - (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x0b, (byte) 0xae, (byte) 0xdb, (byte) 0xd4, (byte) 0xd5, - (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, - (byte) 0xdb, (byte) 0xd5, (byte) 0xd4, (byte) 0xdb, (byte) 0xb4, (byte) 0x66, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, - (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x0e, (byte) 0xae, (byte) 0xdc, (byte) 0xdb, (byte) 0xdb, - (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdc, (byte) 0xdc, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, (byte) 0xdb, - (byte) 0xdb, (byte) 0xdc, (byte) 0xb4, (byte) 0x66, (byte) 0x6c, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x0b, (byte) 0xae, (byte) 0xdc, (byte) 0xe9, (byte) 0xdc, - (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xdc, (byte) 0xe9, (byte) 0xe9, - (byte) 0xb4, (byte) 0x0e, (byte) 0x00, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, - (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xf8, (byte) 0x0e, (byte) 0x66, (byte) 0xb4, (byte) 0xdc, (byte) 0xe2, - (byte) 0xe2, (byte) 0xe2, (byte) 0xe2, (byte) 0xe2, (byte) 0xe2, (byte) 0xe2, (byte) 0xe2, (byte) 0xdd, (byte) 0xb4, (byte) 0xa7, (byte) 0x16, - (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x06, - (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x60, (byte) 0x0e, (byte) 0x60, (byte) 0x8c, (byte) 0xb4, - (byte) 0xb5, (byte) 0xdc, (byte) 0xdc, (byte) 0xbb, (byte) 0xb4, (byte) 0x8c, (byte) 0x66, (byte) 0x0b, (byte) 0x6c, (byte) 0x04, (byte) 0x06, - (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x04, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x06, (byte) 0xed, - (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xec, (byte) 0x6c, (byte) 0x0e, (byte) 0x0e, - (byte) 0x44, (byte) 0x0e, (byte) 0x0e, (byte) 0x0e, (byte) 0x13, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, - (byte) 0x06, (byte) 0xed, (byte) 0x06, (byte) 0x06, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }); - ByteBuffer dest = new AssertingByteBuffer(flipRawImage(flippedImage, width, height, bpp).data); - - rleDecompress(src, dest, width, height, depth); - - } - - if (true) { - // 32x32@16 - int width = 32, height = 32, depth = 16; - - ByteBuffer src = new ByteBuffer(new byte[] { (byte) 0x85, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x06, (byte) 0x8b, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x06, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0x16, (byte) 0x69, (byte) 0x99, (byte) 0xd6, (byte) 0x06, (byte) 0x69, (byte) 0x99, - (byte) 0xd6, (byte) 0x04, (byte) 0xcc, (byte) 0x89, (byte) 0x52, (byte) 0x03, (byte) 0x6e, (byte) 0xff, (byte) 0xff, (byte) 0x02, (byte) 0x6e, - (byte) 0x08, (byte) 0x42, (byte) 0x01, (byte) 0x70, (byte) 0x08, (byte) 0x42, (byte) 0x71, (byte) 0xff, (byte) 0xff, (byte) 0xce, (byte) 0x18, - (byte) 0xc6, (byte) 0x01, (byte) 0x81, (byte) 0x08, (byte) 0x42, (byte) 0xce, (byte) 0x66, (byte) 0x29, (byte) 0x02, (byte) 0xcd, (byte) 0x89, - (byte) 0x52, (byte) 0x03, (byte) 0x88, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xd8, (byte) 0x99, (byte) 0xd6, - (byte) 0x03, (byte) 0xf8, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xf0, (byte) 0x66, (byte) 0x99, (byte) 0xd6, - (byte) 0x05, (byte) 0x6a, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0xc4, (byte) 0xcc, (byte) 0x89, (byte) 0x52, (byte) 0x03, (byte) 0x6e, - (byte) 0xff, (byte) 0xff, (byte) 0x02, (byte) 0x6e, (byte) 0x08, (byte) 0x42, (byte) 0x01, (byte) 0x70, (byte) 0x08, (byte) 0x42, (byte) 0x71, - (byte) 0xff, (byte) 0xff, (byte) 0xce, (byte) 0x18, (byte) 0xc6, (byte) 0x01, (byte) 0x81, (byte) 0x08, (byte) 0x42, (byte) 0xce, (byte) 0x66, - (byte) 0x29, (byte) 0x02, (byte) 0xcd, (byte) 0x89, (byte) 0x52, (byte) 0x03, (byte) 0x00, (byte) 0x04, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0xc3, (byte) 0x80, (byte) 0x61, (byte) 0x00, (byte) 0xa5, (byte) 0x80, (byte) 0x40, (byte) 0xec, (byte) 0x52, (byte) 0x00, (byte) 0x5a, - (byte) 0x00, (byte) 0x2d, (byte) 0x00, (byte) 0x24, (byte) 0x00, (byte) 0x12, (byte) 0x00, (byte) 0x24, (byte) 0x00, (byte) 0x12, (byte) 0x00, - (byte) 0x5a, (byte) 0x00, (byte) 0x2d, (byte) 0x00, (byte) 0xa5, (byte) 0x80, (byte) 0x52, (byte) 0x00, (byte) 0xc3, (byte) 0x80, (byte) 0x61, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xcc, (byte) 0x89, (byte) 0x52, (byte) 0x03, (byte) 0x6e, (byte) 0xff, - (byte) 0xff, (byte) 0x02, (byte) 0xcb, (byte) 0x18, (byte) 0xc6, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0xff, (byte) 0xff, }); - - ByteBuffer dest = new AssertingByteBuffer(new byte[] { (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, - (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, - (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0xff, (byte) 0xff, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, - (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, - (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, - (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, - (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x99, - (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0xff, - (byte) 0xff, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, - (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, - (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, - (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, - (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, - (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x99, (byte) 0xd6, (byte) 0x10, (byte) 0x84, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, - (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, - (byte) 0x10, (byte) 0x84, (byte) 0x10, (byte) 0x84, (byte) 0x99, (byte) 0xd6, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, - (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, - (byte) 0x08, (byte) 0x42, (byte) 0x08, (byte) 0x42, (byte) 0xff, (byte) 0xff, }); - - rleDecompress(src, dest, width, height, depth); - - } - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java index cc8d1f16acc..825964f6a2d 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java @@ -18,7 +18,6 @@ package rdpclient; import streamer.PipelineImpl; import streamer.Queue; - import common.AwtCanvasAdapter; import common.AwtKeyEventSource; import common.AwtMouseEventSource; @@ -27,15 +26,15 @@ import common.ScreenDescription; public class RdpClient extends PipelineImpl { - /** - * Name of last OneTimePacket in handshake sequence. - */ - private static final String HANDSHAKE_END = "server_valid_client"; + /** + * Name of last OneTimePacket in handshake sequence. + */ + private static final String HANDSHAKE_END = "server_valid_client"; - public RdpClient(String id, String userName, ScreenDescription screen, BufferedImageCanvas canvas) { - super(id); - assembleRDPPipeline(userName, screen, canvas); - } + public RdpClient(String id, String userName, ScreenDescription screen, BufferedImageCanvas canvas) { + super(id); + assembleRDPPipeline(userName, screen, canvas); + } // /* DEBUG */ // @Override @@ -46,169 +45,170 @@ public class RdpClient extends PipelineImpl { // return map; // } - private void assembleRDPPipeline(String userName, ScreenDescription screen, BufferedImageCanvas canvas) { - // - // Handshake chain - // + private void assembleRDPPipeline(String userName, ScreenDescription screen, BufferedImageCanvas canvas) { + // + // Handshake chain + // - RdpState state = new RdpState(); - int[] channelsToJoin = new int[] { RdpConstants.CHANNEL_RDPRDR, RdpConstants.CHANNEL_IO }; + RdpState state = new RdpState(); + int[] channelsToJoin = new int[] {RdpConstants.CHANNEL_RDPRDR, RdpConstants.CHANNEL_IO}; - // Add elements + // Add elements - add( + add( - new ClientX224ConnectionRequestPDU("client_connection_req", userName), new ServerX224ConnectionConfirmPDU("server_connection_conf"), + new ClientX224ConnectionRequestPDU("client_connection_req", userName), new ServerX224ConnectionConfirmPDU("server_connection_conf"), - new UpgradeSocketToSSL("upgrade_to_ssl"), + new UpgradeSocketToSSL("upgrade_to_ssl"), - new ClientMCSConnectInitial("client_initial_conference_create"), new ServerMCSConnectResponse("server_initial_conference_create"), + new ClientMCSConnectInitial("client_initial_conference_create"), new ServerMCSConnectResponse("server_initial_conference_create"), - new ClientMCSErectDomainRequest("client_erect_domain"), + new ClientMCSErectDomainRequest("client_erect_domain"), - new ClientMCSAttachUserRequest("client_atach_user"), new ServerMCSAttachUserConfirmPDU("server_atach_user_confirm", state), + new ClientMCSAttachUserRequest("client_atach_user"), new ServerMCSAttachUserConfirmPDU("server_atach_user_confirm", state), - new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("client_channel_join_rdprdr", channelsToJoin, state), + new ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs("client_channel_join_rdprdr", channelsToJoin, state), - new ClientInfoPDU("client_info_req", userName), + new ClientInfoPDU("client_info_req", userName), - new ServerLicenseErrorPDUValidClient("server_valid_client"), + new ServerLicenseErrorPDUValidClient("server_valid_client"), - new ServerFastPath("server_fastpath"), + new ServerFastPath("server_fastpath"), - new ServerTpkt("server_tpkt"), + new ServerTpkt("server_tpkt"), - new ServerX224DataPdu("server_x224_data"), + new ServerX224DataPdu("server_x224_data"), - // These TPKT and X224 wrappers are connected directly to OUT for handshake - // sequence - new ClientTpkt("client_tpkt_ot"), + // These TPKT and X224 wrappers are connected directly to OUT for handshake + // sequence + new ClientTpkt("client_tpkt_ot"), - new ClientX224DataPdu("client_x224_data_ot") + new ClientX224DataPdu("client_x224_data_ot") - ); + ); - // Handshake sequence (via SlowPath) - link("IN", + // Handshake sequence (via SlowPath) + link("IN", - "server_fastpath >tpkt", "server_tpkt", + "server_fastpath >tpkt", "server_tpkt", - "client_connection_req", "server_connection_conf", + "client_connection_req", "server_connection_conf", - "upgrade_to_ssl", + "upgrade_to_ssl", - "client_initial_conference_create", "server_initial_conference_create", + "client_initial_conference_create", "server_initial_conference_create", - "client_erect_domain", + "client_erect_domain", - "server_x224_data", + "server_x224_data", - "client_atach_user", "server_atach_user_confirm", + "client_atach_user", "server_atach_user_confirm", - "client_channel_join_rdprdr", + "client_channel_join_rdprdr", - "client_info_req", + "client_info_req", - "server_valid_client" + "server_valid_client" - ); + ); - // Chain for direct handshake responses (without involving of queue) - link("client_x224_data_ot", "client_tpkt_ot", "client_tpkt_ot< OUT"); + // Chain for direct handshake responses (without involving of queue) + link("client_x224_data_ot", "client_tpkt_ot", "client_tpkt_ot< OUT"); + + // Connect one time outputs to client TPKT input + String tpkt_peers[] = new String[] {"client_connection_req", "server_connection_conf", "upgrade_to_ssl", "client_x224_data_ot"}; + for (String element : tpkt_peers) { + link(element + " >otout", element + "< client_tpkt_ot"); + } + + // Connect one time outputs to client X224 input + String x224_peers[] = + new String[] {"client_initial_conference_create", "server_initial_conference_create", "client_erect_domain", "client_atach_user", + "server_atach_user_confirm", "client_channel_join_rdprdr", "client_info_req", "server_valid_client"}; + for (String element : x224_peers) { + link(element + " >otout", element + "< client_x224_data_ot"); + } + + // + // Transition + // + + add( + // To transfer packets between input threads and output thread. + new Queue("queue"), + + // Slow path: MultiChannel Support + new ServerMCSPDU("server_mcs") + + ); + + // Last element of handshake sequence will wake up queue and and socket + // output pull loop, which will switch links, between socket output and + // queue, from push mode to pull mode. + link(HANDSHAKE_END + " >queue", "queue", "OUT"); + + // Transition from handshake sequence for slow path packets + link(HANDSHAKE_END, "server_mcs"); + + // + // Main network + // + + AwtMouseEventSource mouseEventSource = new AwtMouseEventSource("mouse"); + AwtKeyEventSource keyEventSource = new AwtKeyEventSource("keyboard"); + + // Subscribe packet sender to various events + canvas.addMouseListener(mouseEventSource); + canvas.addMouseMotionListener(mouseEventSource); + canvas.addKeyListener(keyEventSource); + + // Add elements + add( + + new ServerChannel1003Router("server_channel_1003", state), + + new ServerDemandActivePDU("server_demand_active", screen, state), + + new ClientConfirmActivePDU("client_confirm_active", screen, state), + + new ServerBitmapUpdate("server_bitmap_update"), + + new AwtCanvasAdapter("canvas_adapter", canvas, screen), + + new ServerPaletteUpdate("server_palette", screen), + + keyEventSource, new AwtRdpKeyboardAdapter("keyboard_adapter"), + + mouseEventSource, new AwtRdpMouseAdapter("mouse_adapter"), + + // These FastPath, TPKT, and X224 wrappers are connected to queue + new ClientTpkt("client_tpkt_queue"), + + new ClientX224DataPdu("client_x224_data_queue"), + + new ClientFastPathPDU("client_fastpath_queue")); + + // Server packet handlers + link("server_mcs >channel_1003", "server_channel_1003"); + link("server_fastpath >bitmap", "fastpath< server_bitmap_update", "server_bitmap_update< canvas_adapter"); + link("server_channel_1003 >bitmap", "slowpath< server_bitmap_update"); + + link("server_fastpath >palette", "fastpath< server_palette"); + link("server_channel_1003 >palette", "slowpath< server_palette"); + + link("server_channel_1003 >demand_active", "slowpath< server_demand_active"); + // link("server_demand_active >confirm_active", "client_confirm_active", + // "confirm_active< client_channel_1003"); + link("server_demand_active >confirm_active", "client_confirm_active", "confirm_active< client_x224_data_queue"); + + // Link mouse and keyboard to socket via adapters and send them using + // FastPath protocol + link(mouseEventSource.getId(), "mouse_adapter", "mouse_adapter< client_fastpath_queue"); + link(keyEventSource.getId(), "keyboard_adapter", "keyboard_adapter< client_fastpath_queue"); + + // Link packet wrappers to outgoing queue + link("client_fastpath_queue", "client_fastpath_queue< queue"); + link("client_x224_data_queue", "client_tpkt_queue", "client_tpkt_queue< queue"); - // Connect one time outputs to client TPKT input - String tpkt_peers[] = new String[] { "client_connection_req", "server_connection_conf", "upgrade_to_ssl", "client_x224_data_ot" }; - for (String element : tpkt_peers) { - link(element + " >otout", element + "< client_tpkt_ot"); } - - // Connect one time outputs to client X224 input - String x224_peers[] = new String[] { "client_initial_conference_create", "server_initial_conference_create", "client_erect_domain", "client_atach_user", - "server_atach_user_confirm", "client_channel_join_rdprdr", "client_info_req", "server_valid_client" }; - for (String element : x224_peers) { - link(element + " >otout", element + "< client_x224_data_ot"); - } - - // - // Transition - // - - add( - // To transfer packets between input threads and output thread. - new Queue("queue"), - - // Slow path: MultiChannel Support - new ServerMCSPDU("server_mcs") - - ); - - // Last element of handshake sequence will wake up queue and and socket - // output pull loop, which will switch links, between socket output and - // queue, from push mode to pull mode. - link(HANDSHAKE_END + " >queue", "queue", "OUT"); - - // Transition from handshake sequence for slow path packets - link(HANDSHAKE_END, "server_mcs"); - - // - // Main network - // - - AwtMouseEventSource mouseEventSource = new AwtMouseEventSource("mouse"); - AwtKeyEventSource keyEventSource = new AwtKeyEventSource("keyboard"); - - // Subscribe packet sender to various events - canvas.addMouseListener(mouseEventSource); - canvas.addMouseMotionListener(mouseEventSource); - canvas.addKeyListener(keyEventSource); - - // Add elements - add( - - new ServerChannel1003Router("server_channel_1003", state), - - new ServerDemandActivePDU("server_demand_active", screen, state), - - new ClientConfirmActivePDU("client_confirm_active", screen, state), - - new ServerBitmapUpdate("server_bitmap_update"), - - new AwtCanvasAdapter("canvas_adapter", canvas, screen), - - new ServerPaletteUpdate("server_palette", screen), - - keyEventSource, new AwtRdpKeyboardAdapter("keyboard_adapter"), - - mouseEventSource, new AwtRdpMouseAdapter("mouse_adapter"), - - // These FastPath, TPKT, and X224 wrappers are connected to queue - new ClientTpkt("client_tpkt_queue"), - - new ClientX224DataPdu("client_x224_data_queue"), - - new ClientFastPathPDU("client_fastpath_queue")); - - // Server packet handlers - link("server_mcs >channel_1003", "server_channel_1003"); - link("server_fastpath >bitmap", "fastpath< server_bitmap_update", "server_bitmap_update< canvas_adapter"); - link("server_channel_1003 >bitmap", "slowpath< server_bitmap_update"); - - link("server_fastpath >palette", "fastpath< server_palette"); - link("server_channel_1003 >palette", "slowpath< server_palette"); - - link("server_channel_1003 >demand_active", "slowpath< server_demand_active"); - // link("server_demand_active >confirm_active", "client_confirm_active", - // "confirm_active< client_channel_1003"); - link("server_demand_active >confirm_active", "client_confirm_active", "confirm_active< client_x224_data_queue"); - - // Link mouse and keyboard to socket via adapters and send them using - // FastPath protocol - link(mouseEventSource.getId(), "mouse_adapter", "mouse_adapter< client_fastpath_queue"); - link(keyEventSource.getId(), "keyboard_adapter", "keyboard_adapter< client_fastpath_queue"); - - // Link packet wrappers to outgoing queue - link("client_fastpath_queue", "client_fastpath_queue< queue"); - link("client_x224_data_queue", "client_tpkt_queue", "client_tpkt_queue< queue"); - - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java index d0eef73942e..3da132815c5 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java @@ -20,55 +20,51 @@ import java.nio.charset.Charset; public interface RdpConstants { - /** - * Default charset to use when communicating with server using 8 bit strings. - */ - public static final Charset CHARSET_8 = Charset.availableCharsets().get("US-ASCII"); + /** + * Default charset to use when communicating with server using 8 bit strings. + */ + public static final Charset CHARSET_8 = Charset.availableCharsets().get("US-ASCII"); - /** - * Default charset to use when communicating with server using 16 bit strings. - */ - public static final Charset CHARSET_16 = Charset.availableCharsets().get("UTF-16LE"); + /** + * Default charset to use when communicating with server using 16 bit strings. + */ + public static final Charset CHARSET_16 = Charset.availableCharsets().get("UTF-16LE"); + /** + * Negotiate SSL protocol to use to protect RDP connection. + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + */ + public static final int RDP_NEG_REQ_PROTOCOL_SSL = 1; - /** - * Negotiate SSL protocol to use to protect RDP connection. - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx - */ - public static final int RDP_NEG_REQ_PROTOCOL_SSL = 1; + /** + * Negotiate CredSSP protocol to use to protect RDP connection. + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + * When used, client must set @see RDP_NEG_REQ_PROTOCOL_SSL too. + */ + public static final int RDP_NEG_REQ_PROTOCOL_HYBRID = 2; - /** - * Negotiate CredSSP protocol to use to protect RDP connection. - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx - * When used, client must set @see RDP_NEG_REQ_PROTOCOL_SSL too. - */ - public static final int RDP_NEG_REQ_PROTOCOL_HYBRID = 2; + /** + * RDP negotiation: flags (not used, always 0). + */ + public static final int RDP_NEG_REQ_FLAGS = 0; - /** - * RDP negotiation: flags (not used, always 0). - */ - public static final int RDP_NEG_REQ_FLAGS = 0; + /** + * RDP Negotiation: request. + */ + public static final int RDP_NEG_REQ_TYPE_NEG_REQ = 1; - /** - * RDP Negotiation: request. - */ - public static final int RDP_NEG_REQ_TYPE_NEG_REQ = 1; + /** + * RDP Negotiation: response. + */ + public static final int RDP_NEG_REQ_TYPE_NEG_RSP = 2; - /** - * RDP Negotiation: response. - */ - public static final int RDP_NEG_REQ_TYPE_NEG_RSP = 2; - - /** - * RDP Negotiation: failure. - */ - public static final int RDP_NEG_REQ_TYPE_NEG_FAILURE = 3; - - - public static final int CHANNEL_IO = 1003; - - public static final int CHANNEL_RDPRDR = 1004; + /** + * RDP Negotiation: failure. + */ + public static final int RDP_NEG_REQ_TYPE_NEG_FAILURE = 3; + public static final int CHANNEL_IO = 1003; + public static final int CHANNEL_RDPRDR = 1004; } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java index aa9d62a6d37..951f0be8e98 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java @@ -21,13 +21,13 @@ import java.util.Set; public class RdpState { - public long serverShareId; - public int serverUserChannelId; + public long serverShareId; + public int serverUserChannelId; - public Set channels=new HashSet(); + public Set channels = new HashSet(); - public void channelJoined(int actualChannel) { - channels.add(actualChannel); - } + public void channelJoined(int actualChannel) { + channels.add(actualChannel); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerBitmapUpdate.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerBitmapUpdate.java index 0e5b79aff28..5c30b69dbac 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerBitmapUpdate.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerBitmapUpdate.java @@ -16,9 +16,6 @@ // under the License. package rdpclient; -import common.BitmapOrder; -import common.BitmapRectangle; - import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Element; @@ -26,176 +23,178 @@ import streamer.FakeSink; import streamer.Link; import streamer.Pipeline; import streamer.PipelineImpl; +import common.BitmapOrder; +import common.BitmapRectangle; /** * @see http://msdn.microsoft.com/en-us/library/cc240624.aspx */ public class ServerBitmapUpdate extends BaseElement { - public static final int UPDATETYPE_BITMAP = 0x0001; + public static final int UPDATETYPE_BITMAP = 0x0001; - /** - * Indicates that the bitmap data is compressed. The bitmapComprHdr field MUST - * be present if the NO_BITMAP_COMPRESSION_HDR (0x0400) flag is not set. - */ - public static final int BITMAP_COMPRESSION = 0x0001; + /** + * Indicates that the bitmap data is compressed. The bitmapComprHdr field MUST + * be present if the NO_BITMAP_COMPRESSION_HDR (0x0400) flag is not set. + */ + public static final int BITMAP_COMPRESSION = 0x0001; - /** - * Indicates that the bitmapComprHdr field is not present (removed for - * bandwidth efficiency to save 8 bytes). - */ - private static final int NO_BITMAP_COMPRESSION_HDR = 0x0400; + /** + * Indicates that the bitmapComprHdr field is not present (removed for + * bandwidth efficiency to save 8 bytes). + */ + private static final int NO_BITMAP_COMPRESSION_HDR = 0x0400; - public ServerBitmapUpdate(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // * DEBUG */System.out.println(buf.toHexString(buf.length)); - - BitmapOrder order = new BitmapOrder(); - - // (2 bytes): A 16-bit, unsigned integer. The update type. This field MUST - // be set to UPDATETYPE_BITMAP (0x0001). - int updateType = buf.readSignedShortLE(); - if (updateType != UPDATETYPE_BITMAP) - throw new RuntimeException("Unknown update type. Expected update type: UPDATETYPE_BITMAP (0x1). Actual update type: " + updateType + ", buf: " + buf - + "."); - - // (2 bytes): A 16-bit, unsigned integer. The number of screen rectangles - // present in the rectangles field. - int numberRectangles = buf.readSignedShortLE(); - - // (variable): Variable-length array of TS_BITMAP_DATA structures, each of - // which contains a rectangular clipping taken from the server-side screen - // frame buffer. The number of screen clippings in the array is specified by - // the numberRectangles field. - BitmapRectangle[] rectangles = new BitmapRectangle[numberRectangles]; - for (int i = 0; i < numberRectangles; i++) { - rectangles[i] = readRectangle(buf); - } - order.rectangles = rectangles; - - buf.assertThatBufferIsFullyRead(); - - ByteBuffer data = new ByteBuffer(0); - data.setOrder(order); - pushDataToAllOuts(data); - - buf.unref(); - } - - public BitmapRectangle readRectangle(ByteBuffer buf) { - - BitmapRectangle rectangle = new BitmapRectangle(); - - // (2 bytes): A 16-bit, unsigned integer. Left bound of the rectangle. - rectangle.x = buf.readSignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. Top bound of the rectangle. - rectangle.y = buf.readSignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. Inclusive right bound of the - // rectangle. - int destRight = buf.readSignedShortLE(); - rectangle.width=destRight-rectangle.x+1; - - // (2 bytes): A 16-bit, unsigned integer. Inclusive bottom bound of the - // rectangle. - int destBottom = buf.readSignedShortLE(); - rectangle.height=destBottom-rectangle.y+1; - - // (2 bytes): A 16-bit, unsigned integer. The width of the rectangle. - rectangle.bufferWidth = buf.readSignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. The height of the rectangle. - rectangle.bufferHeight = buf.readSignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. The color depth of the rectangle - // data in bits-per-pixel. - rectangle.colorDepth = buf.readSignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. The flags describing the format of - // the bitmap data in the bitmapDataStream field. - int flags = buf.readSignedShortLE(); - - // BITMAP_COMPRESSION 0x0001 - // Indicates that the bitmap data is compressed. The bitmapComprHdr field - // MUST be present if the NO_BITMAP_COMPRESSION_HDR (0x0400) flag is not - // set. - boolean compressed=((flags & BITMAP_COMPRESSION) > 0); - - // (2 bytes): A 16-bit, unsigned integer. The size in bytes of the data in - // the bitmapComprHdr and bitmapDataStream fields. - int bitmapLength = buf.readSignedShortLE(); - - // NO_BITMAP_COMPRESSION_HDR 0x0400 - // Indicates that the bitmapComprHdr field is not present (removed for - // bandwidth efficiency to save 8 bytes). - if (compressed && (flags & NO_BITMAP_COMPRESSION_HDR) == 0) { - // (8 bytes): Optional Compressed Data Header structure specifying the - // bitmap data in the bitmapDataStream. - // This field MUST be present if the BITMAP_COMPRESSION (0x0001) flag is - // present in the Flags field, but the NO_BITMAP_COMPRESSION_HDR (0x0400) - // flag is not. - - // Note: Even when compression header is enabled, server sends nothing. - // rectangle.compressedBitmapHeader = buf.readBytes(8); + public ServerBitmapUpdate(String id) { + super(id); } - // (variable): A variable-length array of bytes describing a bitmap image. - // Bitmap data is either compressed or uncompressed, depending on whether - // the BITMAP_COMPRESSION flag is present in the Flags field. Uncompressed - // bitmap data is formatted as a bottom-up, left-to-right series of pixels. - // Each pixel is a whole number of bytes. Each row contains a multiple of - // four bytes (including up to three bytes of padding, as necessary). - // Compressed bitmaps not in 32 bpp format are compressed using Interleaved - // RLE and encapsulated in an RLE Compressed Bitmap Stream structure, - // while compressed bitmaps at a color depth of 32 bpp are compressed - // using RDP 6.0 Bitmap Compression and stored inside - // an RDP 6.0 Bitmap Compressed Stream structure. - if (!compressed) { - rectangle.bitmapDataStream = buf.readBytes(bitmapLength); - } else { - ByteBuffer compressedImage = buf.readBytes(bitmapLength); - //* DEBUG */System.out.println("Compressed image: " + compressedImage + ", depth: " + rectangle.bitsPerPixel + "."); - rectangle.bitmapDataStream = RLEBitmapDecompression.rleDecompress(compressedImage, rectangle.bufferWidth, rectangle.bufferHeight, rectangle.colorDepth); - compressedImage.unref(); + @Override + public void handleData(ByteBuffer buf, Link link) { + + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + // * DEBUG */System.out.println(buf.toHexString(buf.length)); + + BitmapOrder order = new BitmapOrder(); + + // (2 bytes): A 16-bit, unsigned integer. The update type. This field MUST + // be set to UPDATETYPE_BITMAP (0x0001). + int updateType = buf.readSignedShortLE(); + if (updateType != UPDATETYPE_BITMAP) + throw new RuntimeException("Unknown update type. Expected update type: UPDATETYPE_BITMAP (0x1). Actual update type: " + updateType + ", buf: " + buf + "."); + + // (2 bytes): A 16-bit, unsigned integer. The number of screen rectangles + // present in the rectangles field. + int numberRectangles = buf.readSignedShortLE(); + + // (variable): Variable-length array of TS_BITMAP_DATA structures, each of + // which contains a rectangular clipping taken from the server-side screen + // frame buffer. The number of screen clippings in the array is specified by + // the numberRectangles field. + BitmapRectangle[] rectangles = new BitmapRectangle[numberRectangles]; + for (int i = 0; i < numberRectangles; i++) { + rectangles[i] = readRectangle(buf); + } + order.rectangles = rectangles; + + buf.assertThatBufferIsFullyRead(); + + ByteBuffer data = new ByteBuffer(0); + data.setOrder(order); + pushDataToAllOuts(data); + + buf.unref(); } - return rectangle; - } + public BitmapRectangle readRectangle(ByteBuffer buf) { - /** - * Example. - */ - public static void main(String args[]) { - ByteBuffer packet = new ByteBuffer(new byte[] { 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, - 0x01, 0x04, 0x0a, 0x00, 0x0c, (byte) 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }); + BitmapRectangle rectangle = new BitmapRectangle(); - Element bitmap = new ServerBitmapUpdate("bitmap") { - { - verbose = true; - } - }; - FakeSink fakeSink = new FakeSink("sink") { - { - verbose = true; - } - }; - Pipeline pipeline = new PipelineImpl("test"); + // (2 bytes): A 16-bit, unsigned integer. Left bound of the rectangle. + rectangle.x = buf.readSignedShortLE(); - // BufferedImageCanvas canvas = new BufferedImageCanvas(1024, 768); - // Element adapter = new AwtRdpAdapter("test",canvas ); - // pipeline.addAndLink(bitmap, adapter); - pipeline.addAndLink(bitmap, fakeSink); + // (2 bytes): A 16-bit, unsigned integer. Top bound of the rectangle. + rectangle.y = buf.readSignedShortLE(); - bitmap.handleData(packet, null); + // (2 bytes): A 16-bit, unsigned integer. Inclusive right bound of the + // rectangle. + int destRight = buf.readSignedShortLE(); + rectangle.width = destRight - rectangle.x + 1; - } + // (2 bytes): A 16-bit, unsigned integer. Inclusive bottom bound of the + // rectangle. + int destBottom = buf.readSignedShortLE(); + rectangle.height = destBottom - rectangle.y + 1; + + // (2 bytes): A 16-bit, unsigned integer. The width of the rectangle. + rectangle.bufferWidth = buf.readSignedShortLE(); + + // (2 bytes): A 16-bit, unsigned integer. The height of the rectangle. + rectangle.bufferHeight = buf.readSignedShortLE(); + + // (2 bytes): A 16-bit, unsigned integer. The color depth of the rectangle + // data in bits-per-pixel. + rectangle.colorDepth = buf.readSignedShortLE(); + + // (2 bytes): A 16-bit, unsigned integer. The flags describing the format of + // the bitmap data in the bitmapDataStream field. + int flags = buf.readSignedShortLE(); + + // BITMAP_COMPRESSION 0x0001 + // Indicates that the bitmap data is compressed. The bitmapComprHdr field + // MUST be present if the NO_BITMAP_COMPRESSION_HDR (0x0400) flag is not + // set. + boolean compressed = ((flags & BITMAP_COMPRESSION) > 0); + + // (2 bytes): A 16-bit, unsigned integer. The size in bytes of the data in + // the bitmapComprHdr and bitmapDataStream fields. + int bitmapLength = buf.readSignedShortLE(); + + // NO_BITMAP_COMPRESSION_HDR 0x0400 + // Indicates that the bitmapComprHdr field is not present (removed for + // bandwidth efficiency to save 8 bytes). + if (compressed && (flags & NO_BITMAP_COMPRESSION_HDR) == 0) { + // (8 bytes): Optional Compressed Data Header structure specifying the + // bitmap data in the bitmapDataStream. + // This field MUST be present if the BITMAP_COMPRESSION (0x0001) flag is + // present in the Flags field, but the NO_BITMAP_COMPRESSION_HDR (0x0400) + // flag is not. + + // Note: Even when compression header is enabled, server sends nothing. + // rectangle.compressedBitmapHeader = buf.readBytes(8); + } + + // (variable): A variable-length array of bytes describing a bitmap image. + // Bitmap data is either compressed or uncompressed, depending on whether + // the BITMAP_COMPRESSION flag is present in the Flags field. Uncompressed + // bitmap data is formatted as a bottom-up, left-to-right series of pixels. + // Each pixel is a whole number of bytes. Each row contains a multiple of + // four bytes (including up to three bytes of padding, as necessary). + // Compressed bitmaps not in 32 bpp format are compressed using Interleaved + // RLE and encapsulated in an RLE Compressed Bitmap Stream structure, + // while compressed bitmaps at a color depth of 32 bpp are compressed + // using RDP 6.0 Bitmap Compression and stored inside + // an RDP 6.0 Bitmap Compressed Stream structure. + if (!compressed) { + rectangle.bitmapDataStream = buf.readBytes(bitmapLength); + } else { + ByteBuffer compressedImage = buf.readBytes(bitmapLength); + //* DEBUG */System.out.println("Compressed image: " + compressedImage + ", depth: " + rectangle.bitsPerPixel + "."); + rectangle.bitmapDataStream = RLEBitmapDecompression.rleDecompress(compressedImage, rectangle.bufferWidth, rectangle.bufferHeight, rectangle.colorDepth); + compressedImage.unref(); + } + + return rectangle; + } + + /** + * Example. + */ + public static void main(String args[]) { + ByteBuffer packet = + new ByteBuffer(new byte[] {0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x04, 0x0a, + 0x00, 0x0c, (byte)0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}); + + Element bitmap = new ServerBitmapUpdate("bitmap") { + { + verbose = true; + } + }; + FakeSink fakeSink = new FakeSink("sink") { + { + verbose = true; + } + }; + Pipeline pipeline = new PipelineImpl("test"); + + // BufferedImageCanvas canvas = new BufferedImageCanvas(1024, 768); + // Element adapter = new AwtRdpAdapter("test",canvas ); + // pipeline.addAndLink(bitmap, adapter); + pipeline.addAndLink(bitmap, fakeSink); + + bitmap.handleData(packet, null); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java index 3e72d4c65f5..1526edf3a6b 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java @@ -27,504 +27,507 @@ import streamer.PipelineImpl; public class ServerChannel1003Router extends BaseElement { - /** - * Demand Active PDU. - */ - public static final int PDUTYPE_DEMANDACTIVEPDU = 0x1; + /** + * Demand Active PDU. + */ + public static final int PDUTYPE_DEMANDACTIVEPDU = 0x1; - /** - * Confirm Active PDU. - */ - public static final int PDUTYPE_CONFIRMACTIVEPDU = 0x3; + /** + * Confirm Active PDU. + */ + public static final int PDUTYPE_CONFIRMACTIVEPDU = 0x3; - /** - * Deactivate All PDU. - */ - public static final int PDUTYPE_DEACTIVATEALLPDU = 0x6; + /** + * Deactivate All PDU. + */ + public static final int PDUTYPE_DEACTIVATEALLPDU = 0x6; - /** - * Data PDU (actual type is revealed by the pduType2 field in the Share Data - * Header). - */ - public static final int PDUTYPE_DATAPDU = 0x7; + /** + * Data PDU (actual type is revealed by the pduType2 field in the Share Data + * Header). + */ + public static final int PDUTYPE_DATAPDU = 0x7; - /** - * Enhanced Security Server Redirection PDU. - */ - public static final int PDUTYPE_SERVER_REDIR_PKT = 0xA; + /** + * Enhanced Security Server Redirection PDU. + */ + public static final int PDUTYPE_SERVER_REDIR_PKT = 0xA; - protected RdpState state; + protected RdpState state; - public ServerChannel1003Router(String id, RdpState state) { - super(id); - this.state=state; - } - - /** - * @see http://msdn.microsoft.com/en-us/library/cc240576.aspx - */ - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - int length = buf.readUnsignedShortLE(); - if(buf.length!=length) - { - // It is ServerErrorAlert-ValidClient - // Ignore it - //throw new RuntimeException("[" + this + "] ERROR: Incorrect PDU length: " + length + ", data: " + buf + "."); + public ServerChannel1003Router(String id, RdpState state) { + super(id); + this.state = state; } - int type = buf.readUnsignedShortLE() & 0xf; + /** + * @see http://msdn.microsoft.com/en-us/library/cc240576.aspx + */ + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // int sourceId = buf.readUnsignedShortLE(); - buf.skipBytes(2); + int length = buf.readUnsignedShortLE(); + if (buf.length != length) { + // It is ServerErrorAlert-ValidClient + // Ignore it + //throw new RuntimeException("[" + this + "] ERROR: Incorrect PDU length: " + length + ", data: " + buf + "."); + } + + int type = buf.readUnsignedShortLE() & 0xf; + + // int sourceId = buf.readUnsignedShortLE(); + buf.skipBytes(2); + + switch (type) { + case PDUTYPE_DEMANDACTIVEPDU: + pushDataToPad("demand_active", buf); + break; + case PDUTYPE_CONFIRMACTIVEPDU: + throw new RuntimeException("Unexpected client CONFIRM ACTIVE PDU. Data: " + buf + "."); + case PDUTYPE_DEACTIVATEALLPDU: + // pushDataToPad("deactivate_all", buf); + /* ignore */buf.unref(); + break; + case PDUTYPE_DATAPDU: + handleDataPdu(buf); + break; + case PDUTYPE_SERVER_REDIR_PKT: + // pushDataToPad("server_redir", buf); + /* ignore */buf.unref(); + break; + default: + throw new RuntimeException("[" + this + "] ERROR: Unknown PDU type: " + type + ", data: " + buf + "."); + } - switch (type) { - case PDUTYPE_DEMANDACTIVEPDU: - pushDataToPad("demand_active", buf); - break; - case PDUTYPE_CONFIRMACTIVEPDU: - throw new RuntimeException("Unexpected client CONFIRM ACTIVE PDU. Data: " + buf + "."); - case PDUTYPE_DEACTIVATEALLPDU: - // pushDataToPad("deactivate_all", buf); - /* ignore */buf.unref(); - break; - case PDUTYPE_DATAPDU: - handleDataPdu(buf); - break; - case PDUTYPE_SERVER_REDIR_PKT: - // pushDataToPad("server_redir", buf); - /* ignore */buf.unref(); - break; - default: - throw new RuntimeException("[" + this + "] ERROR: Unknown PDU type: " + type + ", data: " + buf + "."); } - } + /** + * Graphics Update PDU. + */ + public static final int PDUTYPE2_UPDATE = 0x02; - /** - * Graphics Update PDU. - */ - public static final int PDUTYPE2_UPDATE = 0x02; + /** + * Control PDU. + */ + public static final int PDUTYPE2_CONTROL = 0x14; - /** - * Control PDU. - */ - public static final int PDUTYPE2_CONTROL = 0x14; + /** + * Pointer Update PDU. + */ + public static final int PDUTYPE2_POINTER = 0x1B; - /** - * Pointer Update PDU. - */ - public static final int PDUTYPE2_POINTER = 0x1B; + /** + * Input Event PDU. + */ + public static final int PDUTYPE2_INPUT = 0x1C; - /** - * Input Event PDU. - */ - public static final int PDUTYPE2_INPUT = 0x1C; + /** + * Synchronize PDU. + */ + public static final int PDUTYPE2_SYNCHRONIZE = 0x1F; - /** - * Synchronize PDU. - */ - public static final int PDUTYPE2_SYNCHRONIZE = 0x1F; + /** + * Refresh Rect PDU. + */ + public static final int PDUTYPE2_REFRESH_RECT = 0x21; - /** - * Refresh Rect PDU. - */ - public static final int PDUTYPE2_REFRESH_RECT = 0x21; + /** + * Play Sound PDU. + */ + public static final int PDUTYPE2_PLAY_SOUND = 0x22; - /** - * Play Sound PDU. - */ - public static final int PDUTYPE2_PLAY_SOUND = 0x22; + /** + * Suppress Output PDU. + */ + public static final int PDUTYPE2_SUPPRESS_OUTPUT = 0x23; - /** - * Suppress Output PDU. - */ - public static final int PDUTYPE2_SUPPRESS_OUTPUT = 0x23; + /** + * Shutdown Request PDU. + */ + public static final int PDUTYPE2_SHUTDOWN_REQUEST = 0x24; - /** - * Shutdown Request PDU. - */ - public static final int PDUTYPE2_SHUTDOWN_REQUEST = 0x24; + /** + * Shutdown Request Denied PDU. + */ + public static final int PDUTYPE2_SHUTDOWN_DENIED = 0x25; - /** - * Shutdown Request Denied PDU. - */ - public static final int PDUTYPE2_SHUTDOWN_DENIED = 0x25; + /** + * Save Session Info PDU. + */ + public static final int PDUTYPE2_SAVE_SESSION_INFO = 0x26; - /** - * Save Session Info PDU. - */ - public static final int PDUTYPE2_SAVE_SESSION_INFO = 0x26; + /** + * Font List PDU. + */ + public static final int PDUTYPE2_FONTLIST = 0x27; - /** - * Font List PDU. - */ - public static final int PDUTYPE2_FONTLIST = 0x27; + /** + * Font Map PDU. + */ + public static final int PDUTYPE2_FONTMAP = 0x28; - /** - * Font Map PDU. - */ - public static final int PDUTYPE2_FONTMAP = 0x28; + /** + * Set Keyboard Indicators PDU. + */ + public static final int PDUTYPE2_SET_KEYBOARD_INDICATORS = 0x29; - /** - * Set Keyboard Indicators PDU. - */ - public static final int PDUTYPE2_SET_KEYBOARD_INDICATORS = 0x29; + /** + * Persistent Key List PDU. + */ + public static final int PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST = 0x2B; - /** - * Persistent Key List PDU. - */ - public static final int PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST = 0x2B; + /** + * Bitmap Cache Error PDU. + */ + public static final int PDUTYPE2_BITMAPCACHE_ERROR_PDU = 0x2C; - /** - * Bitmap Cache Error PDU. - */ - public static final int PDUTYPE2_BITMAPCACHE_ERROR_PDU = 0x2C; + /** + * Set Keyboard IME Status PDU. + */ + public static final int PDUTYPE2_SET_KEYBOARD_IME_STATUS = 0x2D; - /** - * Set Keyboard IME Status PDU. - */ - public static final int PDUTYPE2_SET_KEYBOARD_IME_STATUS = 0x2D; + /** + * Offscreen Bitmap Cache Error PDU. + */ + public static final int PDUTYPE2_OFFSCRCACHE_ERROR_PDU = 0x2E; - /** - * Offscreen Bitmap Cache Error PDU. - */ - public static final int PDUTYPE2_OFFSCRCACHE_ERROR_PDU = 0x2E; + /** + * Set Error Info PDU. + */ + public static final int PDUTYPE2_SET_ERROR_INFO_PDU = 0x2F; - /** - * Set Error Info PDU. - */ - public static final int PDUTYPE2_SET_ERROR_INFO_PDU = 0x2F; + /** + * DrawNineGrid Cache Error PDU. + */ + public static final int PDUTYPE2_DRAWNINEGRID_ERROR_PDU = 0x30; - /** - * DrawNineGrid Cache Error PDU. - */ - public static final int PDUTYPE2_DRAWNINEGRID_ERROR_PDU = 0x30; + /** + * GDI+ Error PDU. + */ + public static final int PDUTYPE2_DRAWGDIPLUS_ERROR_PDU = 0x31; - /** - * GDI+ Error PDU. - */ - public static final int PDUTYPE2_DRAWGDIPLUS_ERROR_PDU = 0x31; + /** + * Auto-Reconnect Status PDU. + */ + public static final int PDUTYPE2_ARC_STATUS_PDU = 0x32; - /** - * Auto-Reconnect Status PDU. - */ - public static final int PDUTYPE2_ARC_STATUS_PDU = 0x32; + /** + * Status Info PDU. + */ + public static final int PDUTYPE2_STATUS_INFO_PDU = 0x36; - /** - * Status Info PDU. - */ - public static final int PDUTYPE2_STATUS_INFO_PDU = 0x36; + /** + * Monitor Layout PDU. + */ + public static final int PDUTYPE2_MONITOR_LAYOUT_PDU = 0x37; - /** - * Monitor Layout PDU. - */ - public static final int PDUTYPE2_MONITOR_LAYOUT_PDU = 0x37; + /** + * Indicates an Orders Update. + */ + public static final int UPDATETYPE_ORDERS = 0x0000; - /** - * Indicates an Orders Update. - */ - public static final int UPDATETYPE_ORDERS = 0x0000; + /** + * Indicates a Bitmap Graphics Update. + */ + public static final int UPDATETYPE_BITMAP = 0x0001; - /** - * Indicates a Bitmap Graphics Update. - */ - public static final int UPDATETYPE_BITMAP = 0x0001; + /** + * Indicates a Palette Update. + */ + public static final int UPDATETYPE_PALETTE = 0x0002; - /** - * Indicates a Palette Update. - */ - public static final int UPDATETYPE_PALETTE = 0x0002; + /** + * Indicates a Synchronize Update. + */ + public static final int UPDATETYPE_SYNCHRONIZE = 0x0003; - /** - * Indicates a Synchronize Update. - */ - public static final int UPDATETYPE_SYNCHRONIZE = 0x0003; + /** + * @see http://msdn.microsoft.com/en-us/library/cc240577.aspx + */ + protected void handleDataPdu(ByteBuffer buf) { - /** - * @see http://msdn.microsoft.com/en-us/library/cc240577.aspx - */ - protected void handleDataPdu(ByteBuffer buf) { - - // (4 bytes): A 32-bit, unsigned integer. Share identifier for the packet. - long shareId = buf.readUnsignedIntLE(); - if(shareId!=state.serverShareId) - throw new RuntimeException("Unexpected share ID: "+shareId+"."); + // (4 bytes): A 32-bit, unsigned integer. Share identifier for the packet. + long shareId = buf.readUnsignedIntLE(); + if (shareId != state.serverShareId) + throw new RuntimeException("Unexpected share ID: " + shareId + "."); // buf.skipBytes(4); - // Padding. - buf.skipBytes(1); + // Padding. + buf.skipBytes(1); - // (1 byte): An 8-bit, unsigned integer. The stream identifier for the - // packet. - // int streamId = buf.readUnsignedByte(); - buf.skipBytes(1); + // (1 byte): An 8-bit, unsigned integer. The stream identifier for the + // packet. + // int streamId = buf.readUnsignedByte(); + buf.skipBytes(1); - // (2 bytes): A 16-bit, unsigned integer. The uncompressed length of the - // packet in bytes. - int uncompressedLength = buf.readUnsignedShortLE(); + // (2 bytes): A 16-bit, unsigned integer. The uncompressed length of the + // packet in bytes. + int uncompressedLength = buf.readUnsignedShortLE(); - // (1 byte): An 8-bit, unsigned integer. The type of Data PDU. - int type2 = buf.readUnsignedByte(); + // (1 byte): An 8-bit, unsigned integer. The type of Data PDU. + int type2 = buf.readUnsignedByte(); - // (1 byte): An 8-bit, unsigned integer. The compression type and flags - // specifying the data following the Share Data Header - int compressedType = buf.readUnsignedByte(); - if (compressedType != 0) - throw new RuntimeException("Compression of protocol packets is not supported. Data: " + buf + "."); + // (1 byte): An 8-bit, unsigned integer. The compression type and flags + // specifying the data following the Share Data Header + int compressedType = buf.readUnsignedByte(); + if (compressedType != 0) + throw new RuntimeException("Compression of protocol packets is not supported. Data: " + buf + "."); - // (2 bytes): A 16-bit, unsigned integer. The compressed length of the - // packet in bytes. - int compressedLength = buf.readUnsignedShortLE(); - if (compressedLength != 0) - throw new RuntimeException("Compression of protocol packets is not supported. Data: " + buf + "."); + // (2 bytes): A 16-bit, unsigned integer. The compressed length of the + // packet in bytes. + int compressedLength = buf.readUnsignedShortLE(); + if (compressedLength != 0) + throw new RuntimeException("Compression of protocol packets is not supported. Data: " + buf + "."); - ByteBuffer data = buf.readBytes(uncompressedLength-18); - buf.unref(); + ByteBuffer data = buf.readBytes(uncompressedLength - 18); + buf.unref(); - switch (type2) { + switch (type2) { - case PDUTYPE2_UPDATE: { + case PDUTYPE2_UPDATE: { - // (2 bytes): A 16-bit, unsigned integer. Type of the graphics update. - int updateType = data.readUnsignedShortLE(); - ByteBuffer data2 = data.readBytes(data.length - data.cursor); - data.unref(); + // (2 bytes): A 16-bit, unsigned integer. Type of the graphics update. + int updateType = data.readUnsignedShortLE(); + ByteBuffer data2 = data.readBytes(data.length - data.cursor); + data.unref(); - switch (updateType) { - case UPDATETYPE_ORDERS: - pushDataToPad("orders", data2); - break; - case UPDATETYPE_BITMAP: - pushDataToPad("bitmap", data2); - break; - case UPDATETYPE_PALETTE: - pushDataToPad("palette", data2); - break; - case UPDATETYPE_SYNCHRONIZE: - // Ignore - data2.unref(); - break; - } + switch (updateType) { + case UPDATETYPE_ORDERS: + pushDataToPad("orders", data2); + break; + case UPDATETYPE_BITMAP: + pushDataToPad("bitmap", data2); + break; + case UPDATETYPE_PALETTE: + pushDataToPad("palette", data2); + break; + case UPDATETYPE_SYNCHRONIZE: + // Ignore + data2.unref(); + break; + } - break; + break; + } + case PDUTYPE2_CONTROL: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_CONTROL ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_POINTER: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_POINTER ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_INPUT: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_INPUT ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SYNCHRONIZE: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SYNCHRONIZE ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_REFRESH_RECT: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_REFRESH_RECT ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_PLAY_SOUND: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_PLAY_SOUND ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SUPPRESS_OUTPUT: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SUPPRESS_OUTPUT ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SHUTDOWN_REQUEST: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SHUTDOWN_REQUEST ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SHUTDOWN_DENIED: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SHUTDOWN_DENIED ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SAVE_SESSION_INFO: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SAVE_SESSION_INFO ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_FONTLIST: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_FONTLIST ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_FONTMAP: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_FONTMAP ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SET_KEYBOARD_INDICATORS: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_KEYBOARD_INDICATORS ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_BITMAPCACHE_ERROR_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_BITMAPCACHE_ERROR_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SET_KEYBOARD_IME_STATUS: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_KEYBOARD_IME_STATUS ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_OFFSCRCACHE_ERROR_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_OFFSCRCACHE_ERROR_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_SET_ERROR_INFO_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_ERROR_INFO_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_DRAWNINEGRID_ERROR_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_DRAWNINEGRID_ERROR_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_DRAWGDIPLUS_ERROR_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_DRAWGDIPLUS_ERROR_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_ARC_STATUS_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_ARC_STATUS_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_STATUS_INFO_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_STATUS_INFO_PDU ignored."); + // Ignore + data.unref(); + break; + case PDUTYPE2_MONITOR_LAYOUT_PDU: + if (verbose) + System.out.println("[" + this + "] INFO: Packet PDUTYPE2_MONITOR_LAYOUT_PDU ignored."); + // Ignore + data.unref(); + break; + + default: + throw new RuntimeException("Unknow data PDU type: " + type2 + ", data: " + buf + "."); + } } - case PDUTYPE2_CONTROL: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_CONTROL ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_POINTER: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_POINTER ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_INPUT: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_INPUT ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SYNCHRONIZE: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SYNCHRONIZE ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_REFRESH_RECT: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_REFRESH_RECT ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_PLAY_SOUND: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_PLAY_SOUND ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SUPPRESS_OUTPUT: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SUPPRESS_OUTPUT ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SHUTDOWN_REQUEST: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SHUTDOWN_REQUEST ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SHUTDOWN_DENIED: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SHUTDOWN_DENIED ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SAVE_SESSION_INFO: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SAVE_SESSION_INFO ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_FONTLIST: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_FONTLIST ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_FONTMAP: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_FONTMAP ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SET_KEYBOARD_INDICATORS: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_KEYBOARD_INDICATORS ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_BITMAPCACHE_PERSISTENT_LIST ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_BITMAPCACHE_ERROR_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_BITMAPCACHE_ERROR_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SET_KEYBOARD_IME_STATUS: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_KEYBOARD_IME_STATUS ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_OFFSCRCACHE_ERROR_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_OFFSCRCACHE_ERROR_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_SET_ERROR_INFO_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_SET_ERROR_INFO_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_DRAWNINEGRID_ERROR_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_DRAWNINEGRID_ERROR_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_DRAWGDIPLUS_ERROR_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_DRAWGDIPLUS_ERROR_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_ARC_STATUS_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_ARC_STATUS_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_STATUS_INFO_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_STATUS_INFO_PDU ignored."); - // Ignore - data.unref(); - break; - case PDUTYPE2_MONITOR_LAYOUT_PDU: - if (verbose) - System.out.println("[" + this + "] INFO: Packet PDUTYPE2_MONITOR_LAYOUT_PDU ignored."); - // Ignore - data.unref(); - break; - default: - throw new RuntimeException("Unknow data PDU type: " + type2 + ", data: " + buf + "."); + /** + * Example. + * + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + + byte[] packet = new byte[] { + // TPKT + (byte)0x03, (byte)0x00, // TPKT Header: TPKT version = 3 + (byte)0x00, (byte)0x1B, // TPKT length: 27 bytes + + // X224 + (byte)0x02, // X224 Length: 2 bytes + (byte)0xF0, // X224 Type: Data + (byte)0x80, // X224 EOT + + // MCS + // Type: send data indication: 26 (0x1a, top 6 bits) + (byte)0x68, // ?? + + (byte)0x00, (byte)0x01, // User ID: 1002 (1001+1) + (byte)0x03, (byte)0xEB, // Channel ID: 1003 + (byte)0x70, // Data priority: high, segmentation: begin|end + (byte)0x0D, // Payload length: 13 bytes + + // Deactivate all PDU + (byte)0x0D, (byte)0x00, // Length: 13 bytes (LE) + + // - PDUType: (0x16, LE) + // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU + // ProtocolVersion: (000000000001....) 1 + (byte)0x16, (byte)0x00, + + (byte)0xEA, (byte)0x03, // PDU source: 1002 (LE) + (byte)0xEA, (byte)0x03, (byte)0x01, (byte)0x00, // ShareID = 66538 + + (byte)0x01, (byte)0x00, // Length if source descriptor: 1 (LE) + (byte)0x00, // Source descriptor (should be set to 0): 0 + }; + + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); + RdpState rdpState = new RdpState() { + { + serverShareId = 66538; + } + }; + Element channel1003 = new ServerChannel1003Router("channel_1003", rdpState); + Element mcs = new ServerMCSPDU("mcs"); + Element tpkt = new ServerTpkt("tpkt"); + Element x224 = new ServerX224DataPdu("x224"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { + // Deactivate all PDU + (byte)0x0D, (byte)0x00, // Length: 13 bytes (LE) + + // - PDUType: 22 (0x16, LE) + // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU + // ProtocolVersion: (000000000001....) 1 + (byte)0x16, (byte)0x00, + + (byte)0xEA, (byte)0x03, // PDU source: 1002 (LE) + (byte)0xEA, (byte)0x03, (byte)0x01, (byte)0x00, // ShareID = 66538 + + (byte)0x01, (byte)0x00, // Length if source descriptor: 1 (LE) + (byte)0x00, // Source descriptor (should be set to 0): 0 + })); + + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, tpkt, x224, mcs, channel1003, sink); + pipeline.link("source", "tpkt", "x224", "mcs >channel_1003", "channel_1003 >deactivate_all", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); } - } - - /** - * Example. - * - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - - byte[] packet = new byte[] { - // TPKT - (byte) 0x03, (byte) 0x00, // TPKT Header: TPKT version = 3 - (byte) 0x00, (byte) 0x1B, // TPKT length: 27 bytes - - // X224 - (byte) 0x02, // X224 Length: 2 bytes - (byte) 0xF0, // X224 Type: Data - (byte) 0x80, // X224 EOT - - // MCS - // Type: send data indication: 26 (0x1a, top 6 bits) - (byte) 0x68, // ?? - - (byte) 0x00, (byte) 0x01, // User ID: 1002 (1001+1) - (byte) 0x03, (byte) 0xEB, // Channel ID: 1003 - (byte) 0x70, // Data priority: high, segmentation: begin|end - (byte) 0x0D, // Payload length: 13 bytes - - // Deactivate all PDU - (byte) 0x0D, (byte) 0x00, // Length: 13 bytes (LE) - - // - PDUType: (0x16, LE) - // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU - // ProtocolVersion: (000000000001....) 1 - (byte) 0x16, (byte) 0x00, - - (byte) 0xEA, (byte) 0x03, // PDU source: 1002 (LE) - (byte) 0xEA, (byte) 0x03, (byte) 0x01, (byte) 0x00, // ShareID = 66538 - - (byte) 0x01, (byte) 0x00, // Length if source descriptor: 1 (LE) - (byte) 0x00, // Source descriptor (should be set to 0): 0 - }; - - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); - RdpState rdpState =new RdpState() {{serverShareId=66538;}}; - Element channel1003 = new ServerChannel1003Router("channel_1003", rdpState ); - Element mcs = new ServerMCSPDU("mcs"); - Element tpkt = new ServerTpkt("tpkt"); - Element x224 = new ServerX224DataPdu("x224"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { - // Deactivate all PDU - (byte) 0x0D, (byte) 0x00, // Length: 13 bytes (LE) - - // - PDUType: 22 (0x16, LE) - // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU - // ProtocolVersion: (000000000001....) 1 - (byte) 0x16, (byte) 0x00, - - (byte) 0xEA, (byte) 0x03, // PDU source: 1002 (LE) - (byte) 0xEA, (byte) 0x03, (byte) 0x01, (byte) 0x00, // ShareID = 66538 - - (byte) 0x01, (byte) 0x00, // Length if source descriptor: 1 (LE) - (byte) 0x00, // Source descriptor (should be set to 0): 0 - })); - - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, tpkt, x224, mcs, channel1003, sink); - pipeline.link("source", "tpkt", "x224", "mcs >channel_1003", "channel_1003 >deactivate_all", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java index 2bfedc7f701..7bbe0c346cb 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java @@ -20,24 +20,24 @@ import streamer.ByteBuffer; import streamer.Link; import streamer.OneTimeSwitch; -public class ServerControlPDUCooperate extends OneTimeSwitch { +public class ServerControlPDUCooperate extends OneTimeSwitch { - public ServerControlPDUCooperate(String id) { - super(id); - } + public ServerControlPDUCooperate(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java index eee6f688d75..62cbd6cedc8 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java @@ -20,24 +20,24 @@ import streamer.ByteBuffer; import streamer.Link; import streamer.OneTimeSwitch; -public class ServerControlPDUGrantedControl extends OneTimeSwitch { +public class ServerControlPDUGrantedControl extends OneTimeSwitch { - public ServerControlPDUGrantedControl(String id) { - super(id); - } + public ServerControlPDUGrantedControl(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } } /* @formatter:off */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java index 298f03c7f05..9605b85311d 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java @@ -25,7 +25,6 @@ import streamer.MockSource; import streamer.Order; import streamer.Pipeline; import streamer.PipelineImpl; - import common.ScreenDescription; /** @@ -34,366 +33,366 @@ import common.ScreenDescription; */ public class ServerDemandActivePDU extends BaseElement { - /** - * Demand Active PDU. - */ - public static final int PDUTYPE_DEMANDACTIVEPDU = 0x1; + /** + * Demand Active PDU. + */ + public static final int PDUTYPE_DEMANDACTIVEPDU = 0x1; - protected RdpState state; - protected ScreenDescription screen; + protected RdpState state; + protected ScreenDescription screen; - public ServerDemandActivePDU(String id, ScreenDescription screen, RdpState state) { - super(id); - this.state = state; - this.screen = screen; - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // Total length of packet - int length = buf.readSignedShortLE(); // Ignore - if (buf.length != length) - throw new RuntimeException("Incorrect length of packet. Length: " + length + ", data: " + buf + "."); - - int type = buf.readSignedShortLE() & 0xf; - if (type != PDUTYPE_DEMANDACTIVEPDU) - throw new RuntimeException("Unknown PDU type. Expected type: Demand Active PDU (0x1), actual tyoe: " + type + ", data: " + buf + "."); - - // TS_SHARECONTROLHEADER::pduSource = 0x03ea (1002) - int pduSource = buf.readSignedShortLE(); - if (pduSource != 1002) - throw new RuntimeException("Unexepcted source of demand active PDU. Expected source: 1002, actual source: " + pduSource + "."); - - // (4 bytes): A 32-bit, unsigned integer. The share identifier for the - // packet (see [T128] section 8.4.2 for more information regarding share - // IDs). - long shareId = buf.readUnsignedIntLE(); - state.serverShareId = shareId; - - // Ignore rest of server data because it is not used by this client. - // (2 bytes): A 16-bit, unsigned integer. The size in bytes of the - // sourceDescriptor field. - int lengthSourceDescriptor = buf.readUnsignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. The combined size in bytes of the - // numberCapabilities, pad2Octets, and capabilitySets fields. - int lengthCombinedCapabilities = buf.readUnsignedShortLE(); - - // (variable): A variable-length array of bytes containing a source - // descriptor, - // ByteBuffer sourceDescriptor = buf.readBytes(lengthSourceDescriptor); - buf.skipBytes(lengthSourceDescriptor); - - // (variable): An array of Capability Set (section 2.2.1.13.1.1.1) - // structures. The number of capability sets is specified by the - // numberCapabilities field. - handleCapabiltySets(buf.readBytes(lengthCombinedCapabilities)); - - // (4 bytes): A 32-bit, unsigned integer. The session identifier. This field - // is ignored by the client. - buf.skipBytes(4); - - /* DEBUG */buf.assertThatBufferIsFullyRead(); - - buf.unref(); - - sendHandshakePackets(); - } - - /** - * General Capability Set - */ - public static final int CAPSTYPE_GENERAL = 0x0001; - /** - * Bitmap Capability Set - */ - public static final int CAPSTYPE_BITMAP = 0x0002; - /** - * Order Capability Set - */ - public static final int CAPSTYPE_ORDER = 0x0003; - /** - * Revision 1 Bitmap Cache Capability Set - */ - public static final int CAPSTYPE_BITMAPCACHE = 0x0004; - /** - * Control Capability Set - */ - public static final int CAPSTYPE_CONTROL = 0x0005; - /** - * Window Activation Capability Set - */ - public static final int CAPSTYPE_ACTIVATION = 0x0007; - /** - * Pointer Capability Set - */ - public static final int CAPSTYPE_POINTER = 0x0008; - /** - * Share Capability Set - */ - public static final int CAPSTYPE_SHARE = 0x0009; - /** - * Color Table Cache Capability Set - */ - public static final int CAPSTYPE_COLORCACHE = 0x000A; - /** - * Sound Capability Set - */ - public static final int CAPSTYPE_SOUND = 0x000C; - /** - * Input Capability Set - */ - public static final int CAPSTYPE_INPUT = 0x000D; - /** - * Font Capability Set - */ - public static final int CAPSTYPE_FONT = 0x000E; - /** - * Brush Capability Set - */ - public static final int CAPSTYPE_BRUSH = 0x000F; - /** - * Glyph Cache Capability Set - */ - public static final int CAPSTYPE_GLYPHCACHE = 0x0010; - /** - * Offscreen Bitmap Cache Capability Set - */ - public static final int CAPSTYPE_OFFSCREENCACHE = 0x0011; - /** - * Bitmap Cache Host Support Capability Set - */ - public static final int CAPSTYPE_BITMAPCACHE_HOSTSUPPORT = 0x0012; - /** - * Revision 2 Bitmap Cache Capability Set - */ - public static final int CAPSTYPE_BITMAPCACHE_REV2 = 0x0013; - /** - * Virtual Channel Capability Set - */ - public static final int CAPSTYPE_VIRTUALCHANNEL = 0x0014; - /** - * DrawNineGrid Cache Capability Set - */ - public static final int CAPSTYPE_DRAWNINEGRIDCACHE = 0x0015; - /** - * Draw GDI+ Cache Capability Set - */ - public static final int CAPSTYPE_DRAWGDIPLUS = 0x0016; - /** - * Remote Programs Capability Set - */ - public static final int CAPSTYPE_RAIL = 0x0017; - /** - * Window List Capability Set - */ - public static final int CAPSTYPE_WINDOW = 0x0018; - /** - * Desktop Composition Extension Capability Set - */ - public static final int CAPSETTYPE_COMPDESK = 0x0019; - /** - * Multifragment Update Capability Set - */ - public static final int CAPSETTYPE_MULTIFRAGMENTUPDATE = 0x001A; - /** - * Large Pointer Capability Set - */ - public static final int CAPSETTYPE_LARGE_POINTER = 0x001B; - /** - * Surface Commands Capability Set - */ - public static final int CAPSETTYPE_SURFACE_COMMANDS = 0x001C; - /** - * Bitmap Codecs Capability Set - */ - public static final int CAPSETTYPE_BITMAP_CODECS = 0x001D; - /** - * Frame Acknowledge Capability Set - */ - public static final int CAPSSETTYPE_FRAME_ACKNOWLEDGE = 0x001E; - - /** - * @see http://msdn.microsoft.com/en-us/library/cc240486.aspx - */ - protected void handleCapabiltySets(ByteBuffer buf) { - // (2 bytes): A 16-bit, unsigned integer. The number of capability sets - // included in the Demand Active PDU. - int numberCapabilities = buf.readSignedShortLE(); - - // (2 bytes): Padding. - buf.skipBytes(2); - - for (int i = 0; i < numberCapabilities; i++) { - // (2 bytes): A 16-bit, unsigned integer. The type identifier of the - // capability set. - int capabilitySetType = buf.readUnsignedShortLE(); - - // (2 bytes): A 16-bit, unsigned integer. The length in bytes of the - // capability data, including the size of the capabilitySetType and - // lengthCapability fields. - int lengthCapability = buf.readUnsignedShortLE(); - - // (variable): Capability set data which conforms to the structure of the - // type given by the capabilitySetType field. - ByteBuffer capabilityData = buf.readBytes(lengthCapability - 4); - - switch (capabilitySetType) { - case CAPSTYPE_GENERAL: - break; - case CAPSTYPE_BITMAP: - handleBitmapCapabilities(capabilityData); - break; - case CAPSTYPE_ORDER: - break; - case CAPSTYPE_BITMAPCACHE: - break; - case CAPSTYPE_CONTROL: - break; - case CAPSTYPE_ACTIVATION: - break; - case CAPSTYPE_POINTER: - break; - case CAPSTYPE_SHARE: - break; - case CAPSTYPE_COLORCACHE: - break; - case CAPSTYPE_SOUND: - break; - case CAPSTYPE_INPUT: - break; - case CAPSTYPE_FONT: - break; - case CAPSTYPE_BRUSH: - break; - case CAPSTYPE_GLYPHCACHE: - break; - case CAPSTYPE_OFFSCREENCACHE: - break; - case CAPSTYPE_BITMAPCACHE_HOSTSUPPORT: - break; - case CAPSTYPE_BITMAPCACHE_REV2: - break; - case CAPSTYPE_VIRTUALCHANNEL: - break; - case CAPSTYPE_DRAWNINEGRIDCACHE: - break; - case CAPSTYPE_DRAWGDIPLUS: - break; - case CAPSTYPE_RAIL: - break; - case CAPSTYPE_WINDOW: - break; - case CAPSETTYPE_COMPDESK: - break; - case CAPSETTYPE_MULTIFRAGMENTUPDATE: - break; - case CAPSETTYPE_LARGE_POINTER: - break; - case CAPSETTYPE_SURFACE_COMMANDS: - break; - case CAPSETTYPE_BITMAP_CODECS: - break; - case CAPSSETTYPE_FRAME_ACKNOWLEDGE: - break; - default: - // Ignore - break; - } - - capabilityData.unref(); + public ServerDemandActivePDU(String id, ScreenDescription screen, RdpState state) { + super(id); + this.state = state; + this.screen = screen; } - // TODO + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - buf.unref(); - } + // Total length of packet + int length = buf.readSignedShortLE(); // Ignore + if (buf.length != length) + throw new RuntimeException("Incorrect length of packet. Length: " + length + ", data: " + buf + "."); - /** - * @see http://msdn.microsoft.com/en-us/library/cc240554.aspx - */ - protected void handleBitmapCapabilities(ByteBuffer buf) { + int type = buf.readSignedShortLE() & 0xf; + if (type != PDUTYPE_DEMANDACTIVEPDU) + throw new RuntimeException("Unknown PDU type. Expected type: Demand Active PDU (0x1), actual tyoe: " + type + ", data: " + buf + "."); - // (2 bytes): A 16-bit, unsigned integer. The server MUST set this field to - // the color depth of the session, while the client SHOULD set this field to - // the color depth requested in the Client Core Data (section 2.2.1.3.2). - int preferredBitsPerPixel = buf.readUnsignedShortLE(); - screen.setPixelFormatRGBTrueColor(preferredBitsPerPixel); + // TS_SHARECONTROLHEADER::pduSource = 0x03ea (1002) + int pduSource = buf.readSignedShortLE(); + if (pduSource != 1002) + throw new RuntimeException("Unexepcted source of demand active PDU. Expected source: 1002, actual source: " + pduSource + "."); - // receive1BitPerPixel (2 bytes): A 16-bit, unsigned integer. Indicates - // whether the client can receive 1 bpp. This field is ignored and SHOULD be - // set to TRUE (0x0001). - buf.skipBytes(2); + // (4 bytes): A 32-bit, unsigned integer. The share identifier for the + // packet (see [T128] section 8.4.2 for more information regarding share + // IDs). + long shareId = buf.readUnsignedIntLE(); + state.serverShareId = shareId; - // receive4BitsPerPixel(2 bytes): A 16-bit, unsigned integer. Indicates - // whether the client can receive 4 bpp. This field is ignored and SHOULD be - // set to TRUE (0x0001). - buf.skipBytes(2); + // Ignore rest of server data because it is not used by this client. + // (2 bytes): A 16-bit, unsigned integer. The size in bytes of the + // sourceDescriptor field. + int lengthSourceDescriptor = buf.readUnsignedShortLE(); - // receive8BitsPerPixel (2 bytes): A 16-bit, unsigned integer. Indicates - // whether the client can receive 8 bpp. This field is ignored and SHOULD be - // set to TRUE (0x0001). - buf.skipBytes(2); + // (2 bytes): A 16-bit, unsigned integer. The combined size in bytes of the + // numberCapabilities, pad2Octets, and capabilitySets fields. + int lengthCombinedCapabilities = buf.readUnsignedShortLE(); - // (2 bytes): A 16-bit, unsigned integer. The width of the desktop in the - // session. - int desktopWidth = buf.readUnsignedShortLE(); + // (variable): A variable-length array of bytes containing a source + // descriptor, + // ByteBuffer sourceDescriptor = buf.readBytes(lengthSourceDescriptor); + buf.skipBytes(lengthSourceDescriptor); - // (2 bytes): A 16-bit, unsigned integer. The height of the desktop in the - // session. - int desktopHeight = buf.readUnsignedShortLE(); + // (variable): An array of Capability Set (section 2.2.1.13.1.1.1) + // structures. The number of capability sets is specified by the + // numberCapabilities field. + handleCapabiltySets(buf.readBytes(lengthCombinedCapabilities)); - screen.setFramebufferSize(desktopWidth, desktopHeight); + // (4 bytes): A 32-bit, unsigned integer. The session identifier. This field + // is ignored by the client. + buf.skipBytes(4); - // pad2octets (2 bytes): A 16-bit, unsigned integer. Padding. Values in this - // field MUST be ignored. + /* DEBUG */buf.assertThatBufferIsFullyRead(); - // desktopResizeFlag (2 bytes): A 16-bit, unsigned integer. Indicates - // whether resizing the desktop by using a Deactivation-Reactivation - // Sequence is supported. + buf.unref(); - // bitmapCompressionFlag (2 bytes): A 16-bit, unsigned integer. Indicates - // whether bitmap compression is supported. This field MUST be set to TRUE - // (0x0001) because support for compressed bitmaps is required for a - // connection to proceed. + sendHandshakePackets(); + } - // highColorFlags (1 byte): An 8-bit, unsigned integer. Client support for - // 16 bpp color modes. This field is ignored and SHOULD be set to zero. + /** + * General Capability Set + */ + public static final int CAPSTYPE_GENERAL = 0x0001; + /** + * Bitmap Capability Set + */ + public static final int CAPSTYPE_BITMAP = 0x0002; + /** + * Order Capability Set + */ + public static final int CAPSTYPE_ORDER = 0x0003; + /** + * Revision 1 Bitmap Cache Capability Set + */ + public static final int CAPSTYPE_BITMAPCACHE = 0x0004; + /** + * Control Capability Set + */ + public static final int CAPSTYPE_CONTROL = 0x0005; + /** + * Window Activation Capability Set + */ + public static final int CAPSTYPE_ACTIVATION = 0x0007; + /** + * Pointer Capability Set + */ + public static final int CAPSTYPE_POINTER = 0x0008; + /** + * Share Capability Set + */ + public static final int CAPSTYPE_SHARE = 0x0009; + /** + * Color Table Cache Capability Set + */ + public static final int CAPSTYPE_COLORCACHE = 0x000A; + /** + * Sound Capability Set + */ + public static final int CAPSTYPE_SOUND = 0x000C; + /** + * Input Capability Set + */ + public static final int CAPSTYPE_INPUT = 0x000D; + /** + * Font Capability Set + */ + public static final int CAPSTYPE_FONT = 0x000E; + /** + * Brush Capability Set + */ + public static final int CAPSTYPE_BRUSH = 0x000F; + /** + * Glyph Cache Capability Set + */ + public static final int CAPSTYPE_GLYPHCACHE = 0x0010; + /** + * Offscreen Bitmap Cache Capability Set + */ + public static final int CAPSTYPE_OFFSCREENCACHE = 0x0011; + /** + * Bitmap Cache Host Support Capability Set + */ + public static final int CAPSTYPE_BITMAPCACHE_HOSTSUPPORT = 0x0012; + /** + * Revision 2 Bitmap Cache Capability Set + */ + public static final int CAPSTYPE_BITMAPCACHE_REV2 = 0x0013; + /** + * Virtual Channel Capability Set + */ + public static final int CAPSTYPE_VIRTUALCHANNEL = 0x0014; + /** + * DrawNineGrid Cache Capability Set + */ + public static final int CAPSTYPE_DRAWNINEGRIDCACHE = 0x0015; + /** + * Draw GDI+ Cache Capability Set + */ + public static final int CAPSTYPE_DRAWGDIPLUS = 0x0016; + /** + * Remote Programs Capability Set + */ + public static final int CAPSTYPE_RAIL = 0x0017; + /** + * Window List Capability Set + */ + public static final int CAPSTYPE_WINDOW = 0x0018; + /** + * Desktop Composition Extension Capability Set + */ + public static final int CAPSETTYPE_COMPDESK = 0x0019; + /** + * Multifragment Update Capability Set + */ + public static final int CAPSETTYPE_MULTIFRAGMENTUPDATE = 0x001A; + /** + * Large Pointer Capability Set + */ + public static final int CAPSETTYPE_LARGE_POINTER = 0x001B; + /** + * Surface Commands Capability Set + */ + public static final int CAPSETTYPE_SURFACE_COMMANDS = 0x001C; + /** + * Bitmap Codecs Capability Set + */ + public static final int CAPSETTYPE_BITMAP_CODECS = 0x001D; + /** + * Frame Acknowledge Capability Set + */ + public static final int CAPSSETTYPE_FRAME_ACKNOWLEDGE = 0x001E; - // drawingFlags (1 byte): An 8-bit, unsigned integer. Flags describing - // support for 32 bpp bitmaps. + /** + * @see http://msdn.microsoft.com/en-us/library/cc240486.aspx + */ + protected void handleCapabiltySets(ByteBuffer buf) { + // (2 bytes): A 16-bit, unsigned integer. The number of capability sets + // included in the Demand Active PDU. + int numberCapabilities = buf.readSignedShortLE(); - // multipleRectangleSupport (2 bytes): A 16-bit, unsigned integer. Indicates - // whether the use of multiple bitmap rectangles is supported in the Bitmap - // Update (section 2.2.9.1.1.3.1.2). This field MUST be set to TRUE (0x0001) - // because multiple rectangle support is required for a connection to - // proceed. + // (2 bytes): Padding. + buf.skipBytes(2); - // pad2octetsB (2 bytes): A 16-bit, unsigned integer. Padding. Values in - // this field MUST be ignored. - } + for (int i = 0; i < numberCapabilities; i++) { + // (2 bytes): A 16-bit, unsigned integer. The type identifier of the + // capability set. + int capabilitySetType = buf.readUnsignedShortLE(); - /** - * Send all client requests in one hop, to simplify logic. - */ - protected void sendHandshakePackets() { - // Send reactivation sequence in bulk - pushDataToPad("confirm_active", new ByteBuffer((Order) null)); - } + // (2 bytes): A 16-bit, unsigned integer. The length in bytes of the + // capability data, including the size of the capabilitySetType and + // lengthCapability fields. + int lengthCapability = buf.readUnsignedShortLE(); - /** - * Example. - * - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + // (variable): Capability set data which conforms to the structure of the + // type given by the capabilitySetType field. + ByteBuffer capabilityData = buf.readBytes(lengthCapability - 4); - /* @formatter:off */ + switch (capabilitySetType) { + case CAPSTYPE_GENERAL: + break; + case CAPSTYPE_BITMAP: + handleBitmapCapabilities(capabilityData); + break; + case CAPSTYPE_ORDER: + break; + case CAPSTYPE_BITMAPCACHE: + break; + case CAPSTYPE_CONTROL: + break; + case CAPSTYPE_ACTIVATION: + break; + case CAPSTYPE_POINTER: + break; + case CAPSTYPE_SHARE: + break; + case CAPSTYPE_COLORCACHE: + break; + case CAPSTYPE_SOUND: + break; + case CAPSTYPE_INPUT: + break; + case CAPSTYPE_FONT: + break; + case CAPSTYPE_BRUSH: + break; + case CAPSTYPE_GLYPHCACHE: + break; + case CAPSTYPE_OFFSCREENCACHE: + break; + case CAPSTYPE_BITMAPCACHE_HOSTSUPPORT: + break; + case CAPSTYPE_BITMAPCACHE_REV2: + break; + case CAPSTYPE_VIRTUALCHANNEL: + break; + case CAPSTYPE_DRAWNINEGRIDCACHE: + break; + case CAPSTYPE_DRAWGDIPLUS: + break; + case CAPSTYPE_RAIL: + break; + case CAPSTYPE_WINDOW: + break; + case CAPSETTYPE_COMPDESK: + break; + case CAPSETTYPE_MULTIFRAGMENTUPDATE: + break; + case CAPSETTYPE_LARGE_POINTER: + break; + case CAPSETTYPE_SURFACE_COMMANDS: + break; + case CAPSETTYPE_BITMAP_CODECS: + break; + case CAPSSETTYPE_FRAME_ACKNOWLEDGE: + break; + default: + // Ignore + break; + } + + capabilityData.unref(); + } + + // TODO + + buf.unref(); + } + + /** + * @see http://msdn.microsoft.com/en-us/library/cc240554.aspx + */ + protected void handleBitmapCapabilities(ByteBuffer buf) { + + // (2 bytes): A 16-bit, unsigned integer. The server MUST set this field to + // the color depth of the session, while the client SHOULD set this field to + // the color depth requested in the Client Core Data (section 2.2.1.3.2). + int preferredBitsPerPixel = buf.readUnsignedShortLE(); + screen.setPixelFormatRGBTrueColor(preferredBitsPerPixel); + + // receive1BitPerPixel (2 bytes): A 16-bit, unsigned integer. Indicates + // whether the client can receive 1 bpp. This field is ignored and SHOULD be + // set to TRUE (0x0001). + buf.skipBytes(2); + + // receive4BitsPerPixel(2 bytes): A 16-bit, unsigned integer. Indicates + // whether the client can receive 4 bpp. This field is ignored and SHOULD be + // set to TRUE (0x0001). + buf.skipBytes(2); + + // receive8BitsPerPixel (2 bytes): A 16-bit, unsigned integer. Indicates + // whether the client can receive 8 bpp. This field is ignored and SHOULD be + // set to TRUE (0x0001). + buf.skipBytes(2); + + // (2 bytes): A 16-bit, unsigned integer. The width of the desktop in the + // session. + int desktopWidth = buf.readUnsignedShortLE(); + + // (2 bytes): A 16-bit, unsigned integer. The height of the desktop in the + // session. + int desktopHeight = buf.readUnsignedShortLE(); + + screen.setFramebufferSize(desktopWidth, desktopHeight); + + // pad2octets (2 bytes): A 16-bit, unsigned integer. Padding. Values in this + // field MUST be ignored. + + // desktopResizeFlag (2 bytes): A 16-bit, unsigned integer. Indicates + // whether resizing the desktop by using a Deactivation-Reactivation + // Sequence is supported. + + // bitmapCompressionFlag (2 bytes): A 16-bit, unsigned integer. Indicates + // whether bitmap compression is supported. This field MUST be set to TRUE + // (0x0001) because support for compressed bitmaps is required for a + // connection to proceed. + + // highColorFlags (1 byte): An 8-bit, unsigned integer. Client support for + // 16 bpp color modes. This field is ignored and SHOULD be set to zero. + + // drawingFlags (1 byte): An 8-bit, unsigned integer. Flags describing + // support for 32 bpp bitmaps. + + // multipleRectangleSupport (2 bytes): A 16-bit, unsigned integer. Indicates + // whether the use of multiple bitmap rectangles is supported in the Bitmap + // Update (section 2.2.9.1.1.3.1.2). This field MUST be set to TRUE (0x0001) + // because multiple rectangle support is required for a connection to + // proceed. + + // pad2octetsB (2 bytes): A 16-bit, unsigned integer. Padding. Values in + // this field MUST be ignored. + } + + /** + * Send all client requests in one hop, to simplify logic. + */ + protected void sendHandshakePackets() { + // Send reactivation sequence in bulk + pushDataToPad("confirm_active", new ByteBuffer((Order)null)); + } + + /** + * Example. + * + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + + /* @formatter:off */ byte[] packet = new byte[] { 0x67, 0x01, // TS_SHARECONTROLHEADER::totalLength = 0x0167 = 359 bytes 0x11, 0x00, // TS_SHARECONTROLHEADER::pduType = 0x0011 0x0011 = 0x0010 | 0x0001 = TS_PROTOCOL_VERSION | PDUTYPE_DEMANDACTIVEPDU @@ -645,17 +644,17 @@ public class ServerDemandActivePDU extends BaseElement { }; /* @formatter:on */ - RdpState rdpState = new RdpState(); - ScreenDescription screenDescription = new ScreenDescription(); + RdpState rdpState = new RdpState(); + ScreenDescription screenDescription = new ScreenDescription(); - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element demandActive = new ServerDemandActivePDU("demand_active", screenDescription, rdpState); - Element sink = new FakeSink("sink"); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element demandActive = new ServerDemandActivePDU("demand_active", screenDescription, rdpState); + Element sink = new FakeSink("sink"); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, demandActive, sink); - pipeline.link("source", "demand_active", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, demandActive, sink); + pipeline.link("source", "demand_active", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java index dac7e598684..1d7ddc29224 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java @@ -25,235 +25,234 @@ import streamer.Link; */ public class ServerFastPath extends BaseElement { - /** - * TPKT protocol version (first byte). - */ - public static final int PROTOCOL_TPKT = 3; + /** + * TPKT protocol version (first byte). + */ + public static final int PROTOCOL_TPKT = 3; - /** - * Fast path protocol version (first two bits of first byte). - */ - public static final int PROTOCOL_FASTPATH = 0; + /** + * Fast path protocol version (first two bits of first byte). + */ + public static final int PROTOCOL_FASTPATH = 0; + /** + * TPKT packets will be pushed to that pad. + */ + public static final String TPKT_PAD = "tpkt"; - /** - * TPKT packets will be pushed to that pad. - */ - public static final String TPKT_PAD = "tpkt"; + private static final String ORDERS_PAD = "orders"; + private static final String BITMAP_PAD = "bitmap"; + private static final String PALETTE_PAD = "palette"; - private static final String ORDERS_PAD = "orders"; - private static final String BITMAP_PAD = "bitmap"; - private static final String PALETTE_PAD = "palette"; + /** + * Indicates that packet contains 8 byte secure checksum at top of packet. Top + * two bits of first byte. + */ + public static final int FASTPATH_OUTPUT_SECURE_CHECKSUM = 1; - /** - * Indicates that packet contains 8 byte secure checksum at top of packet. Top - * two bits of first byte. - */ - public static final int FASTPATH_OUTPUT_SECURE_CHECKSUM = 1; + /** + * Indicates that packet contains 8 byte secure checksum at top of packet and + * packet content is encrypted. Top two bits of first byte. + */ + public static final int FASTPATH_OUTPUT_ENCRYPTED = 2; - /** - * Indicates that packet contains 8 byte secure checksum at top of packet and - * packet content is encrypted. Top two bits of first byte. - */ - public static final int FASTPATH_OUTPUT_ENCRYPTED = 2; + public static final int FASTPATH_UPDATETYPE_ORDERS = 0; + public static final int FASTPATH_UPDATETYPE_BITMAP = 1; + public static final int FASTPATH_UPDATETYPE_PALETTE = 2; + public static final int FASTPATH_UPDATETYPE_SYNCHRONIZE = 3; + public static final int FASTPATH_UPDATETYPE_SURFCMDS = 4; + public static final int FASTPATH_UPDATETYPE_PTR_NULL = 5; + public static final int FASTPATH_UPDATETYPE_PTR_DEFAULT = 6; + public static final int FASTPATH_UPDATETYPE_PTR_POSITION = 8; + public static final int FASTPATH_UPDATETYPE_COLOR = 9; + public static final int FASTPATH_UPDATETYPE_CACHED = 0xa; + public static final int FASTPATH_UPDATETYPE_POINTER = 0xb; - public static final int FASTPATH_UPDATETYPE_ORDERS = 0; - public static final int FASTPATH_UPDATETYPE_BITMAP = 1; - public static final int FASTPATH_UPDATETYPE_PALETTE = 2; - public static final int FASTPATH_UPDATETYPE_SYNCHRONIZE = 3; - public static final int FASTPATH_UPDATETYPE_SURFCMDS = 4; - public static final int FASTPATH_UPDATETYPE_PTR_NULL = 5; - public static final int FASTPATH_UPDATETYPE_PTR_DEFAULT = 6; - public static final int FASTPATH_UPDATETYPE_PTR_POSITION = 8; - public static final int FASTPATH_UPDATETYPE_COLOR = 9; - public static final int FASTPATH_UPDATETYPE_CACHED = 0xa; - public static final int FASTPATH_UPDATETYPE_POINTER = 0xb; + public static final int FASTPATH_FRAGMENT_SINGLE = 0; + public static final int FASTPATH_FRAGMENT_LAST = 1; + public static final int FASTPATH_FRAGMENT_FIRST = 2; + public static final int FASTPATH_FRAGMENT_NEXT = 3; - public static final int FASTPATH_FRAGMENT_SINGLE = 0; - public static final int FASTPATH_FRAGMENT_LAST = 1; - public static final int FASTPATH_FRAGMENT_FIRST = 2; - public static final int FASTPATH_FRAGMENT_NEXT = 3; + public static final int FASTPATH_OUTPUT_COMPRESSION_USED = 2; - public static final int FASTPATH_OUTPUT_COMPRESSION_USED = 2; - - public ServerFastPath(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - //* DEBUG */System.out.println(buf.toHexString(buf.length)); - - // We need at 4 bytes to read packet type (TPKT or FastPath) and packet - // length - if (!cap(buf, 4, UNLIMITED, link, false)) - return; - - int typeAndFlags = buf.readUnsignedByte(); - - if (typeAndFlags == PROTOCOL_TPKT) { - // - // TPKT - // - - // Reserved - buf.skipBytes(1); - - // Read TPKT length - int length = buf.readUnsignedShort(); - - if (!cap(buf, length, length, link, false)) - // Wait for full packet to arrive - return; - - pushDataToPad(TPKT_PAD, buf); - - // TPKT is handled - return; + public ServerFastPath(String id) { + super(id); } - // - // FastPath - // - // Number of bytes in updateData field (including header (1+1 or 2 - // bytes)) - int length = buf.readVariableUnsignedShort(); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - // Length is the size of payload, so we need to calculate from cursor - if (!cap(buf, length, length, link, false)) - // Wait for full packet to arrive - return; + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - int type = typeAndFlags & 0x3; - int securityFlags = (typeAndFlags >> 6) & 0x3; + //* DEBUG */System.out.println(buf.toHexString(buf.length)); - // Assertions - { - if (type != PROTOCOL_FASTPATH) - throw new RuntimeException("Unknown protocol. Expected protocol: 0 (FastPath). Actual protocol: " + type + ", data: " + buf + "."); + // We need at 4 bytes to read packet type (TPKT or FastPath) and packet + // length + if (!cap(buf, 4, UNLIMITED, link, false)) + return; - switch (securityFlags) { - case FASTPATH_OUTPUT_SECURE_CHECKSUM: - // TODO - throw new RuntimeException("Secure checksum is not supported in FastPath packets."); - case FASTPATH_OUTPUT_ENCRYPTED: - // TODO - throw new RuntimeException("Encryption is not supported in FastPath packets."); - } + int typeAndFlags = buf.readUnsignedByte(); + + if (typeAndFlags == PROTOCOL_TPKT) { + // + // TPKT + // + + // Reserved + buf.skipBytes(1); + + // Read TPKT length + int length = buf.readUnsignedShort(); + + if (!cap(buf, length, length, link, false)) + // Wait for full packet to arrive + return; + + pushDataToPad(TPKT_PAD, buf); + + // TPKT is handled + return; + } + + // + // FastPath + // + // Number of bytes in updateData field (including header (1+1 or 2 + // bytes)) + int length = buf.readVariableUnsignedShort(); + + // Length is the size of payload, so we need to calculate from cursor + if (!cap(buf, length, length, link, false)) + // Wait for full packet to arrive + return; + + int type = typeAndFlags & 0x3; + int securityFlags = (typeAndFlags >> 6) & 0x3; + + // Assertions + { + if (type != PROTOCOL_FASTPATH) + throw new RuntimeException("Unknown protocol. Expected protocol: 0 (FastPath). Actual protocol: " + type + ", data: " + buf + "."); + + switch (securityFlags) { + case FASTPATH_OUTPUT_SECURE_CHECKSUM: + // TODO + throw new RuntimeException("Secure checksum is not supported in FastPath packets."); + case FASTPATH_OUTPUT_ENCRYPTED: + // TODO + throw new RuntimeException("Encryption is not supported in FastPath packets."); + } + } + + // TODO: optional FIPS information, when FIPS is selected + // TODO: optional data signature (checksum), when checksum or FIPS is + // selected + + // Array of FastPath update fields + while (buf.cursor < buf.length) { + + int updateHeader = buf.readUnsignedByte(); + + int size = buf.readUnsignedShortLE(); + + int updateCode = updateHeader & 0xf; + int fragmentation = (updateHeader >> 4) & 0x3; + int compression = (updateHeader >> 6) & 0x3; + + if (verbose) + System.out.println("[" + this + "] INFO: FastPath update received. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation + ", compression: " + + compression + ", size: " + size + "."); + + ByteBuffer data = buf.readBytes(size); + buf.putMetadata("fragmentation", fragmentation); + buf.putMetadata("compression", compression); + + switch (updateCode) { + + case FASTPATH_UPDATETYPE_ORDERS: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_ORDERS."); + pushDataToPad(ORDERS_PAD, data); + break; + + case FASTPATH_UPDATETYPE_BITMAP: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_BITMAP."); + pushDataToPad(BITMAP_PAD, data); + break; + + case FASTPATH_UPDATETYPE_PALETTE: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PALETTE."); + pushDataToPad(PALETTE_PAD, data); + break; + + case FASTPATH_UPDATETYPE_SYNCHRONIZE: + // @see http://msdn.microsoft.com/en-us/library/cc240625.aspx + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_SYNCHRONIZE."); + + data.unref(); + + if (size != 0) + throw new RuntimeException("Size of FastPath synchronize packet must be 0. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation + + ", compression: " + compression + ", size: " + size + ", data: " + data + "."); + break; + + case FASTPATH_UPDATETYPE_SURFCMDS: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_SURFCMDS."); + + break; + + case FASTPATH_UPDATETYPE_PTR_NULL: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_NULL."); + + break; + + case FASTPATH_UPDATETYPE_PTR_DEFAULT: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_DEFAULT."); + + break; + + case FASTPATH_UPDATETYPE_PTR_POSITION: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_POSITION."); + + break; + + case FASTPATH_UPDATETYPE_COLOR: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_COLOR."); + + break; + + case FASTPATH_UPDATETYPE_CACHED: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_CACHED."); + + break; + + case FASTPATH_UPDATETYPE_POINTER: + if (verbose) + System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_POINTER."); + + break; + + default: + throw new RuntimeException("Unknown FastPath update. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation + ", compression: " + + compression + ", size: " + size + ", data: " + data + "."); + + } + + } + + buf.unref(); } - // TODO: optional FIPS information, when FIPS is selected - // TODO: optional data signature (checksum), when checksum or FIPS is - // selected - - // Array of FastPath update fields - while (buf.cursor < buf.length) { - - int updateHeader = buf.readUnsignedByte(); - - int size = buf.readUnsignedShortLE(); - - int updateCode = updateHeader & 0xf; - int fragmentation = (updateHeader >> 4) & 0x3; - int compression = (updateHeader >> 6) & 0x3; - - if (verbose) - System.out.println("[" + this + "] INFO: FastPath update received. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation + ", compression: " - + compression + ", size: " + size + "."); - - ByteBuffer data = buf.readBytes(size); - buf.putMetadata("fragmentation", fragmentation); - buf.putMetadata("compression", compression); - - switch (updateCode) { - - case FASTPATH_UPDATETYPE_ORDERS: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_ORDERS."); - pushDataToPad(ORDERS_PAD, data); - break; - - case FASTPATH_UPDATETYPE_BITMAP: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_BITMAP."); - pushDataToPad(BITMAP_PAD, data); - break; - - case FASTPATH_UPDATETYPE_PALETTE: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PALETTE."); - pushDataToPad(PALETTE_PAD, data); - break; - - case FASTPATH_UPDATETYPE_SYNCHRONIZE: - // @see http://msdn.microsoft.com/en-us/library/cc240625.aspx - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_SYNCHRONIZE."); - - data.unref(); - - if (size != 0) - throw new RuntimeException("Size of FastPath synchronize packet must be 0. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation - + ", compression: " + compression + ", size: " + size + ", data: " + data + "."); - break; - - case FASTPATH_UPDATETYPE_SURFCMDS: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_SURFCMDS."); - - break; - - case FASTPATH_UPDATETYPE_PTR_NULL: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_NULL."); - - break; - - case FASTPATH_UPDATETYPE_PTR_DEFAULT: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_DEFAULT."); - - break; - - case FASTPATH_UPDATETYPE_PTR_POSITION: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_PTR_POSITION."); - - break; - - case FASTPATH_UPDATETYPE_COLOR: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_COLOR."); - - break; - - case FASTPATH_UPDATETYPE_CACHED: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_CACHED."); - - break; - - case FASTPATH_UPDATETYPE_POINTER: - if (verbose) - System.out.println("[" + this + "] INFO: FASTPATH_UPDATETYPE_POINTER."); - - break; - - default: - throw new RuntimeException("Unknown FastPath update. UpdateCode: " + updateCode + ", fragmentation: " + fragmentation + ", compression: " + compression - + ", size: " + size + ", data: " + data + "."); - - } - - } - - buf.unref(); - } - } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerLicenseErrorPDUValidClient.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerLicenseErrorPDUValidClient.java index 194ffe6db6d..7384c95a212 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerLicenseErrorPDUValidClient.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerLicenseErrorPDUValidClient.java @@ -22,24 +22,24 @@ import streamer.OneTimeSwitch; public class ServerLicenseErrorPDUValidClient extends OneTimeSwitch { - public ServerLicenseErrorPDUValidClient(String id) { - super(id); - } + public ServerLicenseErrorPDUValidClient(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } - /* @formatter:off */ + /* @formatter:off */ // * Server Error alert // //03 00 00 22 02 F0 80 68 00 01 03 EB 70 14 80 00 F1 BC FF 03 10 00 07 00 00 00 02 00 00 00 04 00 00 00 diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java index 671b34a6c8a..b4462534c5a 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java @@ -35,83 +35,84 @@ import streamer.PipelineImpl; */ public class ServerMCSAttachUserConfirmPDU extends OneTimeSwitch { - public static final int MCS_ATTACH_USER_CONFIRM_PDU = 0xb; + public static final int MCS_ATTACH_USER_CONFIRM_PDU = 0xb; - public static final int INITIATOR_PRESENT = 0x2; + public static final int INITIATOR_PRESENT = 0x2; - protected RdpState state; + protected RdpState state; - public ServerMCSAttachUserConfirmPDU(String id, RdpState state) { - super(id); - this.state = state; - } + public ServerMCSAttachUserConfirmPDU(String id, RdpState state) { + super(id); + this.state = state; + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - int typeAndFlags = buf.readUnsignedByte(); - int type = typeAndFlags >> 2; - int flags = typeAndFlags & 0x3; + int typeAndFlags = buf.readUnsignedByte(); + int type = typeAndFlags >> 2; + int flags = typeAndFlags & 0x3; - if (type != MCS_ATTACH_USER_CONFIRM_PDU) - throw new RuntimeException("["+this+"] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 11, actual value: " + type + ", data: " + buf + "."); + if (type != MCS_ATTACH_USER_CONFIRM_PDU) + throw new RuntimeException("[" + this + "] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 11, actual value: " + type + ", data: " + buf + + "."); - if (flags != INITIATOR_PRESENT) - throw new RuntimeException("Initator field is not present in MCS AttachUserConfirm PDU. Data: " + buf + "."); + if (flags != INITIATOR_PRESENT) + throw new RuntimeException("Initator field is not present in MCS AttachUserConfirm PDU. Data: " + buf + "."); - int rtSuccess = buf.readUnsignedByte() >> 4; - if (rtSuccess != 0) - throw new RuntimeException("["+this+"] ERROR: Cannot attach user: request failed. Error code: " + rtSuccess + ", data: " + buf + "."); + int rtSuccess = buf.readUnsignedByte() >> 4; + if (rtSuccess != 0) + throw new RuntimeException("[" + this + "] ERROR: Cannot attach user: request failed. Error code: " + rtSuccess + ", data: " + buf + "."); - // If the initiator field is present, the client stores the value of the - // initiator in the User Channel ID store , because the initiator specifies - // the User Channel ID. - state.serverUserChannelId = buf.readUnsignedShort() + 1001; + // If the initiator field is present, the client stores the value of the + // initiator in the User Channel ID store , because the initiator specifies + // the User Channel ID. + state.serverUserChannelId = buf.readUnsignedShort() + 1001; - buf.unref(); + buf.unref(); - // Next: client MCS Channel Join Request PDU (s) - switchOff(); - } + // Next: client MCS Channel Join Request PDU (s) + switchOff(); + } - /** - * Example. - */ - /** - * Example. - * - * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + /** + * Example. + */ + /** + * Example. + * + * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - byte[] packet = new byte[] { (byte) 0x2E, // MCS user confirm (001011.., - // 0xb), InitiatorPresent: 1 - // (......01, 0x1) - (byte) 0x00, // RT successfull (0000...., 0x0) - // Initiator: 1001+3 = 1004 - (byte) 0x00, (byte) 0x03, }; + byte[] packet = new byte[] {(byte)0x2E, // MCS user confirm (001011.., + // 0xb), InitiatorPresent: 1 + // (......01, 0x1) + (byte)0x00, // RT successfull (0000...., 0x0) + // Initiator: 1001+3 = 1004 + (byte)0x00, (byte)0x03,}; - RdpState rdpState = new RdpState(); - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet, new byte[] { 1, 2, 3 })); - Element atachUserConfirm = new ServerMCSAttachUserConfirmPDU("attach_user_confirm", rdpState); - Element sink = new MockSink("sink"); - Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 })); + RdpState rdpState = new RdpState(); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet, new byte[] {1, 2, 3})); + Element atachUserConfirm = new ServerMCSAttachUserConfirmPDU("attach_user_confirm", rdpState); + Element sink = new MockSink("sink"); + Element mainSink = new MockSink("mainSink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3})); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, atachUserConfirm, sink, mainSink); - pipeline.link("source", "attach_user_confirm", "mainSink"); - pipeline.link("attach_user_confirm >" + OTOUT, "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, atachUserConfirm, sink, mainSink); + pipeline.link("source", "attach_user_confirm", "mainSink"); + pipeline.link("attach_user_confirm >" + OTOUT, "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); - if (rdpState.serverUserChannelId != 1004) - System.err.println("Incorrect user channel ID. Expected value: 1004, actual value: " + rdpState.serverUserChannelId + "."); - } + if (rdpState.serverUserChannelId != 1004) + System.err.println("Incorrect user channel ID. Expected value: 1004, actual value: " + rdpState.serverUserChannelId + "."); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java index 6560e78bb01..e753cd9a99f 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java @@ -20,27 +20,27 @@ import streamer.ByteBuffer; import streamer.Link; import streamer.OneTimeSwitch; -public class ServerMCSChannelJoinConfirmPDU extends OneTimeSwitch { +public class ServerMCSChannelJoinConfirmPDU extends OneTimeSwitch { - protected int channel; + protected int channel; - public ServerMCSChannelJoinConfirmPDU(String id, int channel) { - super(id); - this.channel=channel; - } + public ServerMCSChannelJoinConfirmPDU(String id, int channel) { + super(id); + this.channel = channel; + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java index a1a41630f15..030edbf683e 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java @@ -25,24 +25,24 @@ import streamer.OneTimeSwitch; * * @see http://msdn.microsoft.com/en-us/library/cc240682.aspx */ -public class ServerMCSConnectResponse extends OneTimeSwitch { +public class ServerMCSConnectResponse extends OneTimeSwitch { - public ServerMCSConnectResponse(String id) { - super(id); - } + public ServerMCSConnectResponse(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java index 5041b0b143a..d9e4f425901 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java @@ -27,123 +27,123 @@ import streamer.PipelineImpl; public class ServerMCSPDU extends BaseElement { - public ServerMCSPDU(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - byte headerByte = buf.readSignedByte(); - int type = headerByte >> 2; - - switch (type) { - // Expected type: send data indication: 26 (0x1a, top 6 bits, or 0x68) - case 0x1a: { - // int userId = buf.readUnsignedShort() + 1001; // User ID: 1002 (1001+1) - buf.skipBytes(2); // Ignore user ID - - int channelId = buf.readUnsignedShort(); // Channel ID: 1003 - - int flags = buf.readSignedByte(); - if ((flags & 0x30) != 0x30) - throw new RuntimeException("Fragmented MCS packets are not supported."); - - int payloadLength = buf.readVariableUnsignedShort(); - - ByteBuffer data = buf.readBytes(payloadLength); - - buf.unref(); - - pushDataToPad("channel_" + channelId, data); - break; + public ServerMCSPDU(String id) { + super(id); } - case 0x8: { - // Disconnection sequence. - buf.unref(); - break; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + byte headerByte = buf.readSignedByte(); + int type = headerByte >> 2; + + switch (type) { + // Expected type: send data indication: 26 (0x1a, top 6 bits, or 0x68) + case 0x1a: { + // int userId = buf.readUnsignedShort() + 1001; // User ID: 1002 (1001+1) + buf.skipBytes(2); // Ignore user ID + + int channelId = buf.readUnsignedShort(); // Channel ID: 1003 + + int flags = buf.readSignedByte(); + if ((flags & 0x30) != 0x30) + throw new RuntimeException("Fragmented MCS packets are not supported."); + + int payloadLength = buf.readVariableUnsignedShort(); + + ByteBuffer data = buf.readBytes(payloadLength); + + buf.unref(); + + pushDataToPad("channel_" + channelId, data); + break; + } + + case 0x8: { + // Disconnection sequence. + buf.unref(); + break; + } + + default: + throw new RuntimeException("Unsupported MCS packet type: " + type + "(" + headerByte + "), data: " + buf + "."); + } + } - default: - throw new RuntimeException("Unsupported MCS packet type: " + type + "(" + headerByte + "), data: " + buf + "."); + /** + * Example. + * + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + // System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + + byte[] packet = new byte[] { + // TPKT + (byte)0x03, (byte)0x00, // TPKT Header: TPKT version = 3 + (byte)0x00, (byte)0x1B, // TPKT length: 27 bytes + + // X224 + (byte)0x02, // X224 Length: 2 bytes + (byte)0xF0, // X224 Type: Data + (byte)0x80, // X224 EOT + + // MCS + // Type: send data indication: 26 (0x1a, top 6 bits) + (byte)0x68, // ?? + + (byte)0x00, (byte)0x01, // User ID: 1002 (1001+1) + (byte)0x03, (byte)0xEB, // Channel ID: 1003 + (byte)0x70, // Data priority: high, segmentation: begin|end + (byte)0x0D, // Payload length: 13 bytes + + // Deactivate all PDU + (byte)0x0D, (byte)0x00, // Length: 13 bytes (LE) + + // - PDUType: 22 (0x16, LE) + // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU + // ProtocolVersion: (000000000001....) 1 + (byte)0x16, (byte)0x00, + + (byte)0xEA, (byte)0x03, // PDU source: 1002 (LE) + (byte)0xEA, (byte)0x03, (byte)0x01, (byte)0x00, // ShareID = 66538 + + (byte)0x01, (byte)0x00, // Length if source descriptor: 1 (LE) + (byte)0x00, // Source descriptor (should be set to 0): 0 + }; + + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element mcs = new ServerMCSPDU("mcs") { + { + verbose = true; + } + }; + Element tpkt = new ServerTpkt("tpkt"); + Element x224 = new ServerX224DataPdu("x224"); + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { + // Deactivate all PDU + (byte)0x0D, (byte)0x00, // Length: 13 bytes (LE) + + // - PDUType: 22 (0x16, LE) + // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU + // ProtocolVersion: (000000000001....) 1 + (byte)0x16, (byte)0x00, + + (byte)0xEA, (byte)0x03, // PDU source: 1002 (LE) + (byte)0xEA, (byte)0x03, (byte)0x01, (byte)0x00, // ShareID = 66538 + + (byte)0x01, (byte)0x00, // Length if source descriptor: 1 (LE) + (byte)0x00, // Source descriptor (should be set to 0): 0 + })); + + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, tpkt, x224, mcs, sink); + pipeline.link("source", "tpkt", "x224", "mcs >channel_1003", "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); } - } - - /** - * Example. - * - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - - byte[] packet = new byte[] { - // TPKT - (byte) 0x03, (byte) 0x00, // TPKT Header: TPKT version = 3 - (byte) 0x00, (byte) 0x1B, // TPKT length: 27 bytes - - // X224 - (byte) 0x02, // X224 Length: 2 bytes - (byte) 0xF0, // X224 Type: Data - (byte) 0x80, // X224 EOT - - // MCS - // Type: send data indication: 26 (0x1a, top 6 bits) - (byte) 0x68, // ?? - - (byte) 0x00, (byte) 0x01, // User ID: 1002 (1001+1) - (byte) 0x03, (byte) 0xEB, // Channel ID: 1003 - (byte) 0x70, // Data priority: high, segmentation: begin|end - (byte) 0x0D, // Payload length: 13 bytes - - // Deactivate all PDU - (byte) 0x0D, (byte) 0x00, // Length: 13 bytes (LE) - - // - PDUType: 22 (0x16, LE) - // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU - // ProtocolVersion: (000000000001....) 1 - (byte) 0x16, (byte) 0x00, - - (byte) 0xEA, (byte) 0x03, // PDU source: 1002 (LE) - (byte) 0xEA, (byte) 0x03, (byte) 0x01, (byte) 0x00, // ShareID = 66538 - - (byte) 0x01, (byte) 0x00, // Length if source descriptor: 1 (LE) - (byte) 0x00, // Source descriptor (should be set to 0): 0 - }; - - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element mcs = new ServerMCSPDU("mcs") { - { - verbose = true; - } - }; - Element tpkt = new ServerTpkt("tpkt"); - Element x224 = new ServerX224DataPdu("x224"); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { - // Deactivate all PDU - (byte) 0x0D, (byte) 0x00, // Length: 13 bytes (LE) - - // - PDUType: 22 (0x16, LE) - // Type: (............0110) TS_PDUTYPE_DEACTIVATEALLPDU - // ProtocolVersion: (000000000001....) 1 - (byte) 0x16, (byte) 0x00, - - (byte) 0xEA, (byte) 0x03, // PDU source: 1002 (LE) - (byte) 0xEA, (byte) 0x03, (byte) 0x01, (byte) 0x00, // ShareID = 66538 - - (byte) 0x01, (byte) 0x00, // Length if source descriptor: 1 (LE) - (byte) 0x00, // Source descriptor (should be set to 0): 0 - })); - - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, tpkt, x224, mcs, sink); - pipeline.link("source", "tpkt", "x224", "mcs >channel_1003", "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } - } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java index ec68dcaed8c..290c1bcf9e7 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java @@ -16,14 +16,13 @@ // under the License. package rdpclient; - /** * Try to determine packet content by it header fingerprint. */ public class ServerPacketSniffer extends PacketSniffer { - private static final Pair[] serverRegexps = new Pair[] { - // @formatter:off + private static final Pair[] serverRegexps = new Pair[] { +// @formatter:off new Pair("Server FastPath update", "04"), new Pair("Server X224ConnectionRequest", "03 00 XX XX 0E D0"), new Pair("Server MCSConnectResponse", "03 00 XX XX 02 F0 80 7F 66 5A"), @@ -42,11 +41,10 @@ public class ServerPacketSniffer extends PacketSniffer { // new Pair("Server FastPath update with flags or continuation", ".*"), // @formatter:on - }; - - public ServerPacketSniffer(String id) { - super(id, serverRegexps); - } + }; + public ServerPacketSniffer(String id) { + super(id, serverRegexps); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPaletteUpdate.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPaletteUpdate.java index 3b0762e6995..8fb2fe0498b 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPaletteUpdate.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPaletteUpdate.java @@ -18,61 +18,60 @@ package rdpclient; import java.awt.image.IndexColorModel; -import common.ScreenDescription; - import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; +import common.ScreenDescription; /** * @see http://msdn.microsoft.com/en-us/library/cc240623.aspx */ public class ServerPaletteUpdate extends BaseElement { - public static final int UPDATETYPE_PALETTE = 0x0002; - protected ScreenDescription screen; + public static final int UPDATETYPE_PALETTE = 0x0002; + protected ScreenDescription screen; - public ServerPaletteUpdate(String id, ScreenDescription screen) { - super(id); - this.screen = screen; - } + public ServerPaletteUpdate(String id, ScreenDescription screen) { + super(id); + this.screen = screen; + } - @Override - public void handleData(ByteBuffer buf, Link link) { + @Override + public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // (2 bytes): A 16-bit, unsigned integer. The update type. This field MUST - // be set to UPDATETYPE_PALETTE (0x0002). - int updateType = buf.readUnsignedShortLE(); - if (updateType != UPDATETYPE_PALETTE) - throw new RuntimeException("Unexpected update type. Expected type: UPDATETYPE_PALETTE (0x0002), actual value: " + updateType + ", data: " + buf + "."); + // (2 bytes): A 16-bit, unsigned integer. The update type. This field MUST + // be set to UPDATETYPE_PALETTE (0x0002). + int updateType = buf.readUnsignedShortLE(); + if (updateType != UPDATETYPE_PALETTE) + throw new RuntimeException("Unexpected update type. Expected type: UPDATETYPE_PALETTE (0x0002), actual value: " + updateType + ", data: " + buf + "."); - // pad2Octets (2 bytes): A 16-bit, unsigned integer. Padding. Values in this - // field MUST be ignored. - buf.skipBytes(2); + // pad2Octets (2 bytes): A 16-bit, unsigned integer. Padding. Values in this + // field MUST be ignored. + buf.skipBytes(2); - // (4 bytes): A 32-bit, unsigned integer. The number of RGB triplets in the - // paletteData field. This field MUST be set to 256 (the number of entries - // in an 8 bpp palette). - int numberColors = (int) buf.readUnsignedIntLE(); - if (numberColors != 256) - throw new RuntimeException("Unexpected value for number of color field in server Palette Update packet. Expected value: 256 colors, actual value: " - + numberColors + ", data: " + buf + "."); + // (4 bytes): A 32-bit, unsigned integer. The number of RGB triplets in the + // paletteData field. This field MUST be set to 256 (the number of entries + // in an 8 bpp palette). + int numberColors = (int)buf.readUnsignedIntLE(); + if (numberColors != 256) + throw new RuntimeException("Unexpected value for number of color field in server Palette Update packet. Expected value: 256 colors, actual value: " + + numberColors + ", data: " + buf + "."); - // (variable): An array of palette entries in RGB triplet format packed on - // byte boundaries. The number of triplet entries is given by the - // numberColors field. - ByteBuffer paletteEntries = buf.readBytes(numberColors * 3); + // (variable): An array of palette entries in RGB triplet format packed on + // byte boundaries. The number of triplet entries is given by the + // numberColors field. + ByteBuffer paletteEntries = buf.readBytes(numberColors * 3); - // In the case of a Palette Update, the client MUST update the global - // palette on all drawing surfaces - screen.colorMap = new IndexColorModel(8, numberColors, paletteEntries.data, paletteEntries.offset, false); + // In the case of a Palette Update, the client MUST update the global + // palette on all drawing surfaces + screen.colorMap = new IndexColorModel(8, numberColors, paletteEntries.data, paletteEntries.offset, false); - /* DEBUG */buf.assertThatBufferIsFullyRead(); + /* DEBUG */buf.assertThatBufferIsFullyRead(); - buf.unref(); - } + buf.unref(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java index 2dc6f960d71..ad8704deb92 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java @@ -20,24 +20,24 @@ import streamer.ByteBuffer; import streamer.Link; import streamer.OneTimeSwitch; -public class ServerSynchronizePDU extends OneTimeSwitch { +public class ServerSynchronizePDU extends OneTimeSwitch { - public ServerSynchronizePDU(String id) { - super(id); - } + public ServerSynchronizePDU(String id) { + super(id); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Ignore packet - buf.unref(); - switchOff(); - } + // Ignore packet + buf.unref(); + switchOff(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java index 0813dfa327e..240c6243459 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java @@ -22,49 +22,49 @@ import streamer.Link; public class ServerTpkt extends BaseElement { - /** - * TPKT protocol version (first byte). - */ - public static final int PROTOCOL_TPKT = 3; + /** + * TPKT protocol version (first byte). + */ + public static final int PROTOCOL_TPKT = 3; - public ServerTpkt(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // We need at least 4 bytes to get packet length - if(!cap(buf, 4, UNLIMITED, link, false)) - return; - - int version = buf.readUnsignedByte(); - if (version != PROTOCOL_TPKT) - throw new RuntimeException("Unexpected data in TPKT header. Expected TPKT version: 0x03, actual value: " + buf + "."); - - buf.skipBytes(1); // Reserved byte - - // Length of whole packet, including header - int length = buf.readUnsignedShort(); - if(!cap(buf, length, length, link, false)) - return; - - int payloadLength = length - buf.cursor; - - // Extract payload - ByteBuffer outBuf = buf.slice(buf.cursor, payloadLength, true); - buf.unref(); - - if(verbose) { - outBuf.putMetadata("source", this); + public ServerTpkt(String id) { + super(id); } - pushDataToAllOuts(outBuf); - } + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; + + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + // We need at least 4 bytes to get packet length + if (!cap(buf, 4, UNLIMITED, link, false)) + return; + + int version = buf.readUnsignedByte(); + if (version != PROTOCOL_TPKT) + throw new RuntimeException("Unexpected data in TPKT header. Expected TPKT version: 0x03, actual value: " + buf + "."); + + buf.skipBytes(1); // Reserved byte + + // Length of whole packet, including header + int length = buf.readUnsignedShort(); + if (!cap(buf, length, length, link, false)) + return; + + int payloadLength = length - buf.cursor; + + // Extract payload + ByteBuffer outBuf = buf.slice(buf.cursor, payloadLength, true); + buf.unref(); + + if (verbose) { + outBuf.putMetadata("source", this); + } + + pushDataToAllOuts(outBuf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java index a7c8cdd88f7..c320573dc33 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java @@ -35,154 +35,154 @@ import streamer.PipelineImpl; */ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { - public static final int X224_TPDU_CONNECTION_REQUEST = 0xe0; - public static final int X224_TPDU_CONNECTION_CONFIRM = 0xd0; - public static final int X224_TPDU_DISCONNECTION_REQUEST = 0x80; - public static final int X224_TPDU_DISCONNECTION_CONFIRM = 0xc0; - public static final int X224_TPDU_EXPEDITED_DATA = 0x10; - public static final int X224_TPDU_DATA_ACKNOWLEDGE = 0x61; - public static final int X224_TPDU_EXPEDITET_ACKNOWLEDGE = 0x40; - public static final int X224_TPDU_REJECT = 0x51; - public static final int X224_TPDU_ERROR = 0x70; - public static final int X224_TPDU_PROTOCOL_IDENTIFIER = 0x01; + public static final int X224_TPDU_CONNECTION_REQUEST = 0xe0; + public static final int X224_TPDU_CONNECTION_CONFIRM = 0xd0; + public static final int X224_TPDU_DISCONNECTION_REQUEST = 0x80; + public static final int X224_TPDU_DISCONNECTION_CONFIRM = 0xc0; + public static final int X224_TPDU_EXPEDITED_DATA = 0x10; + public static final int X224_TPDU_DATA_ACKNOWLEDGE = 0x61; + public static final int X224_TPDU_EXPEDITET_ACKNOWLEDGE = 0x40; + public static final int X224_TPDU_REJECT = 0x51; + public static final int X224_TPDU_ERROR = 0x70; + public static final int X224_TPDU_PROTOCOL_IDENTIFIER = 0x01; - /** - * The server requires that the client support Enhanced RDP Security with - * either TLS 1.0, 1.1 or 1.2 or CredSSP. If only CredSSP was requested then - * the server only supports TLS. - */ - public static final int SSL_REQUIRED_BY_SERVER = 0x00000001; + /** + * The server requires that the client support Enhanced RDP Security with + * either TLS 1.0, 1.1 or 1.2 or CredSSP. If only CredSSP was requested then + * the server only supports TLS. + */ + public static final int SSL_REQUIRED_BY_SERVER = 0x00000001; - /** - * The server is configured to only use Standard RDP Security mechanisms and - * does not support any External Security Protocols. - */ - public static final int SSL_NOT_ALLOWED_BY_SERVER = 0x00000002; + /** + * The server is configured to only use Standard RDP Security mechanisms and + * does not support any External Security Protocols. + */ + public static final int SSL_NOT_ALLOWED_BY_SERVER = 0x00000002; - /** - * The server does not possess a valid authentication certificate and cannot - * initialize the External Security Protocol Provider. - */ - public static final int SSL_CERT_NOT_ON_SERVER = 0x00000003; + /** + * The server does not possess a valid authentication certificate and cannot + * initialize the External Security Protocol Provider. + */ + public static final int SSL_CERT_NOT_ON_SERVER = 0x00000003; - /** - * The list of requested security protocols is not consistent with the current - * security protocol in effect. This error is only possible when the Direct - * Approach is used and an External Security Protocolis already being used. - */ - public static final int INCONSISTENT_FLAGS = 0x00000004; + /** + * The list of requested security protocols is not consistent with the current + * security protocol in effect. This error is only possible when the Direct + * Approach is used and an External Security Protocolis already being used. + */ + public static final int INCONSISTENT_FLAGS = 0x00000004; - /** - * The server requires that the client support Enhanced RDP Security with - * CredSSP. - */ - public static final int HYBRID_REQUIRED_BY_SERVER = 0x00000005; + /** + * The server requires that the client support Enhanced RDP Security with + * CredSSP. + */ + public static final int HYBRID_REQUIRED_BY_SERVER = 0x00000005; - /** - * The server requires that the client support Enhanced RDP Security with TLS - * 1.0, 1.1 or 1.2 and certificate-based client authentication. - */ - public static final int SSL_WITH_USER_AUTH_REQUIRED_BY_SERVER = 0x00000006; + /** + * The server requires that the client support Enhanced RDP Security with TLS + * 1.0, 1.1 or 1.2 and certificate-based client authentication. + */ + public static final int SSL_WITH_USER_AUTH_REQUIRED_BY_SERVER = 0x00000006; - public ServerX224ConnectionConfirmPDU(String id) { - super(id); - } - - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - int x224Length = buf.readVariableSignedIntLE(); - - int x224Type = buf.readUnsignedByte(); - if (x224Type != X224_TPDU_CONNECTION_CONFIRM) - throw new RuntimeException("Unexpected type of packet. Expected type: " + X224_TPDU_CONNECTION_CONFIRM + " (CONNECTION CONFIRM), actual type: " - + x224Type + ", length: " + x224Length + ", buf: " + buf + "."); - - // Ignore destination reference, because client side has only one node - buf.skipBytes(2); - - // Source reference - // int srcRef = buf.readUnsignedShort(); - buf.skipBytes(2); - - // Ignore class and options - buf.skipBytes(1); - - // RDP_NEG_RSP::type (TYPE_RDP_NEG_RSP) - int negType = buf.readUnsignedByte(); - - // RDP_NEG_RSP::flags (0) - buf.skipBytes(1); // Ignore: always 0 - - // RDP_NEG_RSP::length (always 8 bytes) - int length = buf.readUnsignedShortLE(); - - if (length != 8) - throw new RuntimeException("Unexpected length of buffer. Expected value: 8, actual value: " + length + ", RDP NEG buf: " + buf + "."); - - // RDP_NEG_RSP: Selected protocols (PROTOCOL_SSL) - int protocol = buf.readSignedIntLE(); - - if (negType != RdpConstants.RDP_NEG_REQ_TYPE_NEG_RSP) { - // Parse error code, see - // http://msdn.microsoft.com/en-us/library/cc240507.aspx - int errorCode = protocol; - String message = "Unknown error."; - switch (errorCode) { - case SSL_REQUIRED_BY_SERVER: - message = "The server requires that the client support Enhanced RDP Security with either TLS 1.0, 1.1 or 1.2 or CredSSP. If only CredSSP was requested then the server only supports TLS."; - break; - - case SSL_NOT_ALLOWED_BY_SERVER: - message = "The server is configured to only use Standard RDP Security mechanisms and does not support any External Security Protocols."; - break; - - case SSL_CERT_NOT_ON_SERVER: - message = "The server does not possess a valid authentication certificate and cannot initialize the External Security Protocol Provider."; - break; - - case INCONSISTENT_FLAGS: - message = "The list of requested security protocols is not consistent with the current security protocol in effect. This error is only possible when the Direct Approach is used and an External Security Protocolis already being used."; - break; - - case HYBRID_REQUIRED_BY_SERVER: - message = "The server requires that the client support Enhanced RDP Security with CredSSP."; - break; - - case SSL_WITH_USER_AUTH_REQUIRED_BY_SERVER: - message = "The server requires that the client support Enhanced RDP Security with TLS 1.0, 1.1 or 1.2 and certificate-based client authentication."; - break; - - } - throw new RuntimeException("Connection failure: " + message ); + public ServerX224ConnectionConfirmPDU(String id) { + super(id); } + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (buf == null) + return; + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (protocol != RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL) - throw new RuntimeException("Unexpected protocol type. Expected protocol type: " + RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL - + " (SSL), actual response type: " + protocol + ", RDP NEG buf: " + buf + "."); + int x224Length = buf.readVariableSignedIntLE(); - if (verbose) - System.out.println("[" + this + "] INFO: RDP Negotiation response. Type: " + negType + ", protocol: " + protocol + "."); + int x224Type = buf.readUnsignedByte(); + if (x224Type != X224_TPDU_CONNECTION_CONFIRM) + throw new RuntimeException("Unexpected type of packet. Expected type: " + X224_TPDU_CONNECTION_CONFIRM + " (CONNECTION CONFIRM), actual type: " + x224Type + + ", length: " + x224Length + ", buf: " + buf + "."); - // Next: upgrade socket to SSL, send ConnectInitial packet - switchOff(); - } + // Ignore destination reference, because client side has only one node + buf.skipBytes(2); - /** - * Example. - * - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + // Source reference + // int srcRef = buf.readUnsignedShort(); + buf.skipBytes(2); + + // Ignore class and options + buf.skipBytes(1); + + // RDP_NEG_RSP::type (TYPE_RDP_NEG_RSP) + int negType = buf.readUnsignedByte(); + + // RDP_NEG_RSP::flags (0) + buf.skipBytes(1); // Ignore: always 0 + + // RDP_NEG_RSP::length (always 8 bytes) + int length = buf.readUnsignedShortLE(); + + if (length != 8) + throw new RuntimeException("Unexpected length of buffer. Expected value: 8, actual value: " + length + ", RDP NEG buf: " + buf + "."); + + // RDP_NEG_RSP: Selected protocols (PROTOCOL_SSL) + int protocol = buf.readSignedIntLE(); + + if (negType != RdpConstants.RDP_NEG_REQ_TYPE_NEG_RSP) { + // Parse error code, see + // http://msdn.microsoft.com/en-us/library/cc240507.aspx + int errorCode = protocol; + String message = "Unknown error."; + switch (errorCode) { + case SSL_REQUIRED_BY_SERVER: + message = + "The server requires that the client support Enhanced RDP Security with either TLS 1.0, 1.1 or 1.2 or CredSSP. If only CredSSP was requested then the server only supports TLS."; + break; + + case SSL_NOT_ALLOWED_BY_SERVER: + message = "The server is configured to only use Standard RDP Security mechanisms and does not support any External Security Protocols."; + break; + + case SSL_CERT_NOT_ON_SERVER: + message = "The server does not possess a valid authentication certificate and cannot initialize the External Security Protocol Provider."; + break; + + case INCONSISTENT_FLAGS: + message = + "The list of requested security protocols is not consistent with the current security protocol in effect. This error is only possible when the Direct Approach is used and an External Security Protocolis already being used."; + break; + + case HYBRID_REQUIRED_BY_SERVER: + message = "The server requires that the client support Enhanced RDP Security with CredSSP."; + break; + + case SSL_WITH_USER_AUTH_REQUIRED_BY_SERVER: + message = "The server requires that the client support Enhanced RDP Security with TLS 1.0, 1.1 or 1.2 and certificate-based client authentication."; + break; + + } + throw new RuntimeException("Connection failure: " + message); + } + + if (protocol != RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL) + throw new RuntimeException("Unexpected protocol type. Expected protocol type: " + RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL + " (SSL), actual response type: " + + protocol + ", RDP NEG buf: " + buf + "."); + + if (verbose) + System.out.println("[" + this + "] INFO: RDP Negotiation response. Type: " + negType + ", protocol: " + protocol + "."); + + // Next: upgrade socket to SSL, send ConnectInitial packet + switchOff(); + } + + /** + * Example. + * + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); // byte[] packet = new byte[] { // @@ -202,36 +202,36 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { // 0x01, 0x00, 0x00, 0x00 // RDP_NEG_RSP: Selected protocols (PROTOCOL_SSL) // }; - // Connection failure - // 03 00 00 13 0e d0 00 00 12 34 00 03 00 08 00 05 00 00 00 - byte[] packet = new byte[] { + // Connection failure + // 03 00 00 13 0e d0 00 00 12 34 00 03 00 08 00 05 00 00 00 + byte[] packet = new byte[] { 0x03, // -> TPKT Header: TPKT version = 3 - 0x00, // TPKT Header: Reserved = 0 - 0x00, 0x13, // TPKT Header: Packet length - (total = 19 bytes) - 0x0e, // X.224: Length indicator (14 bytes) - (byte) 0xd0, // X.224: Type (high nibble) = 0xd = CC TPDU; credit - // (low nibble) = 0 - 0x00, 0x00, // X.224: Destination reference = 0 - 0x12, 0x34, // X.224: Source reference = 0x1234 (bogus value) - 0x00, // X.224: Class and options = 0 - (byte) 0x03, // Failure - (byte) 0x00, // RDP_NEG_RSP::flags (0) - (byte) 0x08, (byte) 0x00, // RDP_NEG_RSP::length (8 bytes) - (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Code: HYBRID_REQUIRED_BY_SERVER + 0x00, // TPKT Header: Reserved = 0 + 0x00, 0x13, // TPKT Header: Packet length - (total = 19 bytes) + 0x0e, // X.224: Length indicator (14 bytes) + (byte)0xd0, // X.224: Type (high nibble) = 0xd = CC TPDU; credit + // (low nibble) = 0 + 0x00, 0x00, // X.224: Destination reference = 0 + 0x12, 0x34, // X.224: Source reference = 0x1234 (bogus value) + 0x00, // X.224: Class and options = 0 + (byte)0x03, // Failure + (byte)0x00, // RDP_NEG_RSP::flags (0) + (byte)0x08, (byte)0x00, // RDP_NEG_RSP::length (8 bytes) + (byte)0x05, (byte)0x00, (byte)0x00, (byte)0x00, // Code: HYBRID_REQUIRED_BY_SERVER - }; + }; - MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); - Element cc = new ServerX224ConnectionConfirmPDU("cc"); - Element tpkt = new ServerTpkt("tpkt"); - Element sink = new MockSink("sink", new ByteBuffer[] {}); - Element mainSink = new MockSink("mainSink", new ByteBuffer[] {}); + MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); + Element cc = new ServerX224ConnectionConfirmPDU("cc"); + Element tpkt = new ServerTpkt("tpkt"); + Element sink = new MockSink("sink", new ByteBuffer[] {}); + Element mainSink = new MockSink("mainSink", new ByteBuffer[] {}); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source, tpkt, cc, sink, mainSink); - pipeline.link("source", "tpkt", "cc", "mainSink"); - pipeline.link("cc >" + OTOUT, "sink"); - pipeline.runMainLoop("source", STDOUT, false, false); - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source, tpkt, cc, sink, mainSink); + pipeline.link("source", "tpkt", "cc", "mainSink"); + pipeline.link("cc >" + OTOUT, "sink"); + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224DataPdu.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224DataPdu.java index 15489041a08..62b0f557adf 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224DataPdu.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224DataPdu.java @@ -22,43 +22,43 @@ import streamer.Link; public class ServerX224DataPdu extends BaseElement { - public static final int X224_TPDU_LAST_DATA_UNIT = 0x80; - public static final int X224_TPDU_DATA = 0xF0; + public static final int X224_TPDU_LAST_DATA_UNIT = 0x80; + public static final int X224_TPDU_DATA = 0xF0; - public ServerX224DataPdu(String id) { - super(id); - } + public ServerX224DataPdu(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - int headerLength = buf.readVariableSignedIntLE(); + int headerLength = buf.readVariableSignedIntLE(); - if (headerLength != 2) - throw new RuntimeException("Unexpected X224 Data PDU header length. Expected header length: 2 , actual header length: " + headerLength + "."); + if (headerLength != 2) + throw new RuntimeException("Unexpected X224 Data PDU header length. Expected header length: 2 , actual header length: " + headerLength + "."); - // Read X224 type and options - int type = buf.readUnsignedByte(); // High nibble: type, low nibble: + // Read X224 type and options + int type = buf.readUnsignedByte(); // High nibble: type, low nibble: - if ((type & 0xf0) != X224_TPDU_DATA) - throw new RuntimeException("[" + this + "] ERROR: Unexepcted X224 packet type. Expected packet type: " + X224_TPDU_DATA - + " (X224_TPDU_DATA), actual packet type: " + type + ", buf: " + buf + "."); + if ((type & 0xf0) != X224_TPDU_DATA) + throw new RuntimeException("[" + this + "] ERROR: Unexepcted X224 packet type. Expected packet type: " + X224_TPDU_DATA + + " (X224_TPDU_DATA), actual packet type: " + type + ", buf: " + buf + "."); - int options = buf.readUnsignedByte(); + int options = buf.readUnsignedByte(); - if ((options & X224_TPDU_LAST_DATA_UNIT) != X224_TPDU_LAST_DATA_UNIT) - throw new RuntimeException("Unexepcted X224 packet options. Expected options: " + X224_TPDU_LAST_DATA_UNIT - + " (X224_TPDU_LAST_DATA_UNIT), actual packet options: " + options + ", buf: " + buf + "."); + if ((options & X224_TPDU_LAST_DATA_UNIT) != X224_TPDU_LAST_DATA_UNIT) + throw new RuntimeException("Unexepcted X224 packet options. Expected options: " + X224_TPDU_LAST_DATA_UNIT + + " (X224_TPDU_LAST_DATA_UNIT), actual packet options: " + options + ", buf: " + buf + "."); - ByteBuffer payload = buf.readBytes(buf.length - buf.cursor); + ByteBuffer payload = buf.readBytes(buf.length - buf.cursor); - buf.unref(); + buf.unref(); - pushDataToAllOuts(payload); - } + pushDataToAllOuts(payload); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/TrustAllX509TrustManager.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/TrustAllX509TrustManager.java index aaf93b0cc90..088094a38e6 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/TrustAllX509TrustManager.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/TrustAllX509TrustManager.java @@ -21,20 +21,20 @@ import java.security.cert.X509Certificate; import javax.net.ssl.X509TrustManager; public class TrustAllX509TrustManager implements X509TrustManager { - @Override - public void checkClientTrusted(final X509Certificate[] chain, final String authType) { - // TODO: ask user to confirm self-signed certificates - } + @Override + public void checkClientTrusted(final X509Certificate[] chain, final String authType) { + // TODO: ask user to confirm self-signed certificates + } - @Override - public void checkServerTrusted(final X509Certificate[] chain, final String authType) { - // TODO: ask user to confirm self-signed certificates - } + @Override + public void checkServerTrusted(final X509Certificate[] chain, final String authType) { + // TODO: ask user to confirm self-signed certificates + } - @Override - public X509Certificate[] getAcceptedIssuers() { - // TODO: use system CA certificates here - return null; - } + @Override + public X509Certificate[] getAcceptedIssuers() { + // TODO: use system CA certificates here + return null; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/UpgradeSocketToSSL.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/UpgradeSocketToSSL.java index d4c08f189c7..72677081859 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/UpgradeSocketToSSL.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/UpgradeSocketToSSL.java @@ -24,21 +24,21 @@ import streamer.OneTimeSwitch; public class UpgradeSocketToSSL extends OneTimeSwitch { - public UpgradeSocketToSSL(String id) { - super(id); - } + public UpgradeSocketToSSL(String id) { + super(id); + } - @Override - protected void onStart() { + @Override + protected void onStart() { - sendEventToAllPads(Event.SOCKET_UPGRADE_TO_SSL, Direction.IN); - switchOff(); - } + sendEventToAllPads(Event.SOCKET_UPGRADE_TO_SSL, Direction.IN); + switchOff(); + } - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - throw new RuntimeException("Unexpected data: " + buf + "."); + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + throw new RuntimeException("Unexpected data: " + buf + "."); - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/AssertingByteBuffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/AssertingByteBuffer.java index 195847524a3..fe9cc50ad60 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/AssertingByteBuffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/AssertingByteBuffer.java @@ -23,85 +23,85 @@ import java.nio.charset.Charset; */ public class AssertingByteBuffer extends ByteBuffer { - public AssertingByteBuffer(byte[] expectedData) { - super(expectedData); - } + public AssertingByteBuffer(byte[] expectedData) { + super(expectedData); + } - private void assertEquals(int expected, int actual) { - if (expected != actual) - throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + ", buf: "+this+"."); - } + private void assertEquals(int expected, int actual) { + if (expected != actual) + throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + ", buf: " + this + "."); + } - @Override - public void writeByte(int b) { - if(b<0) - throw new RuntimeException(); - //*DEBUG*/System.out.println("WriteByte: "+b+", cursor:"+cursor+"."); - assertEquals(readUnsignedByte(), b&0xff); - } + @Override + public void writeByte(int b) { + if (b < 0) + throw new RuntimeException(); + //*DEBUG*/System.out.println("WriteByte: "+b+", cursor:"+cursor+"."); + assertEquals(readUnsignedByte(), b & 0xff); + } - @Override - public void writeShort(int x) { - //*DEBUG*/System.out.println("WriteShort: "+x+", cursor:"+cursor+"."); - assertEquals(readUnsignedShort(), x&0xFFff); - } + @Override + public void writeShort(int x) { + //*DEBUG*/System.out.println("WriteShort: "+x+", cursor:"+cursor+"."); + assertEquals(readUnsignedShort(), x & 0xFFff); + } - @Override - public void writeShortLE(int x) { - //*DEBUG*/System.out.println("WriteShortLE: "+x+", cursor:"+cursor+"."); - assertEquals(readUnsignedShortLE(), x&0xFFff); - } + @Override + public void writeShortLE(int x) { + //*DEBUG*/System.out.println("WriteShortLE: "+x+", cursor:"+cursor+"."); + assertEquals(readUnsignedShortLE(), x & 0xFFff); + } - @Override - public void writeInt(int i) { - //*DEBUG*/System.out.println("WriteInt: "+i+", cursor:"+cursor+"."); - assertEquals(readSignedInt(), i); - } + @Override + public void writeInt(int i) { + //*DEBUG*/System.out.println("WriteInt: "+i+", cursor:"+cursor+"."); + assertEquals(readSignedInt(), i); + } - @Override - public void writeIntLE(int i) { - //*DEBUG*/System.out.println("WriteIntLE: "+i+", cursor:"+cursor+"."); - assertEquals(readSignedIntLE(), i); - } + @Override + public void writeIntLE(int i) { + //*DEBUG*/System.out.println("WriteIntLE: "+i+", cursor:"+cursor+"."); + assertEquals(readSignedIntLE(), i); + } - @Override - public void writeVariableIntLE(int i) { - //*DEBUG*/System.out.println("WriteVariableIntLE: "+i+", cursor:"+cursor+"."); - assertEquals(readVariableSignedIntLE(), i); - } + @Override + public void writeVariableIntLE(int i) { + //*DEBUG*/System.out.println("WriteVariableIntLE: "+i+", cursor:"+cursor+"."); + assertEquals(readVariableSignedIntLE(), i); + } - @Override - public void writeString(String actual, Charset charset) { - //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); - String expected = readString(actual.length(), charset); - if (!actual.equals(expected)) - throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); - } + @Override + public void writeString(String actual, Charset charset) { + //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); + String expected = readString(actual.length(), charset); + if (!actual.equals(expected)) + throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); + } - @Override - public void writeBytes(ByteBuffer actual) { - //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); - ByteBuffer expected = readBytes(actual.length); - if (!actual.equals(expected)) - throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); - } + @Override + public void writeBytes(ByteBuffer actual) { + //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); + ByteBuffer expected = readBytes(actual.length); + if (!actual.equals(expected)) + throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); + } - @Override - public void writeBytes(byte[] actualData) { - ByteBuffer actual = new ByteBuffer(actualData); - //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); - ByteBuffer expected = readBytes(actual.length); - if (!actual.equals(expected)) - throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); - } + @Override + public void writeBytes(byte[] actualData) { + ByteBuffer actual = new ByteBuffer(actualData); + //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); + ByteBuffer expected = readBytes(actual.length); + if (!actual.equals(expected)) + throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); + } - @Override - public void writeBytes(byte[] actualData, int offset, int length) { - ByteBuffer actual = new ByteBuffer(actualData, offset, length); - //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); - ByteBuffer expected = readBytes(actual.length); - if (!actual.equals(expected)) - throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); - } + @Override + public void writeBytes(byte[] actualData, int offset, int length) { + ByteBuffer actual = new ByteBuffer(actualData, offset, length); + //*DEBUG*/System.out.println("WriteString: "+actual+", cursor:"+cursor+"."); + ByteBuffer expected = readBytes(actual.length); + if (!actual.equals(expected)) + throw new RuntimeException("Expected value does not match actual value. Expected value: " + expected + ", actual value: " + actual + "."); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java index 99b628ca137..dd2b541b202 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java @@ -23,395 +23,395 @@ import java.util.Set; public class BaseElement implements Element { - protected String id; + protected String id; - /** - * Constant for @see cap() method to indicate that length is not restricted. - */ - public static final int UNLIMITED = -1; + /** + * Constant for @see cap() method to indicate that length is not restricted. + */ + public static final int UNLIMITED = -1; - /** - * Set to true to enable debugging messages. - */ - protected boolean verbose = false; + /** + * Set to true to enable debugging messages. + */ + protected boolean verbose = false; - /** - * Limit on number of packets sent to sink from this element. Can be handy for - * fake elements and handshake-related elements. - */ - protected int numBuffers = 0; + /** + * Limit on number of packets sent to sink from this element. Can be handy for + * fake elements and handshake-related elements. + */ + protected int numBuffers = 0; - /** - * Number of packets sent to sink. - */ - protected int packetNumber = 0; + /** + * Number of packets sent to sink. + */ + protected int packetNumber = 0; - /** - * Recommended size for incoming buffer in pull mode. - */ - protected int incommingBufLength = -1; + /** + * Recommended size for incoming buffer in pull mode. + */ + protected int incommingBufLength = -1; - protected Map inputPads = new HashMap(); - protected Map outputPads = new HashMap(); + protected Map inputPads = new HashMap(); + protected Map outputPads = new HashMap(); - public BaseElement(String id) { - this.id = id; + public BaseElement(String id) { + this.id = id; - verbose = System.getProperty("streamer.Element.debug", "false").equals("true") || System.getProperty("streamer.Element.debug", "").contains(id); - } - - @Override - public String toString() { - return "Element(" + id + ")"; - } - - @Override - public Link getLink(String padName) { - if (inputPads.containsKey(padName)) - return (Link) inputPads.get(padName); - else if (outputPads.containsKey(padName)) - return (Link) outputPads.get(padName); - else - return null; - } - - @Override - public Set getPads(Direction direction) { - switch (direction) { - case IN: - return inputPads.keySet(); - - case OUT: - return outputPads.keySet(); - } - return null; - } - - @Override - public void validate() { - for (String padName : inputPads.keySet()) { - if (inputPads.get(padName) == null) - throw new RuntimeException("[ " + this + "] Required input pad is not connected. Pad name: " + padName + "."); + verbose = System.getProperty("streamer.Element.debug", "false").equals("true") || System.getProperty("streamer.Element.debug", "").contains(id); } - for (String padName : outputPads.keySet()) { - if (outputPads.get(padName) == null) - throw new RuntimeException("[ " + this + "] Required output pad is not connected. Pad name: " + padName + "."); - } - } - - @Override - public void setLink(String padName, Link link, Direction direction) { - switch (direction) { - case IN: - if (inputPads.get(padName) != null) - throw new RuntimeException("Cannot link more than one wire to same pad. Element: " + this + ", pad: " + padName + ":" + direction + ", new link: " - + link + ", existing link: " + inputPads.get(padName) + "."); - inputPads.put(padName, link); - link.setSink(this); - - break; - - case OUT: - if (outputPads.get(padName) != null) - throw new RuntimeException("Cannot link more than one wire to same pad. Element: " + this + ", pad: " + padName + ":" + direction + ", new link: " - + link + ", existing link: " + outputPads.get(padName) + "."); - - outputPads.put(padName, link); - link.setSource(this); - - break; - } - } - - @Override - public void dropLink(String padName) { - if (inputPads.containsKey(padName)) { - Link link = (Link) inputPads.remove(padName); - if (link != null) - link.setSink(null); + @Override + public String toString() { + return "Element(" + id + ")"; } - if (outputPads.containsKey(padName)) { - Link link = (Link) outputPads.remove(padName); - if (link != null) - link.setSource(null); - } - } - - /** - * By default, try to pull data from input links. - * - * Override this method in data source elements. - */ - @Override - public void poll(boolean block) { - for (DataSource source : inputPads.values()) { - Link link = (Link) source; - ByteBuffer buf = link.pull(block); - - if (buf != null) { - handleData(buf, link); - } - } - } - - /** - * By default, do nothing with incoming data and retransmit data to all output - * pads. - */ - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - pushDataToAllOuts(buf); - } - - /** - * Send data to all output pads. - */ - protected final void pushDataToAllOuts(ByteBuffer buf) { - - if (buf == null) - return; - - if (outputPads.size() == 0) - throw new RuntimeException("Number of outgoing connection is zero. Cannot send data to output. Data: " + buf + "."); - - // Send data to all pads with OUT direction - for (DataSink out : outputPads.values()) { - if (verbose) - System.out.println("[" + this + "] INFO: Sending buf " + buf + " to " + out + "."); - - buf.rewindCursor(); - buf.ref(); - out.sendData(buf); + @Override + public Link getLink(String padName) { + if (inputPads.containsKey(padName)) + return (Link)inputPads.get(padName); + else if (outputPads.containsKey(padName)) + return (Link)outputPads.get(padName); + else + return null; } - buf.unref(); - packetNumber++; - } + @Override + public Set getPads(Direction direction) { + switch (direction) { + case IN: + return inputPads.keySet(); - /** - * Send data to given pad only. - */ - protected void pushDataToPad(String padName, ByteBuffer buf) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Sending buf " + buf + " to " + padName + "."); - - DataSink link = outputPads.get(padName); - if (link == null) - throw new RuntimeException("Output pad of " + this + " element is not connected to a link. Pad name: " + padName + "."); - - buf.rewindCursor(); - link.sendData(buf); - } - - /** - * By default, do nothing with incoming event and retransmit event to all - * pads. - */ - @Override - public void handleEvent(Event event, Direction direction) { - if (verbose) - System.out.println("[" + this + "] INFO: Event " + event + ":" + direction + " is received."); - - switch (event) { - case STREAM_CLOSE: - onClose(); - break; - case STREAM_START: - onStart(); - break; + case OUT: + return outputPads.keySet(); + } + return null; } - sendEventToAllPads(event, direction); - } + @Override + public void validate() { + for (String padName : inputPads.keySet()) { + if (inputPads.get(padName) == null) + throw new RuntimeException("[ " + this + "] Required input pad is not connected. Pad name: " + padName + "."); + } - /** - * Override this method to do something when STREAM_CLOSE event arrives. - */ - protected void onClose() { - } - - /** - * Override this method to do something when STREAM_START event arrives. - */ - protected void onStart() { - } - - /** - * Send event to all outputs. - * - * @param event - * a event - * @param direction - * IN to send event to input pads, OUT to send event to all output - * pads - */ - protected final void sendEventToAllPads(Event event, Direction direction) { - if (verbose) - System.out.println("[" + this + "] INFO: Sending event " + event + ":" + direction + "."); - - switch (direction) { - case IN: - // Send event to all pads with IN direction - for (DataSource in : inputPads.values()) { - in.sendEvent(event, direction); - } - break; - case OUT: - // Send event to all pads with OUT direction - for (DataSink out : outputPads.values()) { - out.sendEvent(event, direction); - } - break; - } - } - - /** - * Ensure that packet has required minimum and maximum length, cuts tail when - * necessary. - * - * @param buf - * a buffer - * @param minLength - * minimum length of packet or -1 - * @param maxLength - * maximum length of packet or -1 - * @param link - * source link, to push unnecessary data back - * @param fromCursor - * if true, then position will be included into calculation - * @return true, - */ - public boolean cap(ByteBuffer buf, int minLength, int maxLength, Link link, boolean fromCursor) { - - if (buf == null) - return false; - - int length = buf.length; - - int cursor; - if (fromCursor) - cursor = buf.cursor; - else - cursor = 0; - - length -= cursor; - - if ((minLength < 0 || length >= minLength) && (maxLength < 0 || length <= maxLength)) - // Buffer is already in bounds - return true; - - // Buffer is too small, wait for the rest of buffer - if (minLength >= 0 && length < minLength) { - - if (verbose) - System.out.println("[" + this + "] INFO: Buffer is too small. Min length: " + minLength + ", data length (after cursor): " + length + "."); - - link.pushBack(buf.slice(0, length + cursor, true), minLength + cursor); - return false; - } else if (maxLength >= 0 && length > maxLength) { - - if (verbose) - System.out.println("[" + this + "] INFO: Buffer is too big. Max length: " + maxLength + ", data length (after cursor): " + length + "."); - - // Buffer is too big, cut unnecessary tail - link.pushBack(buf.slice(maxLength + cursor, length - maxLength, true)); - buf.length = maxLength + cursor; - - } - - return true; - } - - @Override - public void dropLink(Link link) { - if (inputPads.containsValue(link)) { - for (Entry entry : inputPads.entrySet()) - if (link.equals(entry.getValue())) { - inputPads.remove(entry.getKey()); - break; + for (String padName : outputPads.keySet()) { + if (outputPads.get(padName) == null) + throw new RuntimeException("[ " + this + "] Required output pad is not connected. Pad name: " + padName + "."); } } - if (outputPads.containsValue(link)) { - for (Entry entry : outputPads.entrySet()) - if (link.equals(entry.getValue())) { - outputPads.remove(entry.getKey()); - break; - } - } - } + @Override + public void setLink(String padName, Link link, Direction direction) { + switch (direction) { + case IN: + if (inputPads.get(padName) != null) + throw new RuntimeException("Cannot link more than one wire to same pad. Element: " + this + ", pad: " + padName + ":" + direction + ", new link: " + + link + ", existing link: " + inputPads.get(padName) + "."); + inputPads.put(padName, link); + link.setSink(this); - @Override - public void replaceLink(Link existingLink, Link newLink) { - if (inputPads.containsValue(existingLink)) { - for (Entry entry : inputPads.entrySet()) - if (existingLink.equals(entry.getValue())) { - inputPads.put(entry.getKey(), newLink); - newLink.setSink(this); - break; + break; + + case OUT: + if (outputPads.get(padName) != null) + throw new RuntimeException("Cannot link more than one wire to same pad. Element: " + this + ", pad: " + padName + ":" + direction + ", new link: " + + link + ", existing link: " + outputPads.get(padName) + "."); + + outputPads.put(padName, link); + link.setSource(this); + + break; } } - if (outputPads.containsValue(existingLink)) { - for (Entry entry : outputPads.entrySet()) - if (existingLink.equals(entry.getValue())) { - outputPads.put(entry.getKey(), newLink); - newLink.setSource(this); - break; + @Override + public void dropLink(String padName) { + if (inputPads.containsKey(padName)) { + Link link = (Link)inputPads.remove(padName); + if (link != null) + link.setSink(null); + } + + if (outputPads.containsKey(padName)) { + Link link = (Link)outputPads.remove(padName); + if (link != null) + link.setSource(null); } } - } - @Override - public String getId() { - return id; - } + /** + * By default, try to pull data from input links. + * + * Override this method in data source elements. + */ + @Override + public void poll(boolean block) { + for (DataSource source : inputPads.values()) { + Link link = (Link)source; + ByteBuffer buf = link.pull(block); - /** - * Example. - */ - public static void main(String args[]) { - Element source = new FakeSource("source") { - { - this.verbose = true; - this.numBuffers = 10; - this.incommingBufLength = 3; - this.delay = 100; - } - }; + if (buf != null) { + handleData(buf, link); + } + } + } - Element sink = new FakeSink("sink") { - { - this.verbose = true; - } - }; + /** + * By default, do nothing with incoming data and retransmit data to all output + * pads. + */ + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source); - pipeline.add(new BaseElement("t1")); - pipeline.add(new BaseElement("t2")); - pipeline.add(new BaseElement("t3")); - pipeline.add(new BaseElement("t4")); - pipeline.add(sink); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - pipeline.link("source", "t1", "t2", "t3", "t4", "sink"); + pushDataToAllOuts(buf); + } - // Links between source-t1-t2 will operate in pull mode. - // Links between t3-t4-sink will operate in push mode. - // Link between t2-t3 will run main loop (pull from source and push to - // sink). - pipeline.getLink("t3", STDOUT).run(); - } + /** + * Send data to all output pads. + */ + protected final void pushDataToAllOuts(ByteBuffer buf) { + + if (buf == null) + return; + + if (outputPads.size() == 0) + throw new RuntimeException("Number of outgoing connection is zero. Cannot send data to output. Data: " + buf + "."); + + // Send data to all pads with OUT direction + for (DataSink out : outputPads.values()) { + if (verbose) + System.out.println("[" + this + "] INFO: Sending buf " + buf + " to " + out + "."); + + buf.rewindCursor(); + buf.ref(); + out.sendData(buf); + } + + buf.unref(); + packetNumber++; + } + + /** + * Send data to given pad only. + */ + protected void pushDataToPad(String padName, ByteBuffer buf) { + if (buf == null) + return; + + if (verbose) + System.out.println("[" + this + "] INFO: Sending buf " + buf + " to " + padName + "."); + + DataSink link = outputPads.get(padName); + if (link == null) + throw new RuntimeException("Output pad of " + this + " element is not connected to a link. Pad name: " + padName + "."); + + buf.rewindCursor(); + link.sendData(buf); + } + + /** + * By default, do nothing with incoming event and retransmit event to all + * pads. + */ + @Override + public void handleEvent(Event event, Direction direction) { + if (verbose) + System.out.println("[" + this + "] INFO: Event " + event + ":" + direction + " is received."); + + switch (event) { + case STREAM_CLOSE: + onClose(); + break; + case STREAM_START: + onStart(); + break; + } + + sendEventToAllPads(event, direction); + } + + /** + * Override this method to do something when STREAM_CLOSE event arrives. + */ + protected void onClose() { + } + + /** + * Override this method to do something when STREAM_START event arrives. + */ + protected void onStart() { + } + + /** + * Send event to all outputs. + * + * @param event + * a event + * @param direction + * IN to send event to input pads, OUT to send event to all output + * pads + */ + protected final void sendEventToAllPads(Event event, Direction direction) { + if (verbose) + System.out.println("[" + this + "] INFO: Sending event " + event + ":" + direction + "."); + + switch (direction) { + case IN: + // Send event to all pads with IN direction + for (DataSource in : inputPads.values()) { + in.sendEvent(event, direction); + } + break; + case OUT: + // Send event to all pads with OUT direction + for (DataSink out : outputPads.values()) { + out.sendEvent(event, direction); + } + break; + } + } + + /** + * Ensure that packet has required minimum and maximum length, cuts tail when + * necessary. + * + * @param buf + * a buffer + * @param minLength + * minimum length of packet or -1 + * @param maxLength + * maximum length of packet or -1 + * @param link + * source link, to push unnecessary data back + * @param fromCursor + * if true, then position will be included into calculation + * @return true, + */ + public boolean cap(ByteBuffer buf, int minLength, int maxLength, Link link, boolean fromCursor) { + + if (buf == null) + return false; + + int length = buf.length; + + int cursor; + if (fromCursor) + cursor = buf.cursor; + else + cursor = 0; + + length -= cursor; + + if ((minLength < 0 || length >= minLength) && (maxLength < 0 || length <= maxLength)) + // Buffer is already in bounds + return true; + + // Buffer is too small, wait for the rest of buffer + if (minLength >= 0 && length < minLength) { + + if (verbose) + System.out.println("[" + this + "] INFO: Buffer is too small. Min length: " + minLength + ", data length (after cursor): " + length + "."); + + link.pushBack(buf.slice(0, length + cursor, true), minLength + cursor); + return false; + } else if (maxLength >= 0 && length > maxLength) { + + if (verbose) + System.out.println("[" + this + "] INFO: Buffer is too big. Max length: " + maxLength + ", data length (after cursor): " + length + "."); + + // Buffer is too big, cut unnecessary tail + link.pushBack(buf.slice(maxLength + cursor, length - maxLength, true)); + buf.length = maxLength + cursor; + + } + + return true; + } + + @Override + public void dropLink(Link link) { + if (inputPads.containsValue(link)) { + for (Entry entry : inputPads.entrySet()) + if (link.equals(entry.getValue())) { + inputPads.remove(entry.getKey()); + break; + } + } + + if (outputPads.containsValue(link)) { + for (Entry entry : outputPads.entrySet()) + if (link.equals(entry.getValue())) { + outputPads.remove(entry.getKey()); + break; + } + } + } + + @Override + public void replaceLink(Link existingLink, Link newLink) { + if (inputPads.containsValue(existingLink)) { + for (Entry entry : inputPads.entrySet()) + if (existingLink.equals(entry.getValue())) { + inputPads.put(entry.getKey(), newLink); + newLink.setSink(this); + break; + } + } + + if (outputPads.containsValue(existingLink)) { + for (Entry entry : outputPads.entrySet()) + if (existingLink.equals(entry.getValue())) { + outputPads.put(entry.getKey(), newLink); + newLink.setSource(this); + break; + } + } + } + + @Override + public String getId() { + return id; + } + + /** + * Example. + */ + public static void main(String args[]) { + Element source = new FakeSource("source") { + { + this.verbose = true; + this.numBuffers = 10; + this.incommingBufLength = 3; + this.delay = 100; + } + }; + + Element sink = new FakeSink("sink") { + { + this.verbose = true; + } + }; + + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source); + pipeline.add(new BaseElement("t1")); + pipeline.add(new BaseElement("t2")); + pipeline.add(new BaseElement("t3")); + pipeline.add(new BaseElement("t4")); + pipeline.add(sink); + + pipeline.link("source", "t1", "t2", "t3", "t4", "sink"); + + // Links between source-t1-t2 will operate in pull mode. + // Links between t3-t4-sink will operate in push mode. + // Link between t2-t3 will run main loop (pull from source and push to + // sink). + pipeline.getLink("t3", STDOUT).run(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java index 47f1435a335..d8e9139608d 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java @@ -17,20 +17,20 @@ package streamer; public class BufferPool { - public static byte[] allocateNewBuffer(int minSize) { - // TODO: search for free buffer in pool - if (minSize >= 0) - return new byte[minSize]; - else - // Return large buffer by default, too minimize number of round trips - // between to read full packet when packet is large, but it is important - // to return buffer to pool to reuse it (or null-ify links to it for - // faster GC) - // TODO: get free buffer from pool - return new byte[128 * 1024]; - } + public static byte[] allocateNewBuffer(int minSize) { + // TODO: search for free buffer in pool + if (minSize >= 0) + return new byte[minSize]; + else + // Return large buffer by default, too minimize number of round trips + // between to read full packet when packet is large, but it is important + // to return buffer to pool to reuse it (or null-ify links to it for + // faster GC) + // TODO: get free buffer from pool + return new byte[128 * 1024]; + } - public static void recycleBuffer(byte[] buf) { - // TODO: return buffer to pool - } + public static void recycleBuffer(byte[] buf) { + // TODO: return buffer to pool + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java index cd6c8e42f4b..8543a5aa7ab 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java @@ -26,801 +26,802 @@ import java.util.Map; */ public class ByteBuffer { - public static final String SEQUENCE_NUMBER = "seq"; + public static final String SEQUENCE_NUMBER = "seq"; - public byte data[]; - public int offset = 0; - public int length = 0; - public int cursor = 0; + public byte data[]; + public int offset = 0; + public int length = 0; + public int cursor = 0; - private int refCount = 1; - private ByteBuffer parentByteBuffer = null; + private int refCount = 1; + private ByteBuffer parentByteBuffer = null; - private Order order; + private Order order; - /** - * Create buffer of size no less than length. Buffer can be a bit larger than - * length. Offset also can be set to non-zero value to leave some place for - * future headers. - */ - public ByteBuffer(int minLength) { - // Get buffer of acceptable size from buffer pool - this.data = BufferPool.allocateNewBuffer(minLength); - this.offset = 0; - this.length = minLength; - } - - public ByteBuffer(byte data[]) { - if (data == null) - throw new NullPointerException("Data must be non-null."); - - this.data = data; - this.offset = 0; - this.length = data.length; - } - - public ByteBuffer(byte[] data, int offset, int length) { - if (data == null) - throw new NullPointerException("Data must be non-null."); - - this.data = data; - this.offset = offset; - this.length = length; - } - - /** - * Create byte buffer of requested size with some space reserved for future - * headers. - */ - public ByteBuffer(int minLength, boolean reserveSpaceForHeader) { - // Get buffer of acceptable size from buffer pool - this.data = BufferPool.allocateNewBuffer(128 + minLength); - this.offset = 128; // 100 bytes should be enough for headers - this.length = minLength; - } - - /** - * Create empty buffer with given order only. - */ - public ByteBuffer(Order order) { - this.order = order; - } - - public void setOrder(Order order) { - this.order = order; - } - - public Order getOrder() { - return order; - } - - @Override - public String toString() { - return toString(100); - } - - /** - * Return string representation of this byte buffer. - * - * @param maxLength - * number of bytes to show in string - */ - public String toString(int maxLength) { - return "ByteRange(){offset=" + offset + ", length=" + length + ", cursor=" + cursor + ", data=" + ((data == null) ? "null" : toHexString(maxLength)) - + ((metadata == null || metadata.size() == 0) ? "" : ", metadata=" + metadata) + "}"; - } - - /** - * Return string representation of this byte buffer as hexadecimal numbers, - * e.g. "[0x01, 0x02]". - * - * @param maxLength - * number of bytes to show in string - */ - public String toHexString(int maxLength) { - StringBuilder builder = new StringBuilder(maxLength * 6); - builder.append('['); - for (int i = 0; i < maxLength && i < length; i++) { - if (i > 0) - builder.append(", "); - int b = data[offset + i] & 0xff; - builder.append("0x" + ((b < 16) ? "0" : "") + Integer.toString(b, 16)); - } - builder.append(']'); - return builder.toString(); - } - - /** - * Return string representation of this byte buffer as hexadecimal numbers, - * e.g. "01 02". - * - * @param maxLength - * number of bytes to show in string - */ - public String toPlainHexString(int maxLength) { - StringBuilder builder = new StringBuilder(maxLength * 3); - for (int i = 0; i < maxLength && i < length; i++) { - if (i > 0) - builder.append(" "); - int b = data[offset + i] & 0xff; - builder.append(((b < 16) ? "0" : "") + Integer.toString(b, 16)); - } - return builder.toString(); - } - - public void dump() { - System.out.println(toString(length)); - } - - public void extend(int newLength) { - if (data.length < newLength) - Arrays.copyOf(data, newLength); - } - - public void ref() { - refCount++; - } - - public void unref() { - refCount--; - - if (refCount == 0) { - - if (parentByteBuffer != null) { - parentByteBuffer.unref(); - parentByteBuffer = null; - } else { - // Return buffer to buffer pool - BufferPool.recycleBuffer(data); - } - - data = null; + /** + * Create buffer of size no less than length. Buffer can be a bit larger than + * length. Offset also can be set to non-zero value to leave some place for + * future headers. + */ + public ByteBuffer(int minLength) { + // Get buffer of acceptable size from buffer pool + this.data = BufferPool.allocateNewBuffer(minLength); + this.offset = 0; + this.length = minLength; } - } + public ByteBuffer(byte data[]) { + if (data == null) + throw new NullPointerException("Data must be non-null."); - public boolean isSoleOwner() { - return refCount == 1 && (parentByteBuffer == null); - } - - /** - * Create shared lightweight copy of part of this buffer. - */ - public ByteBuffer slice(int offset, int length, boolean copyMetadata) { - ref(); - - if (this.length < (offset + length)) - throw new RuntimeException("Length of region is larger that length of this buffer. Buffer length: " + this.length + ", offset: " + offset - + ", new region length: " + length + "."); - - ByteBuffer slice = new ByteBuffer(data, this.offset + offset, length); - - if (copyMetadata && this.metadata != null) - slice.metadata = new HashMap(metadata); - - return slice; - } - - private Map metadata = null; - - public Object putMetadata(String key, Object value) { - if (metadata == null) - metadata = new HashMap(); - return metadata.put(key, value); - } - - public Object getMetadata(String key) { - return (metadata != null) ? metadata.get(key) : null; - } - - /** - * Create new buffer, which holds data from both buffers. Expensive operation. - * - * @TODO if only one reference to this ByteBuffer exists, then extend this - * buffer instead of creating new buffer - * @TODO support list of buffers to avoid expensive joins until absolute - * necessary - */ - public ByteBuffer join(ByteBuffer buf) { - // Extend byte array for new data - int newLength = length + buf.length; - byte newData[] = new byte[newLength]; - - // Copy data from our buffer - System.arraycopy(data, offset, newData, 0, length); - - // Copy data from other buffer - System.arraycopy(buf.data, buf.offset, newData, length, buf.length); - - ByteBuffer newBuf = new ByteBuffer(newData); - - // Copy our (older) metadata to new buffer, because handler might store some - // metadata in buffer, which is pushed back. - if (metadata != null) - newBuf.metadata = new HashMap(metadata); - - return newBuf; - } - - /** - * Copy used portion of buffer to new byte array. Expensive operation. - */ - public byte[] toByteArray() { - return Arrays.copyOfRange(data, offset, offset + length); - } - - public short[] toShortArray() { - if (length % 2 != 0) - throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 2 without remainder. Array length: " + length + ", remainder: " - + (length % 2) + "."); - - short[] buf = new short[length / 2]; - - for (int i = 0, j = offset; i < buf.length; i++, j += 2) { - buf[i] = (short) ((data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8)); - } - return buf; - } - - /** - * Return array of int's in little endian order. - */ - public int[] toIntLEArray() { - if (length % 4 != 0) - throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 4 without remainder. Array length: " + length + ", remainder: " - + (length % 4) + "."); - - int[] buf = new int[length / 4]; - - for (int i = 0, j = offset; i < buf.length; i++, j += 4) { - buf[i] = (data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8) | ((data[j + 2] & 0xFF) << 16) | ((data[j + 3] & 0xFF) << 24); - } - return buf; - } - - /** - * Return array of int's in little endian order, but use only 3 bytes per int (3RGB). - */ - public int[] toInt3LEArray() { - if (length % 3 != 0) - throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 3 without remainder. Array length: " + length + ", remainder: " - + (length % 3) + "."); - - int[] buf = new int[length / 3]; - - for (int i = 0, j = offset; i < buf.length; i++, j += 3) { - buf[i] = (data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8) | ((data[j + 2] & 0xFF) << 16); - } - return buf; - } - - /** - * Helper method for test cases to convert array of byte arrays to array of - * byte buffers. - */ - public static ByteBuffer[] convertByteArraysToByteBuffers(byte[]... bas) { - ByteBuffer bufs[] = new ByteBuffer[bas.length]; - - int i = 0; - for (byte[] ba : bas) { - bufs[i++] = new ByteBuffer(ba); - } - return bufs; - } - - /** - * Read signed int in network order. Cursor is advanced by 4. - */ - public int readSignedInt() { - if (cursor + 4 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); - - int result = (((data[offset + cursor] & 0xff) << 24) + ((data[offset + cursor + 1] & 0xff) << 16) + ((data[offset + cursor + 2] & 0xff) << 8) + (data[offset - + cursor + 3] & 0xff)); - cursor += 4; - return result; - } - - /** - * Read signed int in little endian order. Cursor is advanced by 4. - */ - public int readSignedIntLE() { - if (cursor + 4 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); - - int result = (((data[offset + cursor + 3] & 0xff) << 24) + ((data[offset + cursor + 2] & 0xff) << 16) + ((data[offset + cursor + 1] & 0xff) << 8) + (data[offset - + cursor] & 0xff)); - cursor += 4; - return result; - } - - /** - * Read unsigned int in little endian order. Cursor is advanced by 4. - */ - public long readUnsignedIntLE() { - if (cursor + 4 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); - - long result = (((long) (data[offset + cursor + 3] & 0xff) << 24) + ((long) (data[offset + cursor + 2] & 0xff) << 16) - + ((long) (data[offset + cursor + 1] & 0xff) << 8) + (long) (data[offset + cursor] & 0xff)); - cursor += 4; - return result; - } - - /** - * Read signed int in variable length format. Top most bit of each byte - * indicates that next byte contains additional bits. Cursor is advanced by - * 1-5 bytes. - */ - public int readVariableSignedIntLE() { - int result = 0; - - for (int shift = 0; shift < 32; shift += 7) { - int b = readUnsignedByte(); - result |= (b & 0x7f) << shift; - if ((b & 0x80) == 0) - break; + this.data = data; + this.offset = 0; + this.length = data.length; } - return result; - } + public ByteBuffer(byte[] data, int offset, int length) { + if (data == null) + throw new NullPointerException("Data must be non-null."); - /** - * Read unsigned int in network order in variable length format. Cursor is - * advanced by 1 to 4 bytes. - * - * Two most significant bits of first byte indicates length of field: 0x00 - 1 - * byte, 0x40 - 2 bytes, 0x80 - 3 bytes, 0xc0 - 4 bytes. - * - * @see http://msdn.microsoft.com/en-us/library/cc241614.aspx - */ - public int readEncodedUnsignedInt() { - int firstByte = readUnsignedByte(); - int result; - switch (firstByte & 0xc0) { - default: - case 0x00: - result = firstByte & 0x3f; - break; - case 0x40: - result = (firstByte & 0x3f << 8) | readUnsignedByte(); - break; - case 0x80: - result = (((firstByte & 0x3f << 8) | readUnsignedByte()) << 8) | readUnsignedByte(); - break; - case 0xc0: - result = ((((firstByte & 0x3f << 8) | readUnsignedByte()) << 8) | readUnsignedByte() << 8) | readUnsignedByte(); - break; + this.data = data; + this.offset = offset; + this.length = length; } - return result; - } - - /** - * Read unsigned byte. Cursor is advanced by 1. - */ - public int readUnsignedByte() { - if (cursor + 1 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 1 byte from this buffer: " + this + "."); - - int b = data[offset + cursor] & 0xff; - cursor += 1; - return b; - } - - /** - * Read signed byte. Cursor is advanced by 1. - */ - public byte readSignedByte() { - if (cursor + 1 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 1 byte from this buffer: " + this + "."); - - byte b = data[offset + cursor]; - cursor += 1; - return b; - } - - /** - * Read unsigned short in network order. Cursor is advanced by 2. - */ - public int readUnsignedShort() { - if (cursor + 2 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); - - int result = (((data[offset + cursor] & 0xff) << 8) | (data[offset + cursor + 1] & 0xff)); - cursor += 2; - return result; - } - - /** - * Read signed short in little endian order. Cursor is advanced by 2. - */ - public short readSignedShortLE() { - if (cursor + 2 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); - - short result = (short) (((data[offset + cursor + 1] & 0xff) << 8) | (data[offset + cursor] & 0xff)); - cursor += 2; - return result; - } - - /** - * Read unsigned short in network order in variable length format. Cursor is - * advanced by 1 or 2 bytes. - * - * Most significant bit of first byte indicates length of field: 0 - 1 byte, 1 - * - 2 bytes. - */ - public int readVariableUnsignedShort() { - int firstByte = readUnsignedByte(); - - int result; - if ((firstByte & 0x80) == 0) - result = firstByte & 0x7f; - else { - int secondByte = readUnsignedByte(); - result = (((firstByte & 0x7f) << 8) | secondByte); + /** + * Create byte buffer of requested size with some space reserved for future + * headers. + */ + public ByteBuffer(int minLength, boolean reserveSpaceForHeader) { + // Get buffer of acceptable size from buffer pool + this.data = BufferPool.allocateNewBuffer(128 + minLength); + this.offset = 128; // 100 bytes should be enough for headers + this.length = minLength; } - return result; - } - - /** - * Read unsigned short in little endian order. Cursor is advanced by 2. - */ - public int readUnsignedShortLE() { - if (cursor + 2 > length) - throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); - - int result = (((data[offset + cursor + 1] & 0xff) << 8) | (data[offset + cursor] & 0xff)); - cursor += 2; - return result; - } - - /** - * Read unsigned short in network order in variable length format. Cursor is - * advanced by 1 or 2 bytes. - * - * Most significant bit of first byte indicates length of field: 0x00 - 1 - * byte, 0x80 - 2 bytes. - * - * @see http://msdn.microsoft.com/en-us/library/cc241612.aspx - */ - public int readEncodedUnsignedShort() { - int firstByte = readUnsignedByte(); - - int result; - if ((firstByte & 0x80) == 0) - result = firstByte & 0x7f; - else { - int secondByte = readUnsignedByte(); - result = (((firstByte & 0x7f) << 8) | secondByte); + /** + * Create empty buffer with given order only. + */ + public ByteBuffer(Order order) { + this.order = order; } - return result; - } - - /** - * Read signed short in network order in variable length format. Cursor is - * advanced by 1 or 2 bytes. - * - * Most significant bit of first byte indicates length of field: 0x00 - 1 - * byte, 0x80 - 2 bytes. Second most significant bit indicates is value - * positive or negative. - * - * @see http://msdn.microsoft.com/en-us/library/cc241613.aspx - */ - public int readEncodedSignedShort() { - int firstByte = readUnsignedByte(); - - int result; - if ((firstByte & 0x80) == 0) - result = firstByte & 0x3f; - else { - int secondByte = readUnsignedByte(); - result = (((firstByte & 0x3f) << 8) | secondByte); + public void setOrder(Order order) { + this.order = order; } - if ((firstByte & 0x40) > 0) - return -result; - else - return result; - } - - /** - * Read signed long in little endian order. Cursor is advanced by 8 bytes. - */ - public long readSignedLongLE() { - return (((long) readSignedIntLE()) & 0xffFFffFFL) | (((long) readSignedIntLE()) << 32); - } - - /** - * Read string from buffer. Cursor is advanced by string length. - */ - public String readString(int length, Charset charset) { - if (cursor + length > this.length) - throw new ArrayIndexOutOfBoundsException("Cannot read " + length + " bytes from this buffer: " + this + "."); - - String string = new String(data, offset + cursor, length, charset); - cursor += length; - return string; - } - - /** - * Get bytes as lightweight slice. Cursor is advanced by data length. - */ - public ByteBuffer readBytes(int dataLength) { - if (cursor + dataLength > length) - throw new ArrayIndexOutOfBoundsException("Cannot read " + dataLength + " bytes from this buffer: " + this + "."); - - ByteBuffer slice = slice(cursor, dataLength, false); - cursor += dataLength; - return slice; - } - - /** - * Cursor is advanced by given number of bytes. - */ - public void skipBytes(int numOfBytes) { - if (cursor + numOfBytes > length) - throw new ArrayIndexOutOfBoundsException("Cannot read " + numOfBytes + " bytes from this buffer: " + this + "."); - - cursor += numOfBytes; - } - - /** - * Write byte. Cursor is advanced by 1. - */ - public void writeByte(int b) { - if (cursor + 1 > length) - throw new ArrayIndexOutOfBoundsException("Cannot write 1 byte to this buffer: " + this + "."); - - data[offset + cursor] = (byte) b; - cursor += 1; - } - - /** - * Write short in network order. Cursor is advanced by 2. - */ - public void writeShort(int x) { - if (cursor + 2 > length) - throw new ArrayIndexOutOfBoundsException("Cannot write 2 bytes to this buffer: " + this + "."); - - data[offset + cursor] = (byte) (x >> 8); - data[offset + cursor + 1] = (byte) x; - cursor += 2; - } - - /** - * Write short in little endian order. Cursor is advanced by 2. - */ - public void writeShortLE(int x) { - if (cursor + 2 > length) - throw new ArrayIndexOutOfBoundsException("Cannot write 2 bytes to this buffer: " + this + "."); - - data[offset + cursor + 1] = (byte) (x >> 8); - data[offset + cursor] = (byte) x; - cursor += 2; - } - - /** - * Write int in network order. Cursor is advanced by 4. - */ - public void writeInt(int i) { - if (cursor + 4 > length) - throw new ArrayIndexOutOfBoundsException("Cannot write 4 bytes to this buffer: " + this + "."); - - data[offset + cursor] = (byte) (i >> 24); - data[offset + cursor + 1] = (byte) (i >> 16); - data[offset + cursor + 2] = (byte) (i >> 8); - data[offset + cursor + 3] = (byte) i; - cursor += 4; - } - - public void writeIntLE(int i) { - if (cursor + 4 > length) - throw new ArrayIndexOutOfBoundsException("Cannot write 4 bytes to this buffer: " + this + "."); - - data[offset + cursor] = (byte) i; - data[offset + cursor + 1] = (byte) (i >> 8); - data[offset + cursor + 2] = (byte) (i >> 16); - data[offset + cursor + 3] = (byte) (i >> 24); - cursor += 4; - } - - /** - * Write int in variable length format. Cursor is advanced by number of bytes - * written (1-5). - * - * Topmost bit of each byte is set to 1 to indicate that next byte has data. - */ - public void writeVariableIntLE(int i) { - while (i != 0) { - // Get lower bits of number - int b = i & 0x7f; - i >>= 7; - - if (i > 0) - // Set topmost bit of byte to indicate that next byte(s) contains - // remainder bits - b |= 0x80; - - writeByte(b); - } - } - - /** - * Write short in variable length format. Cursor is advanced by number of - * bytes written (1-2). - * - * Topmost bit of first byte is set to 1 to indicate that next byte has data. - */ - public void writeVariableShort(int length) { - if (length > 0x7f | length < 0) - writeShort(length | 0x8000); - else - writeByte(length); - } - - /** - * Prepend given data to this byte buffer. - */ - public void prepend(ByteBuffer buf) { - prepend(buf.data, buf.offset, buf.length); - } - - /** - * Prepend given data to this byte buffer. - */ - public void prepend(byte[] data) { - prepend(data, 0, data.length); - } - - /** - * Prepend given data to this byte buffer. - */ - public void prepend(byte[] data, int offset, int length) { - if (!isSoleOwner()) { - throw new RuntimeException("Create full copy of this byte buffer data for modification. refCount: " + refCount + ", parentByteBuffer: " - + parentByteBuffer + "."); + public Order getOrder() { + return order; } - // If there is no enough space for header to prepend - if (!(this.offset >= length)) { - throw new RuntimeException("Reserve data to have enough space for header."); + @Override + public String toString() { + return toString(100); } - // Copy header - System.arraycopy(data, offset, this.data, this.offset - length, length); + /** + * Return string representation of this byte buffer. + * + * @param maxLength + * number of bytes to show in string + */ + public String toString(int maxLength) { + return "ByteRange(){offset=" + offset + ", length=" + length + ", cursor=" + cursor + ", data=" + ((data == null) ? "null" : toHexString(maxLength)) + + ((metadata == null || metadata.size() == 0) ? "" : ", metadata=" + metadata) + "}"; + } - // Extend byte range to include header - this.offset -= length; - this.length += length; - this.cursor += length; - } + /** + * Return string representation of this byte buffer as hexadecimal numbers, + * e.g. "[0x01, 0x02]". + * + * @param maxLength + * number of bytes to show in string + */ + public String toHexString(int maxLength) { + StringBuilder builder = new StringBuilder(maxLength * 6); + builder.append('['); + for (int i = 0; i < maxLength && i < length; i++) { + if (i > 0) + builder.append(", "); + int b = data[offset + i] & 0xff; + builder.append("0x" + ((b < 16) ? "0" : "") + Integer.toString(b, 16)); + } + builder.append(']'); + return builder.toString(); + } - public void writeString(String str, Charset charset) { - writeBytes(str.getBytes(charset)); - } + /** + * Return string representation of this byte buffer as hexadecimal numbers, + * e.g. "01 02". + * + * @param maxLength + * number of bytes to show in string + */ + public String toPlainHexString(int maxLength) { + StringBuilder builder = new StringBuilder(maxLength * 3); + for (int i = 0; i < maxLength && i < length; i++) { + if (i > 0) + builder.append(" "); + int b = data[offset + i] & 0xff; + builder.append(((b < 16) ? "0" : "") + Integer.toString(b, 16)); + } + return builder.toString(); + } - /** - * Write string of fixed size. When string is shorted, empty space is filled - * with zeros. When string is larger, it is truncated. - */ - public void writeFixedString(int length, String str, Charset charset) { - byte[] bytes = str.getBytes(charset); - writeBytes(bytes, 0, Math.min(bytes.length, length)); + public void dump() { + System.out.println(toString(length)); + } - for (int i = bytes.length; i < length; i++) - writeByte(0); - } + public void extend(int newLength) { + if (data.length < newLength) + Arrays.copyOf(data, newLength); + } - public void writeBytes(ByteBuffer buf) { - writeBytes(buf.data, buf.offset, buf.length); - } + public void ref() { + refCount++; + } - public void writeBytes(byte[] bytes) { - writeBytes(bytes, 0, bytes.length); - } + public void unref() { + refCount--; - public void writeBytes(byte[] bytes, int offset, int length) { - System.arraycopy(bytes, offset, this.data, this.offset + this.cursor, length); - cursor += length; - } + if (refCount == 0) { - // /** - // * Write BER encoded definite long variant of the ASN.1 length field. - // */ - // public void writeBerLength(int value) { - // int fieldLength; - // if (value > 0xFFffFF) - // fieldLength = 4; - // else if (value > 0xFFff) - // fieldLength = 3; - // else if (value > 0xFF) - // fieldLength = 2; - // else - // fieldLength = 1; - // - // if (cursor + fieldLength + 1 > length) - // throw new ArrayIndexOutOfBoundsException("Cannot write " + (fieldLength + - // 1) + " byte(s) to this buffer: " + this + "."); - // - // // Write length of length field itself - // writeByte(0x80 | fieldLength); - // - // switch (fieldLength) { - // case 4: - // data[offset + cursor++] = (byte) (value >> 24); - // case 3: - // data[offset + cursor++] = (byte) (value >> 16); - // case 2: - // data[offset + cursor++] = (byte) (value >> 8); - // case 1: - // data[offset + cursor++] = (byte) value; - // } - // - // } + if (parentByteBuffer != null) { + parentByteBuffer.unref(); + parentByteBuffer = null; + } else { + // Return buffer to buffer pool + BufferPool.recycleBuffer(data); + } - /** - * Reduce length of buffer to cursor position. - */ - public void trimAtCursor() { - length = cursor; - } + data = null; + } - /** - * Rewind cursor to beginning of buffer. - */ - public void rewindCursor() { - cursor = 0; - } + } - /** - * Read RGB color in LE order. Cursor is advanced by 3. - * - * @return color as int, with red in lowest octet. - */ - public int readRGBColor() { - return readUnsignedByte() | (readUnsignedByte() << 8) | (readUnsignedByte() << 16); - } + public boolean isSoleOwner() { + return refCount == 1 && (parentByteBuffer == null); + } - public void assertThatBufferIsFullyRead() { - if (cursor != length) - throw new RuntimeException("Data in buffer is not read fully. Buf: " + this + "."); - } + /** + * Create shared lightweight copy of part of this buffer. + */ + public ByteBuffer slice(int offset, int length, boolean copyMetadata) { + ref(); - @Override - public int hashCode() { - final int prime = 31; - int result = 1; + if (this.length < (offset + length)) + throw new RuntimeException("Length of region is larger that length of this buffer. Buffer length: " + this.length + ", offset: " + offset + + ", new region length: " + length + "."); - int end = offset + length; - for (int i = offset; i < end; i++) - result = 31 * result + data[i]; + ByteBuffer slice = new ByteBuffer(data, this.offset + offset, length); - result = prime * result + length; - return result; - } + if (copyMetadata && this.metadata != null) + slice.metadata = new HashMap(metadata); - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; + return slice; + } - ByteBuffer other = (ByteBuffer) obj; - if (length != other.length) - return false; + private Map metadata = null; - for (int i = 0; i < length; i++) - if (data[offset + i] != other.data[other.offset + i]) - return false; + public Object putMetadata(String key, Object value) { + if (metadata == null) + metadata = new HashMap(); + return metadata.put(key, value); + } - return true; - } + public Object getMetadata(String key) { + return (metadata != null) ? metadata.get(key) : null; + } + + /** + * Create new buffer, which holds data from both buffers. Expensive operation. + * + * @TODO if only one reference to this ByteBuffer exists, then extend this + * buffer instead of creating new buffer + * @TODO support list of buffers to avoid expensive joins until absolute + * necessary + */ + public ByteBuffer join(ByteBuffer buf) { + // Extend byte array for new data + int newLength = length + buf.length; + byte newData[] = new byte[newLength]; + + // Copy data from our buffer + System.arraycopy(data, offset, newData, 0, length); + + // Copy data from other buffer + System.arraycopy(buf.data, buf.offset, newData, length, buf.length); + + ByteBuffer newBuf = new ByteBuffer(newData); + + // Copy our (older) metadata to new buffer, because handler might store some + // metadata in buffer, which is pushed back. + if (metadata != null) + newBuf.metadata = new HashMap(metadata); + + return newBuf; + } + + /** + * Copy used portion of buffer to new byte array. Expensive operation. + */ + public byte[] toByteArray() { + return Arrays.copyOfRange(data, offset, offset + length); + } + + public short[] toShortArray() { + if (length % 2 != 0) + throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 2 without remainder. Array length: " + length + ", remainder: " + + (length % 2) + "."); + + short[] buf = new short[length / 2]; + + for (int i = 0, j = offset; i < buf.length; i++, j += 2) { + buf[i] = (short)((data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8)); + } + return buf; + } + + /** + * Return array of int's in little endian order. + */ + public int[] toIntLEArray() { + if (length % 4 != 0) + throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 4 without remainder. Array length: " + length + ", remainder: " + + (length % 4) + "."); + + int[] buf = new int[length / 4]; + + for (int i = 0, j = offset; i < buf.length; i++, j += 4) { + buf[i] = (data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8) | ((data[j + 2] & 0xFF) << 16) | ((data[j + 3] & 0xFF) << 24); + } + return buf; + } + + /** + * Return array of int's in little endian order, but use only 3 bytes per int (3RGB). + */ + public int[] toInt3LEArray() { + if (length % 3 != 0) + throw new ArrayIndexOutOfBoundsException("Length of byte array must be dividable by 3 without remainder. Array length: " + length + ", remainder: " + + (length % 3) + "."); + + int[] buf = new int[length / 3]; + + for (int i = 0, j = offset; i < buf.length; i++, j += 3) { + buf[i] = (data[j + 0] & 0xFF) | ((data[j + 1] & 0xFF) << 8) | ((data[j + 2] & 0xFF) << 16); + } + return buf; + } + + /** + * Helper method for test cases to convert array of byte arrays to array of + * byte buffers. + */ + public static ByteBuffer[] convertByteArraysToByteBuffers(byte[]... bas) { + ByteBuffer bufs[] = new ByteBuffer[bas.length]; + + int i = 0; + for (byte[] ba : bas) { + bufs[i++] = new ByteBuffer(ba); + } + return bufs; + } + + /** + * Read signed int in network order. Cursor is advanced by 4. + */ + public int readSignedInt() { + if (cursor + 4 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); + + int result = + (((data[offset + cursor] & 0xff) << 24) + ((data[offset + cursor + 1] & 0xff) << 16) + ((data[offset + cursor + 2] & 0xff) << 8) + (data[offset + cursor + 3] & 0xff)); + cursor += 4; + return result; + } + + /** + * Read signed int in little endian order. Cursor is advanced by 4. + */ + public int readSignedIntLE() { + if (cursor + 4 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); + + int result = + (((data[offset + cursor + 3] & 0xff) << 24) + ((data[offset + cursor + 2] & 0xff) << 16) + ((data[offset + cursor + 1] & 0xff) << 8) + (data[offset + cursor] & 0xff)); + cursor += 4; + return result; + } + + /** + * Read unsigned int in little endian order. Cursor is advanced by 4. + */ + public long readUnsignedIntLE() { + if (cursor + 4 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 4 bytes from this buffer: " + this + "."); + + long result = + (((long)(data[offset + cursor + 3] & 0xff) << 24) + ((long)(data[offset + cursor + 2] & 0xff) << 16) + ((long)(data[offset + cursor + 1] & 0xff) << 8) + (data[offset + + cursor] & 0xff)); + cursor += 4; + return result; + } + + /** + * Read signed int in variable length format. Top most bit of each byte + * indicates that next byte contains additional bits. Cursor is advanced by + * 1-5 bytes. + */ + public int readVariableSignedIntLE() { + int result = 0; + + for (int shift = 0; shift < 32; shift += 7) { + int b = readUnsignedByte(); + result |= (b & 0x7f) << shift; + if ((b & 0x80) == 0) + break; + } + + return result; + } + + /** + * Read unsigned int in network order in variable length format. Cursor is + * advanced by 1 to 4 bytes. + * + * Two most significant bits of first byte indicates length of field: 0x00 - 1 + * byte, 0x40 - 2 bytes, 0x80 - 3 bytes, 0xc0 - 4 bytes. + * + * @see http://msdn.microsoft.com/en-us/library/cc241614.aspx + */ + public int readEncodedUnsignedInt() { + int firstByte = readUnsignedByte(); + int result; + switch (firstByte & 0xc0) { + default: + case 0x00: + result = firstByte & 0x3f; + break; + case 0x40: + result = (firstByte & 0x3f << 8) | readUnsignedByte(); + break; + case 0x80: + result = (((firstByte & 0x3f << 8) | readUnsignedByte()) << 8) | readUnsignedByte(); + break; + case 0xc0: + result = ((((firstByte & 0x3f << 8) | readUnsignedByte()) << 8) | readUnsignedByte() << 8) | readUnsignedByte(); + break; + } + + return result; + } + + /** + * Read unsigned byte. Cursor is advanced by 1. + */ + public int readUnsignedByte() { + if (cursor + 1 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 1 byte from this buffer: " + this + "."); + + int b = data[offset + cursor] & 0xff; + cursor += 1; + return b; + } + + /** + * Read signed byte. Cursor is advanced by 1. + */ + public byte readSignedByte() { + if (cursor + 1 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 1 byte from this buffer: " + this + "."); + + byte b = data[offset + cursor]; + cursor += 1; + return b; + } + + /** + * Read unsigned short in network order. Cursor is advanced by 2. + */ + public int readUnsignedShort() { + if (cursor + 2 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); + + int result = (((data[offset + cursor] & 0xff) << 8) | (data[offset + cursor + 1] & 0xff)); + cursor += 2; + return result; + } + + /** + * Read signed short in little endian order. Cursor is advanced by 2. + */ + public short readSignedShortLE() { + if (cursor + 2 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); + + short result = (short)(((data[offset + cursor + 1] & 0xff) << 8) | (data[offset + cursor] & 0xff)); + cursor += 2; + return result; + } + + /** + * Read unsigned short in network order in variable length format. Cursor is + * advanced by 1 or 2 bytes. + * + * Most significant bit of first byte indicates length of field: 0 - 1 byte, 1 + * - 2 bytes. + */ + public int readVariableUnsignedShort() { + int firstByte = readUnsignedByte(); + + int result; + if ((firstByte & 0x80) == 0) + result = firstByte & 0x7f; + else { + int secondByte = readUnsignedByte(); + result = (((firstByte & 0x7f) << 8) | secondByte); + } + + return result; + } + + /** + * Read unsigned short in little endian order. Cursor is advanced by 2. + */ + public int readUnsignedShortLE() { + if (cursor + 2 > length) + throw new ArrayIndexOutOfBoundsException("Cannot read 2 bytes from this buffer: " + this + "."); + + int result = (((data[offset + cursor + 1] & 0xff) << 8) | (data[offset + cursor] & 0xff)); + cursor += 2; + return result; + } + + /** + * Read unsigned short in network order in variable length format. Cursor is + * advanced by 1 or 2 bytes. + * + * Most significant bit of first byte indicates length of field: 0x00 - 1 + * byte, 0x80 - 2 bytes. + * + * @see http://msdn.microsoft.com/en-us/library/cc241612.aspx + */ + public int readEncodedUnsignedShort() { + int firstByte = readUnsignedByte(); + + int result; + if ((firstByte & 0x80) == 0) + result = firstByte & 0x7f; + else { + int secondByte = readUnsignedByte(); + result = (((firstByte & 0x7f) << 8) | secondByte); + } + + return result; + } + + /** + * Read signed short in network order in variable length format. Cursor is + * advanced by 1 or 2 bytes. + * + * Most significant bit of first byte indicates length of field: 0x00 - 1 + * byte, 0x80 - 2 bytes. Second most significant bit indicates is value + * positive or negative. + * + * @see http://msdn.microsoft.com/en-us/library/cc241613.aspx + */ + public int readEncodedSignedShort() { + int firstByte = readUnsignedByte(); + + int result; + if ((firstByte & 0x80) == 0) + result = firstByte & 0x3f; + else { + int secondByte = readUnsignedByte(); + result = (((firstByte & 0x3f) << 8) | secondByte); + } + + if ((firstByte & 0x40) > 0) + return -result; + else + return result; + } + + /** + * Read signed long in little endian order. Cursor is advanced by 8 bytes. + */ + public long readSignedLongLE() { + return ((readSignedIntLE()) & 0xffFFffFFL) | (((long)readSignedIntLE()) << 32); + } + + /** + * Read string from buffer. Cursor is advanced by string length. + */ + public String readString(int length, Charset charset) { + if (cursor + length > this.length) + throw new ArrayIndexOutOfBoundsException("Cannot read " + length + " bytes from this buffer: " + this + "."); + + String string = new String(data, offset + cursor, length, charset); + cursor += length; + return string; + } + + /** + * Get bytes as lightweight slice. Cursor is advanced by data length. + */ + public ByteBuffer readBytes(int dataLength) { + if (cursor + dataLength > length) + throw new ArrayIndexOutOfBoundsException("Cannot read " + dataLength + " bytes from this buffer: " + this + "."); + + ByteBuffer slice = slice(cursor, dataLength, false); + cursor += dataLength; + return slice; + } + + /** + * Cursor is advanced by given number of bytes. + */ + public void skipBytes(int numOfBytes) { + if (cursor + numOfBytes > length) + throw new ArrayIndexOutOfBoundsException("Cannot read " + numOfBytes + " bytes from this buffer: " + this + "."); + + cursor += numOfBytes; + } + + /** + * Write byte. Cursor is advanced by 1. + */ + public void writeByte(int b) { + if (cursor + 1 > length) + throw new ArrayIndexOutOfBoundsException("Cannot write 1 byte to this buffer: " + this + "."); + + data[offset + cursor] = (byte)b; + cursor += 1; + } + + /** + * Write short in network order. Cursor is advanced by 2. + */ + public void writeShort(int x) { + if (cursor + 2 > length) + throw new ArrayIndexOutOfBoundsException("Cannot write 2 bytes to this buffer: " + this + "."); + + data[offset + cursor] = (byte)(x >> 8); + data[offset + cursor + 1] = (byte)x; + cursor += 2; + } + + /** + * Write short in little endian order. Cursor is advanced by 2. + */ + public void writeShortLE(int x) { + if (cursor + 2 > length) + throw new ArrayIndexOutOfBoundsException("Cannot write 2 bytes to this buffer: " + this + "."); + + data[offset + cursor + 1] = (byte)(x >> 8); + data[offset + cursor] = (byte)x; + cursor += 2; + } + + /** + * Write int in network order. Cursor is advanced by 4. + */ + public void writeInt(int i) { + if (cursor + 4 > length) + throw new ArrayIndexOutOfBoundsException("Cannot write 4 bytes to this buffer: " + this + "."); + + data[offset + cursor] = (byte)(i >> 24); + data[offset + cursor + 1] = (byte)(i >> 16); + data[offset + cursor + 2] = (byte)(i >> 8); + data[offset + cursor + 3] = (byte)i; + cursor += 4; + } + + public void writeIntLE(int i) { + if (cursor + 4 > length) + throw new ArrayIndexOutOfBoundsException("Cannot write 4 bytes to this buffer: " + this + "."); + + data[offset + cursor] = (byte)i; + data[offset + cursor + 1] = (byte)(i >> 8); + data[offset + cursor + 2] = (byte)(i >> 16); + data[offset + cursor + 3] = (byte)(i >> 24); + cursor += 4; + } + + /** + * Write int in variable length format. Cursor is advanced by number of bytes + * written (1-5). + * + * Topmost bit of each byte is set to 1 to indicate that next byte has data. + */ + public void writeVariableIntLE(int i) { + while (i != 0) { + // Get lower bits of number + int b = i & 0x7f; + i >>= 7; + + if (i > 0) + // Set topmost bit of byte to indicate that next byte(s) contains + // remainder bits + b |= 0x80; + + writeByte(b); + } + } + + /** + * Write short in variable length format. Cursor is advanced by number of + * bytes written (1-2). + * + * Topmost bit of first byte is set to 1 to indicate that next byte has data. + */ + public void writeVariableShort(int length) { + if (length > 0x7f | length < 0) + writeShort(length | 0x8000); + else + writeByte(length); + } + + /** + * Prepend given data to this byte buffer. + */ + public void prepend(ByteBuffer buf) { + prepend(buf.data, buf.offset, buf.length); + } + + /** + * Prepend given data to this byte buffer. + */ + public void prepend(byte[] data) { + prepend(data, 0, data.length); + } + + /** + * Prepend given data to this byte buffer. + */ + public void prepend(byte[] data, int offset, int length) { + if (!isSoleOwner()) { + throw new RuntimeException("Create full copy of this byte buffer data for modification. refCount: " + refCount + ", parentByteBuffer: " + parentByteBuffer + + "."); + } + + // If there is no enough space for header to prepend + if (!(this.offset >= length)) { + throw new RuntimeException("Reserve data to have enough space for header."); + } + + // Copy header + System.arraycopy(data, offset, this.data, this.offset - length, length); + + // Extend byte range to include header + this.offset -= length; + this.length += length; + this.cursor += length; + } + + public void writeString(String str, Charset charset) { + writeBytes(str.getBytes(charset)); + } + + /** + * Write string of fixed size. When string is shorted, empty space is filled + * with zeros. When string is larger, it is truncated. + */ + public void writeFixedString(int length, String str, Charset charset) { + byte[] bytes = str.getBytes(charset); + writeBytes(bytes, 0, Math.min(bytes.length, length)); + + for (int i = bytes.length; i < length; i++) + writeByte(0); + } + + public void writeBytes(ByteBuffer buf) { + writeBytes(buf.data, buf.offset, buf.length); + } + + public void writeBytes(byte[] bytes) { + writeBytes(bytes, 0, bytes.length); + } + + public void writeBytes(byte[] bytes, int offset, int length) { + System.arraycopy(bytes, offset, this.data, this.offset + this.cursor, length); + cursor += length; + } + + // /** + // * Write BER encoded definite long variant of the ASN.1 length field. + // */ + // public void writeBerLength(int value) { + // int fieldLength; + // if (value > 0xFFffFF) + // fieldLength = 4; + // else if (value > 0xFFff) + // fieldLength = 3; + // else if (value > 0xFF) + // fieldLength = 2; + // else + // fieldLength = 1; + // + // if (cursor + fieldLength + 1 > length) + // throw new ArrayIndexOutOfBoundsException("Cannot write " + (fieldLength + + // 1) + " byte(s) to this buffer: " + this + "."); + // + // // Write length of length field itself + // writeByte(0x80 | fieldLength); + // + // switch (fieldLength) { + // case 4: + // data[offset + cursor++] = (byte) (value >> 24); + // case 3: + // data[offset + cursor++] = (byte) (value >> 16); + // case 2: + // data[offset + cursor++] = (byte) (value >> 8); + // case 1: + // data[offset + cursor++] = (byte) value; + // } + // + // } + + /** + * Reduce length of buffer to cursor position. + */ + public void trimAtCursor() { + length = cursor; + } + + /** + * Rewind cursor to beginning of buffer. + */ + public void rewindCursor() { + cursor = 0; + } + + /** + * Read RGB color in LE order. Cursor is advanced by 3. + * + * @return color as int, with red in lowest octet. + */ + public int readRGBColor() { + return readUnsignedByte() | (readUnsignedByte() << 8) | (readUnsignedByte() << 16); + } + + public void assertThatBufferIsFullyRead() { + if (cursor != length) + throw new RuntimeException("Data in buffer is not read fully. Buf: " + this + "."); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + + int end = offset + length; + for (int i = offset; i < end; i++) + result = 31 * result + data[i]; + + result = prime * result + length; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + + ByteBuffer other = (ByteBuffer)obj; + if (length != other.length) + return false; + + for (int i = 0; i < length; i++) + if (data[offset + i] != other.data[other.offset + i]) + return false; + + return true; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java index e3de289c513..becdb36b4b2 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java @@ -18,7 +18,7 @@ package streamer; public interface DataSink { - void sendData(ByteBuffer buf); + void sendData(ByteBuffer buf); - void sendEvent(Event event, Direction direction); + void sendEvent(Event event, Direction direction); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java index 1ce15a02e35..8ed41e46480 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java @@ -18,43 +18,43 @@ package streamer; public interface DataSource { - /** - * Get data from source. - * - * @param block - * if false, then return immediately when no data is available, - * otherwise wait for data - * @return new data or null, when no data is available - */ - ByteBuffer pull(boolean block); + /** + * Get data from source. + * + * @param block + * if false, then return immediately when no data is available, + * otherwise wait for data + * @return new data or null, when no data is available + */ + ByteBuffer pull(boolean block); - /** - * Hold data temporary to use at next pull or push. - * - * @param buf - * a data - */ - void pushBack(ByteBuffer buf); + /** + * Hold data temporary to use at next pull or push. + * + * @param buf + * a data + */ + void pushBack(ByteBuffer buf); - /** - * Hold data temporary to use at next pull. Don't return abything untill given - * amount of data will be read from source, because data will be pushed back - * anyway. - * - * @param buf - * a data - * @param lengthOfFullPacket - * length of full block of data to read from source - */ - void pushBack(ByteBuffer buf, int lengthOfFullPacket); + /** + * Hold data temporary to use at next pull. Don't return abything untill given + * amount of data will be read from source, because data will be pushed back + * anyway. + * + * @param buf + * a data + * @param lengthOfFullPacket + * length of full block of data to read from source + */ + void pushBack(ByteBuffer buf, int lengthOfFullPacket); - /** - * Send event to pads. - * - * @param event - * a event - * @param direction - * pad direction - */ - void sendEvent(Event event, Direction direction); + /** + * Send event to pads. + * + * @param event + * a event + * @param direction + * pad direction + */ + void sendEvent(Event event, Direction direction); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java index c9dede88e45..92fc8fdcadd 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java @@ -17,5 +17,5 @@ package streamer; public enum Direction { - IN, OUT + IN, OUT } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java index d5f10b1313d..d489b182393 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java @@ -24,97 +24,97 @@ import java.util.Set; */ public interface Element { - /** - * Name of pad for standard input. Should be set in all elements except pure - * sinks. - */ - public static final String STDIN = "stdin"; + /** + * Name of pad for standard input. Should be set in all elements except pure + * sinks. + */ + public static final String STDIN = "stdin"; - /** - * Name of pad for standard output. Should be set in all elements except pure - * sources. - */ - public static final String STDOUT = "stdout"; + /** + * Name of pad for standard output. Should be set in all elements except pure + * sources. + */ + public static final String STDOUT = "stdout"; - /** - * Get link connected to given pad. - * - * @param padName - * Standard pads are "stdin" and "stdout". - */ - Link getLink(String padName); + /** + * Get link connected to given pad. + * + * @param padName + * Standard pads are "stdin" and "stdout". + */ + Link getLink(String padName); - /** - * Get pads of this element. - */ - Set getPads(Direction direction); + /** + * Get pads of this element. + */ + Set getPads(Direction direction); - /** - * Connect link to given pad. - * - * @param padName - * a pad name. Standard pads are "stdin" and "stdout". - */ - void setLink(String padName, Link link, Direction direction); + /** + * Connect link to given pad. + * + * @param padName + * a pad name. Standard pads are "stdin" and "stdout". + */ + void setLink(String padName, Link link, Direction direction); - /** - * Disconnect link from given pad. - * - * @param padName - * Standard pads are "stdin" and "stdout". - */ - void dropLink(String padName); + /** + * Disconnect link from given pad. + * + * @param padName + * Standard pads are "stdin" and "stdout". + */ + void dropLink(String padName); - /** - * Pull data from element and handle it. Element should ask one of it input - * pads for data, handle data and push result to it sink(s), if any. - * - * @param block - * block until data will be available, or do a slight delay at least, - * when data is not available - */ - void poll(boolean block); + /** + * Pull data from element and handle it. Element should ask one of it input + * pads for data, handle data and push result to it sink(s), if any. + * + * @param block + * block until data will be available, or do a slight delay at least, + * when data is not available + */ + void poll(boolean block); - /** - * Handle incoming data. - * - * @param buf - * a data - * @param link - * TODO - */ - void handleData(ByteBuffer buf, Link link); + /** + * Handle incoming data. + * + * @param buf + * a data + * @param link + * TODO + */ + void handleData(ByteBuffer buf, Link link); - /** - * Handle event. - * - * @param event - * an event - * @param direction - * if IN, then send event to input pads, when OUT, then send to - * output pads - */ - void handleEvent(Event event, Direction direction); + /** + * Handle event. + * + * @param event + * an event + * @param direction + * if IN, then send event to input pads, when OUT, then send to + * output pads + */ + void handleEvent(Event event, Direction direction); - /** - * Get element ID. - */ - String getId(); + /** + * Get element ID. + */ + String getId(); - /** - * Validate element: check is all required pads are connected. - */ - void validate(); + /** + * Validate element: check is all required pads are connected. + */ + void validate(); - /** - * Drop link. - * - * @param link a link to drop - */ - void dropLink(Link link); + /** + * Drop link. + * + * @param link a link to drop + */ + void dropLink(Link link); - /** - * Drop existing link and replace it by new link. - */ - void replaceLink(Link existingLink, Link newLink); + /** + * Drop existing link and replace it by new link. + */ + void replaceLink(Link existingLink, Link newLink); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java index 9256f1bebb5..9808f62b684 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java @@ -17,17 +17,16 @@ package streamer; public enum Event { - STREAM_START, - STREAM_CLOSE, + STREAM_START, STREAM_CLOSE, - /** - * Upgrade socket to SSL. - */ - SOCKET_UPGRADE_TO_SSL, + /** + * Upgrade socket to SSL. + */ + SOCKET_UPGRADE_TO_SSL, - /** - * Switch links to input mode. - */ - LINK_SWITCH_TO_PULL_MODE + /** + * Switch links to input mode. + */ + LINK_SWITCH_TO_PULL_MODE } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSink.java index 65fb29e3f0f..e373b19a10c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSink.java @@ -18,52 +18,52 @@ package streamer; public class FakeSink extends BaseElement { - public FakeSink(String id) { - super(id); - } + public FakeSink(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Received buf #" + (packetNumber) + " " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Received buf #" + (packetNumber) + " " + buf + "."); - if (buf == null) - return; + if (buf == null) + return; - // Use packetNumber variable to count incoming packets - packetNumber++; + // Use packetNumber variable to count incoming packets + packetNumber++; - buf.unref(); - } + buf.unref(); + } - @Override - public String toString() { - return "FakeSink(" + id + ")"; - } + @Override + public String toString() { + return "FakeSink(" + id + ")"; + } - @Override - public void handleEvent(Event event, Direction direction) { - if (verbose) - System.out.println("[" + this + "] INFO: Event received: " + event + "."); + @Override + public void handleEvent(Event event, Direction direction) { + if (verbose) + System.out.println("[" + this + "] INFO: Event received: " + event + "."); - } + } - /** - * Example. - */ - public static void main(String args[]) { + /** + * Example. + */ + public static void main(String args[]) { - Element sink = new FakeSink("sink") { - { - verbose = true; - } - }; + Element sink = new FakeSink("sink") { + { + verbose = true; + } + }; - byte[] data = new byte[] { 1, 2, 3 }; - ByteBuffer buf = new ByteBuffer(data); - sink.setLink(STDIN, new SyncLink(), Direction.IN); - sink.getLink(STDIN).sendData(buf); + byte[] data = new byte[] {1, 2, 3}; + ByteBuffer buf = new ByteBuffer(data); + sink.setLink(STDIN, new SyncLink(), Direction.IN); + sink.getLink(STDIN).sendData(buf); - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSource.java index 4cf65034a73..9056852855b 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/FakeSource.java @@ -18,108 +18,108 @@ package streamer; public class FakeSource extends BaseElement { - /** - * Delay for null packets in poll method when blocking is requested, in - * milliseconds. - */ - protected long delay = SyncLink.STANDARD_DELAY_FOR_EMPTY_PACKET; + /** + * Delay for null packets in poll method when blocking is requested, in + * milliseconds. + */ + protected long delay = SyncLink.STANDARD_DELAY_FOR_EMPTY_PACKET; - public FakeSource(String id) { - super(id); - } - - @Override - public void poll(boolean block) { - if (numBuffers > 0 && packetNumber >= numBuffers) { - // Close stream when limit of packets is reached - sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); - return; + public FakeSource(String id) { + super(id); } - // Prepare new packet - ByteBuffer buf = initializeData(); + @Override + public void poll(boolean block) { + if (numBuffers > 0 && packetNumber >= numBuffers) { + // Close stream when limit of packets is reached + sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); + return; + } - // Push it to output(s) - pushDataToAllOuts(buf); + // Prepare new packet + ByteBuffer buf = initializeData(); - // Make slight delay when blocking input was requested (to avoid - // consuming of 100% in parent loop) - if (block) - delay(); + // Push it to output(s) + pushDataToAllOuts(buf); - } + // Make slight delay when blocking input was requested (to avoid + // consuming of 100% in parent loop) + if (block) + delay(); - /** - * Make slight delay. Should be used when blocking input is requested in pull - * mode, but null packed was returned by input. - */ - protected void delay() { - try { - Thread.sleep(delay); - } catch (InterruptedException e) { } - } - /** - * Initialize data. - */ - public ByteBuffer initializeData() { - ByteBuffer buf = new ByteBuffer(incommingBufLength); + /** + * Make slight delay. Should be used when blocking input is requested in pull + * mode, but null packed was returned by input. + */ + protected void delay() { + try { + Thread.sleep(delay); + } catch (InterruptedException e) { + } + } - // Set first byte of package to it sequance number - buf.data[buf.offset] = (byte) (packetNumber % 128); + /** + * Initialize data. + */ + public ByteBuffer initializeData() { + ByteBuffer buf = new ByteBuffer(incommingBufLength); - // Initialize rest of bytes with sequential values, which are - // corresponding with their position in byte buffer - for (int i = buf.offset + 1; i < buf.length; i++) - buf.data[i] = (byte) (i % 128); + // Set first byte of package to it sequance number + buf.data[buf.offset] = (byte)(packetNumber % 128); - buf.putMetadata(ByteBuffer.SEQUENCE_NUMBER, packetNumber); - buf.putMetadata("src", id); + // Initialize rest of bytes with sequential values, which are + // corresponding with their position in byte buffer + for (int i = buf.offset + 1; i < buf.length; i++) + buf.data[i] = (byte)(i % 128); - return buf; - } + buf.putMetadata(ByteBuffer.SEQUENCE_NUMBER, packetNumber); + buf.putMetadata("src", id); - @Override - public String toString() { - return "FakeSource(" + id + ")"; - } + return buf; + } - public static void main(String args[]) { + @Override + public String toString() { + return "FakeSource(" + id + ")"; + } - Element fakeSource = new FakeSource("source 3/10/100") { - { - verbose = true; - this.incommingBufLength = 3; - this.numBuffers = 10; - this.delay = 100; - } - }; + public static void main(String args[]) { - Element fakeSink = new FakeSink("sink") { - { - this.verbose = true; - } - }; + Element fakeSource = new FakeSource("source 3/10/100") { + { + verbose = true; + this.incommingBufLength = 3; + this.numBuffers = 10; + this.delay = 100; + } + }; - Element fakeSink2 = new FakeSink("sink2") { - { - this.verbose = true; - } - }; + Element fakeSink = new FakeSink("sink") { + { + this.verbose = true; + } + }; - Link link = new SyncLink(); + Element fakeSink2 = new FakeSink("sink2") { + { + this.verbose = true; + } + }; - fakeSource.setLink(STDOUT, link, Direction.OUT); - fakeSink.setLink(STDIN, link, Direction.IN); + Link link = new SyncLink(); - Link link2 = new SyncLink(); + fakeSource.setLink(STDOUT, link, Direction.OUT); + fakeSink.setLink(STDIN, link, Direction.IN); - fakeSource.setLink("out2", link2, Direction.OUT); - fakeSink2.setLink(STDIN, link2, Direction.IN); + Link link2 = new SyncLink(); - link.run(); + fakeSource.setLink("out2", link2, Direction.OUT); + fakeSink2.setLink(STDIN, link2, Direction.IN); - } + link.run(); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java index b05637f0db0..45155e185fb 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java @@ -25,170 +25,170 @@ import java.io.InputStream; */ public class InputStreamSource extends BaseElement { - protected InputStream is; - protected SocketWrapper socketWrapper; + protected InputStream is; + protected SocketWrapper socketWrapper; - public InputStreamSource(String id) { - super(id); - } - - public InputStreamSource(String id, InputStream is) { - super(id); - this.is = is; - } - - public InputStreamSource(String id, SocketWrapper socketWrapper) { - super(id); - this.socketWrapper = socketWrapper; - } - - @Override - public void handleEvent(Event event, Direction direction) { - switch (event) { - case SOCKET_UPGRADE_TO_SSL: - socketWrapper.upgradeToSsl(); - break; - default: - super.handleEvent(event, direction); + public InputStreamSource(String id) { + super(id); } - } - @Override - public void setLink(String padName, Link link, Direction direction) { - switch (direction) { - case OUT: - super.setLink(padName, link, direction); - - if (is == null) { - // Pause links until data stream will be ready - link.pause(); - } - break; - case IN: - throw new RuntimeException("Cannot assign link to input pad in source element. Element: " + this + ", pad: " + padName + ", link: " + link + "."); + public InputStreamSource(String id, InputStream is) { + super(id); + this.is = is; } - } - public void setInputStream(InputStream is) { - this.is = is; + public InputStreamSource(String id, SocketWrapper socketWrapper) { + super(id); + this.socketWrapper = socketWrapper; + } - // Resume links - resumeLinks(); - } + @Override + public void handleEvent(Event event, Direction direction) { + switch (event) { + case SOCKET_UPGRADE_TO_SSL: + socketWrapper.upgradeToSsl(); + break; + default: + super.handleEvent(event, direction); + } + } - private void resumeLinks() { - for (DataSink sink : outputPads.values()) - ((Link) sink).resume(); - } + @Override + public void setLink(String padName, Link link, Direction direction) { + switch (direction) { + case OUT: + super.setLink(padName, link, direction); - /** - * Read data from input stream. - */ - @Override - public void poll(boolean block) { - try { - if (!block && is.available() == 0) { + if (is == null) { + // Pause links until data stream will be ready + link.pause(); + } + break; + case IN: + throw new RuntimeException("Cannot assign link to input pad in source element. Element: " + this + ", pad: " + padName + ", link: " + link + "."); + } + } - if (verbose) - System.out.println("[" + this + "] INFO: No data in stream is available now, returning."); + public void setInputStream(InputStream is) { + this.is = is; - return; - } + // Resume links + resumeLinks(); + } - // Create buffer of recommended size and with default offset - ByteBuffer buf = new ByteBuffer(incommingBufLength); + private void resumeLinks() { + for (DataSink sink : outputPads.values()) + ((Link)sink).resume(); + } - if (verbose) - System.out.println("[" + this + "] INFO: Reading data from stream."); + /** + * Read data from input stream. + */ + @Override + public void poll(boolean block) { + try { + if (!block && is.available() == 0) { - int actualLength = is.read(buf.data, buf.offset, buf.data.length - buf.offset); + if (verbose) + System.out.println("[" + this + "] INFO: No data in stream is available now, returning."); - if (actualLength < 0) { - if (verbose) - System.out.println("[" + this + "] INFO: End of stream."); + return; + } - buf.unref(); + // Create buffer of recommended size and with default offset + ByteBuffer buf = new ByteBuffer(incommingBufLength); + + if (verbose) + System.out.println("[" + this + "] INFO: Reading data from stream."); + + int actualLength = is.read(buf.data, buf.offset, buf.data.length - buf.offset); + + if (actualLength < 0) { + if (verbose) + System.out.println("[" + this + "] INFO: End of stream."); + + buf.unref(); + closeStream(); + sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); + return; + } + + if (actualLength == 0) { + if (verbose) + System.out.println("[" + this + "] INFO: Empty buffer is read from stream."); + + buf.unref(); + return; + } + + buf.length = actualLength; + + if (verbose) + System.out.println("[" + this + "] INFO: Data read from stream: " + buf + "."); + + pushDataToAllOuts(buf); + + } catch (IOException e) { + System.err.println("[" + this + "] ERROR: " + e.getMessage()); + closeStream(); + } + } + + @Override + protected void onClose() { closeStream(); - sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); - return; - } + } - if (actualLength == 0) { + private void closeStream() { if (verbose) - System.out.println("[" + this + "] INFO: Empty buffer is read from stream."); + System.out.println("[" + this + "] INFO: Closing stream."); - buf.unref(); - return; - } - - buf.length = actualLength; - - if (verbose) - System.out.println("[" + this + "] INFO: Data read from stream: " + buf + "."); - - pushDataToAllOuts(buf); - - } catch (IOException e) { - System.err.println("[" + this + "] ERROR: " + e.getMessage()); - closeStream(); + try { + is.close(); + } catch (IOException e) { + } + try { + sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); + } catch (Exception e) { + } } - } - @Override - protected void onClose() { - closeStream(); - } - - private void closeStream() { - if (verbose) - System.out.println("[" + this + "] INFO: Closing stream."); - - try { - is.close(); - } catch (IOException e) { + @Override + public String toString() { + return "InputStreamSource(" + id + ")"; } - try { - sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); - } catch (Exception e) { + + /** + * Example. + */ + public static void main(String args[]) { + InputStream is = new ByteArrayInputStream(new byte[] {1, 2, 3}); + + InputStreamSource source = new InputStreamSource("source") { + { + verbose = true; + } + }; + Element fakeSink = new FakeSink("sink") { + { + verbose = true; + } + }; + + Link link = new SyncLink() { + { + verbose = true; + } + }; + + source.setLink(STDOUT, link, Direction.OUT); + fakeSink.setLink(STDIN, link, Direction.IN); + + source.setInputStream(is); + + link.sendEvent(Event.STREAM_START, Direction.OUT); + link.run(); + } - } - - @Override - public String toString() { - return "InputStreamSource(" + id + ")"; - } - - /** - * Example. - */ - public static void main(String args[]) { - InputStream is = new ByteArrayInputStream(new byte[] { 1, 2, 3 }); - - InputStreamSource source = new InputStreamSource("source") { - { - verbose = true; - } - }; - Element fakeSink = new FakeSink("sink") { - { - verbose = true; - } - }; - - Link link = new SyncLink() { - { - verbose = true; - } - }; - - source.setLink(STDOUT, link, Direction.OUT); - fakeSink.setLink(STDIN, link, Direction.IN); - - source.setInputStream(is); - - link.sendEvent(Event.STREAM_START, Direction.OUT); - link.run(); - - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java index 8bd05a10488..b0d71d55919 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java @@ -22,45 +22,45 @@ package streamer; */ public interface Link extends DataSource, DataSink, Runnable { - /** - * Wire this link with given sink. - * - * @param sink - * an Element - * @return same sink element, for chaining - */ - Element setSink(Element sink); + /** + * Wire this link with given sink. + * + * @param sink + * an Element + * @return same sink element, for chaining + */ + Element setSink(Element sink); - /** - * Wire this link with given source. - * - * @param source - * an Element - * @return same source element, for chaining - */ - Element setSource(Element source); + /** + * Wire this link with given source. + * + * @param source + * an Element + * @return same source element, for chaining + */ + Element setSource(Element source); - Element getSource(); + Element getSource(); - Element getSink(); + Element getSink(); - /** - * Hold all data in cache, don't pass data to sink until resumed. - */ - void pause(); + /** + * Hold all data in cache, don't pass data to sink until resumed. + */ + void pause(); - /** - * Resume transfer. - */ - void resume(); + /** + * Resume transfer. + */ + void resume(); - /** - * Change mode of operation of this link from push mode to pull mode. - */ - void setPullMode(); + /** + * Change mode of operation of this link from push mode to pull mode. + */ + void setPullMode(); - /** - * Drop this link. - */ - void drop(); + /** + * Drop this link. + */ + void drop(); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSink.java index ce9fdf91078..8094c82b7b3 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSink.java @@ -23,89 +23,91 @@ import java.util.Arrays; */ public class MockSink extends BaseElement { - protected ByteBuffer bufs[] = null; + protected ByteBuffer bufs[] = null; - public MockSink(String id) { - super(id); - } + public MockSink(String id) { + super(id); + } - public MockSink(String id, ByteBuffer bufs[]) { - super(id); - this.bufs = bufs; - } + public MockSink(String id, ByteBuffer bufs[]) { + super(id); + this.bufs = bufs; + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Received buf #" + (packetNumber) + " " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Received buf #" + (packetNumber) + " " + buf + "."); - if (buf == null) - return; + if (buf == null) + return; - if (packetNumber >= bufs.length) - throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not expected. Number of expected buffers: " + bufs.length - + ", unexpected buffer: " + buf + "."); + if (packetNumber >= bufs.length) + throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not expected. Number of expected buffers: " + bufs.length + + ", unexpected buffer: " + buf + "."); - // Compare incoming buffer with expected buffer - if (!Arrays.equals(bufs[packetNumber].toByteArray(), buf.toByteArray())) - throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual bufer: " + buf - + ",\n expected buffer: " + bufs[packetNumber] + "."); + // Compare incoming buffer with expected buffer + if (!Arrays.equals(bufs[packetNumber].toByteArray(), buf.toByteArray())) + throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual bufer: " + buf + + ",\n expected buffer: " + bufs[packetNumber] + "."); - if (verbose) - System.out.println("[" + this + "] INFO: buffers are equal."); + if (verbose) + System.out.println("[" + this + "] INFO: buffers are equal."); - // Use packetNumber variable to count incoming packets - packetNumber++; + // Use packetNumber variable to count incoming packets + packetNumber++; - buf.unref(); - } + buf.unref(); + } - @Override - protected void onClose() { - super.onClose(); + @Override + protected void onClose() { + super.onClose(); - if (packetNumber != bufs.length) - throw new AssertionError("[" + this + "] Number of expected buffers: " + bufs.length + ", number of actual buffers: " + packetNumber + "."); - } + if (packetNumber != bufs.length) + throw new AssertionError("[" + this + "] Number of expected buffers: " + bufs.length + ", number of actual buffers: " + packetNumber + "."); + } - @Override - public String toString() { - return "MockSink(" + id + ")"; - } + @Override + public String toString() { + return "MockSink(" + id + ")"; + } - /** - * Example. - */ - public static void main(String args[]) { + /** + * Example. + */ + public static void main(String args[]) { - Element mockSource = new MockSource("source") { - { - this.bufs = new ByteBuffer[] { new ByteBuffer(new byte[] { 1, 1, 2, 3, 4, 5 }), new ByteBuffer(new byte[] { 2, 1, 2, 3, 4 }), - new ByteBuffer(new byte[] { 3, 1, 2, 3 }), new ByteBuffer(new byte[] { 4, 1, 2 }), new ByteBuffer(new byte[] { 5, 1 }) }; - this.verbose = true; - this.delay = 100; - this.numBuffers = this.bufs.length; - } - }; + Element mockSource = new MockSource("source") { + { + this.bufs = + new ByteBuffer[] {new ByteBuffer(new byte[] {1, 1, 2, 3, 4, 5}), new ByteBuffer(new byte[] {2, 1, 2, 3, 4}), new ByteBuffer(new byte[] {3, 1, 2, 3}), + new ByteBuffer(new byte[] {4, 1, 2}), new ByteBuffer(new byte[] {5, 1})}; + this.verbose = true; + this.delay = 100; + this.numBuffers = this.bufs.length; + } + }; - Element mockSink = new MockSink("sink") { - { - this.bufs = new ByteBuffer[] { new ByteBuffer(new byte[] { 1, 1, 2, 3, 4, 5 }), new ByteBuffer(new byte[] { 2, 1, 2, 3, 4 }), - new ByteBuffer(new byte[] { 3, 1, 2, 3 }), new ByteBuffer(new byte[] { 4, 1, 2 }), new ByteBuffer(new byte[] { 5, 1 }) }; - this.verbose = true; - } - }; + Element mockSink = new MockSink("sink") { + { + this.bufs = + new ByteBuffer[] {new ByteBuffer(new byte[] {1, 1, 2, 3, 4, 5}), new ByteBuffer(new byte[] {2, 1, 2, 3, 4}), new ByteBuffer(new byte[] {3, 1, 2, 3}), + new ByteBuffer(new byte[] {4, 1, 2}), new ByteBuffer(new byte[] {5, 1})}; + this.verbose = true; + } + }; - Link link = new SyncLink() { - { - this.verbose = true; - } - }; + Link link = new SyncLink() { + { + this.verbose = true; + } + }; - mockSource.setLink(STDOUT, link, Direction.OUT); - mockSink.setLink(STDIN, link, Direction.IN); + mockSource.setLink(STDOUT, link, Direction.OUT); + mockSink.setLink(STDIN, link, Direction.IN); - link.run(); - } + link.run(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSource.java index db47db2ca50..f758bab6aff 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/MockSource.java @@ -18,71 +18,72 @@ package streamer; public class MockSource extends FakeSource { - protected ByteBuffer bufs[] = null; + protected ByteBuffer bufs[] = null; - public MockSource(String id) { - super(id); - } - - public MockSource(String id, ByteBuffer bufs[]) { - super(id); - this.bufs = bufs; - } - - /** - * Initialize data. - */ - @Override - public ByteBuffer initializeData() { - if (packetNumber >= bufs.length) { - sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); - return null; + public MockSource(String id) { + super(id); } - ByteBuffer buf = bufs[packetNumber]; + public MockSource(String id, ByteBuffer bufs[]) { + super(id); + this.bufs = bufs; + } - buf.putMetadata(ByteBuffer.SEQUENCE_NUMBER, packetNumber); - return buf; - } + /** + * Initialize data. + */ + @Override + public ByteBuffer initializeData() { + if (packetNumber >= bufs.length) { + sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); + return null; + } - @Override - public void handleEvent(Event event, Direction direction) { - if (verbose) - System.out.println("[" + this + "] INFO: Event received: " + event + "."); + ByteBuffer buf = bufs[packetNumber]; - } + buf.putMetadata(ByteBuffer.SEQUENCE_NUMBER, packetNumber); + return buf; + } - @Override - public String toString() { - return "MockSource(" + id + ")"; - } + @Override + public void handleEvent(Event event, Direction direction) { + if (verbose) + System.out.println("[" + this + "] INFO: Event received: " + event + "."); - /** - * Example. - */ - public static void main(String args[]) { + } - Element mockSource = new MockSource("source") { - { - this.bufs = new ByteBuffer[] { new ByteBuffer(new byte[] { 1, 1, 2, 3, 4, 5 }), new ByteBuffer(new byte[] { 2, 1, 2, 3, 4 }), - new ByteBuffer(new byte[] { 3, 1, 2, 3 }), new ByteBuffer(new byte[] { 4, 1, 2 }), new ByteBuffer(new byte[] { 5, 1 }) }; - this.verbose = true; - this.delay = 100; - // this.numBuffers = this.bufs.length; - } - }; + @Override + public String toString() { + return "MockSource(" + id + ")"; + } - Element fakeSink = new FakeSink("sink") { - { - this.verbose = true; - } - }; + /** + * Example. + */ + public static void main(String args[]) { - Link link = new SyncLink(); + Element mockSource = new MockSource("source") { + { + this.bufs = + new ByteBuffer[] {new ByteBuffer(new byte[] {1, 1, 2, 3, 4, 5}), new ByteBuffer(new byte[] {2, 1, 2, 3, 4}), new ByteBuffer(new byte[] {3, 1, 2, 3}), + new ByteBuffer(new byte[] {4, 1, 2}), new ByteBuffer(new byte[] {5, 1})}; + this.verbose = true; + this.delay = 100; + // this.numBuffers = this.bufs.length; + } + }; - mockSource.setLink(STDOUT, link, Direction.OUT); - fakeSink.setLink(STDIN, link, Direction.IN); + Element fakeSink = new FakeSink("sink") { + { + this.verbose = true; + } + }; - link.run(); - } + Link link = new SyncLink(); + + mockSource.setLink(STDOUT, link, Direction.OUT); + fakeSink.setLink(STDIN, link, Direction.IN); + + link.run(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java index 1bc9240dbac..d50995eae72 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java @@ -29,105 +29,105 @@ package streamer; */ public abstract class OneTimeSwitch extends BaseElement { - /** - * One-time out - name of output pad for one time logic. By default, output - * directly to socket. - */ - public static final String OTOUT = "otout"; + /** + * One-time out - name of output pad for one time logic. By default, output + * directly to socket. + */ + public static final String OTOUT = "otout"; - private boolean switched = false; + private boolean switched = false; - public OneTimeSwitch(String id) { - super(id); - declarePads(); - } + public OneTimeSwitch(String id) { + super(id); + declarePads(); + } - protected void declarePads() { - inputPads.put(STDIN, null); - outputPads.put(OTOUT, null); - outputPads.put(STDOUT, null); - } + protected void declarePads() { + inputPads.put(STDIN, null); + outputPads.put(OTOUT, null); + outputPads.put(STDOUT, null); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (switched) - throw new RuntimeException(this + " element is switched off and must not receive any data or events anymore."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (switched) + throw new RuntimeException(this + " element is switched off and must not receive any data or events anymore."); - if (buf == null) - return; + if (buf == null) + return; - handleOneTimeData(buf, link); - } + handleOneTimeData(buf, link); + } - public void pushDataToOTOut(ByteBuffer buf) { - if (verbose) - System.out.println("[" + this + "] INFO: Sending data: " + buf + "."); + public void pushDataToOTOut(ByteBuffer buf) { + if (verbose) + System.out.println("[" + this + "] INFO: Sending data: " + buf + "."); - outputPads.get(OTOUT).sendData(buf); - } + outputPads.get(OTOUT).sendData(buf); + } - /** - * Switch this element off. Pass data directly to main output(s). - */ - public void switchOff() { - if (verbose) - System.out.println("[" + this + "] INFO: Switching OFF."); + /** + * Switch this element off. Pass data directly to main output(s). + */ + public void switchOff() { + if (verbose) + System.out.println("[" + this + "] INFO: Switching OFF."); - switched = true; - verbose = false; + switched = true; + verbose = false; - // Rewire links: drop otout link, replace stdout link by stdin to send data - // directly to stdout - Link stdout = (Link) outputPads.get(STDOUT); - Link stdin = (Link) inputPads.get(STDIN); - Link otout = (Link) outputPads.get(OTOUT); + // Rewire links: drop otout link, replace stdout link by stdin to send data + // directly to stdout + Link stdout = (Link)outputPads.get(STDOUT); + Link stdin = (Link)inputPads.get(STDIN); + Link otout = (Link)outputPads.get(OTOUT); - otout.drop(); + otout.drop(); - // Wake up next peer(s) - sendEventToAllPads(Event.STREAM_START, Direction.OUT); + // Wake up next peer(s) + sendEventToAllPads(Event.STREAM_START, Direction.OUT); - stdin.setSink(null); - inputPads.remove(STDIN); + stdin.setSink(null); + inputPads.remove(STDIN); - Element nextPeer = stdout.getSink(); - nextPeer.replaceLink(stdout, stdin); - stdout.drop(); + Element nextPeer = stdout.getSink(); + nextPeer.replaceLink(stdout, stdin); + stdout.drop(); - for (Object link : inputPads.values().toArray()) - ((Link) link).drop(); - for (Object link : outputPads.values().toArray()) - ((Link) link).drop(); + for (Object link : inputPads.values().toArray()) + ((Link)link).drop(); + for (Object link : outputPads.values().toArray()) + ((Link)link).drop(); - } + } - public void switchOn() { - if (verbose) - System.out.println("[" + this + "] INFO: Switching ON."); + public void switchOn() { + if (verbose) + System.out.println("[" + this + "] INFO: Switching ON."); - switched = false; - } + switched = false; + } - /** - * Override this method to handle one-time packet(s) at handshake or - * initialization stages. Execute method @see switchRoute() when this method - * is no longer necessary. - */ - protected abstract void handleOneTimeData(ByteBuffer buf, Link link); + /** + * Override this method to handle one-time packet(s) at handshake or + * initialization stages. Execute method @see switchRoute() when this method + * is no longer necessary. + */ + protected abstract void handleOneTimeData(ByteBuffer buf, Link link); - @Override - public void handleEvent(Event event, Direction direction) { - if (event == Event.STREAM_START) { - if (verbose) - System.out.println("[" + this + "] INFO: Event " + event + " is received."); + @Override + public void handleEvent(Event event, Direction direction) { + if (event == Event.STREAM_START) { + if (verbose) + System.out.println("[" + this + "] INFO: Event " + event + " is received."); - switchOn(); + switchOn(); - // Execute this element onStart(), but do not propagate event further, - // to not wake up next elements too early - onStart(); - } else - super.handleEvent(event, direction); - } + // Execute this element onStart(), but do not propagate event further, + // to not wake up next elements too early + onStart(); + } else + super.handleEvent(event, direction); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java index 1d63850d9ca..8f5654ef23d 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java @@ -18,6 +18,6 @@ package streamer; public class Order { - public Object type; + public Object type; } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java index d1aa5ce4aca..7a55ea81bea 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java @@ -22,132 +22,132 @@ import java.io.OutputStream; public class OutputStreamSink extends BaseElement { - protected OutputStream os; - protected SocketWrapper socketWrapper; + protected OutputStream os; + protected SocketWrapper socketWrapper; - public OutputStreamSink(String id) { - super(id); - } - - public OutputStreamSink(String id, OutputStream os) { - super(id); - this.os = os; - } - - public OutputStreamSink(String id, SocketWrapper socketWrapper) { - super(id); - this.socketWrapper = socketWrapper; - } - - public void setOutputStream(OutputStream os) { - this.os = os; - // Resume links - resumeLinks(); - } - - /** - * Send incoming data to stream. - */ - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - try { - if (verbose) - System.out.println("[" + this + "] INFO: Writing data to stream: " + buf + "."); - - os.write(buf.data, buf.offset, buf.length); - os.flush(); - } catch (IOException e) { - System.err.println("[" + this + "] ERROR: " + e.getMessage()); - closeStream(); + public OutputStreamSink(String id) { + super(id); } - } - @Override - public void handleEvent(Event event, Direction direction) { - switch (event) { - case SOCKET_UPGRADE_TO_SSL: - socketWrapper.upgradeToSsl(); - break; - default: - super.handleEvent(event, direction); + public OutputStreamSink(String id, OutputStream os) { + super(id); + this.os = os; } - } - @Override - public void setLink(String padName, Link link, Direction direction) { - switch (direction) { - case IN: - super.setLink(padName, link, direction); - - if (os == null) - // Pause links until data stream will be ready - link.pause(); - break; - case OUT: - throw new RuntimeException("Cannot assign link to output pad in sink element. Element: " + this + ", pad: " + padName + ", link: " + link + "."); + public OutputStreamSink(String id, SocketWrapper socketWrapper) { + super(id); + this.socketWrapper = socketWrapper; } - } - private void resumeLinks() { - for (DataSource source : inputPads.values()) - ((Link) source).resume(); - } - - @Override - protected void onClose() { - closeStream(); - } - - private void closeStream() { - if (verbose) - System.out.println("[" + this + "] INFO: Closing stream."); - - try { - os.close(); - } catch (IOException e) { + public void setOutputStream(OutputStream os) { + this.os = os; + // Resume links + resumeLinks(); } - try { - sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN); - } catch (Exception e) { + + /** + * Send incoming data to stream. + */ + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; + + try { + if (verbose) + System.out.println("[" + this + "] INFO: Writing data to stream: " + buf + "."); + + os.write(buf.data, buf.offset, buf.length); + os.flush(); + } catch (IOException e) { + System.err.println("[" + this + "] ERROR: " + e.getMessage()); + closeStream(); + } } - } - @Override - public String toString() { - return "OutputStreamSink(" + id + ")"; - } + @Override + public void handleEvent(Event event, Direction direction) { + switch (event) { + case SOCKET_UPGRADE_TO_SSL: + socketWrapper.upgradeToSsl(); + break; + default: + super.handleEvent(event, direction); + } + } - /** - * Example. - */ - public static void main(String args[]) { - Element source = new FakeSource("source") { - { - this.verbose = true; - this.numBuffers = 3; - this.incommingBufLength = 5; - this.delay = 100; - } - }; + @Override + public void setLink(String padName, Link link, Direction direction) { + switch (direction) { + case IN: + super.setLink(padName, link, direction); - OutputStreamSink sink = new OutputStreamSink("sink") { - { - verbose = true; - } - }; + if (os == null) + // Pause links until data stream will be ready + link.pause(); + break; + case OUT: + throw new RuntimeException("Cannot assign link to output pad in sink element. Element: " + this + ", pad: " + padName + ", link: " + link + "."); + } + } - Link link = new SyncLink(); + private void resumeLinks() { + for (DataSource source : inputPads.values()) + ((Link)source).resume(); + } - source.setLink(STDOUT, link, Direction.OUT); - sink.setLink(STDIN, link, Direction.IN); + @Override + protected void onClose() { + closeStream(); + } - sink.setOutputStream(new ByteArrayOutputStream()); + private void closeStream() { + if (verbose) + System.out.println("[" + this + "] INFO: Closing stream."); - link.sendEvent(Event.STREAM_START, Direction.IN); - link.run(); + try { + os.close(); + } catch (IOException e) { + } + try { + sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN); + } catch (Exception e) { + } + } - } + @Override + public String toString() { + return "OutputStreamSink(" + id + ")"; + } + + /** + * Example. + */ + public static void main(String args[]) { + Element source = new FakeSource("source") { + { + this.verbose = true; + this.numBuffers = 3; + this.incommingBufLength = 5; + this.delay = 100; + } + }; + + OutputStreamSink sink = new OutputStreamSink("sink") { + { + verbose = true; + } + }; + + Link link = new SyncLink(); + + source.setLink(STDOUT, link, Direction.OUT); + sink.setLink(STDIN, link, Direction.IN); + + sink.setOutputStream(new ByteArrayOutputStream()); + + link.sendEvent(Event.STREAM_START, Direction.IN); + link.run(); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java index 2f9f9943ea0..d2e52ddbb27 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java @@ -21,71 +21,71 @@ package streamer; */ public interface Pipeline extends Element { - static final String IN = Direction.IN.toString(); - static final String OUT = Direction.OUT.toString(); + static final String IN = Direction.IN.toString(); + static final String OUT = Direction.OUT.toString(); - /** - * Add elements to pipeline. - * - * @param elements - */ - void add(Element... elements); + /** + * Add elements to pipeline. + * + * @param elements + */ + void add(Element... elements); - /** - * Add elements to pipeline and link them in given order. - * - * @param elements - */ - void addAndLink(Element... elements); + /** + * Add elements to pipeline and link them in given order. + * + * @param elements + */ + void addAndLink(Element... elements); - /** - * Link elements in given order using SyncLink. Element name can have prefix - * "PADNAME< " or/and suffix " >PADNAME" to use given named pads instead of - * "stdin" and "stdout". I.e. link("foo", "bar", "baz"); is equal - * to link("foo >stdin", "stdout< bar >stdin", "stdout< baz"); . - * - * Special elements "IN" and "OUT" are pointing to pipeline outer interfaces, - * so when pipeline will be connected with other elements, outside of this - * pipeline, they will be connected to IN and OUT elements. - * - * Example: - * - * 
-   * pipeline.link("IN", "foo", "bar", "OUT");
-   * // Make additional branch from foo to baz, and then to OUT
-   * pipeline.link("foo >baz_out", "baz", "baz_in< OUT");
-   *
- * - * @param elements - * elements to link - */ - void link(String... elements); + /** + * Link elements in given order using SyncLink. Element name can have prefix + * "PADNAME< " or/and suffix " >PADNAME" to use given named pads instead of + * "stdin" and "stdout". I.e. link("foo", "bar", "baz"); is equal + * to link("foo >stdin", "stdout< bar >stdin", "stdout< baz"); . + * + * Special elements "IN" and "OUT" are pointing to pipeline outer interfaces, + * so when pipeline will be connected with other elements, outside of this + * pipeline, they will be connected to IN and OUT elements. + * + * Example: + * + * 
+     * pipeline.link("IN", "foo", "bar", "OUT");
+     * // Make additional branch from foo to baz, and then to OUT
+     * pipeline.link("foo >baz_out", "baz", "baz_in< OUT");
+     *
+ * + * @param elements + * elements to link + */ + void link(String... elements); - /** - * Get element by name. - * - * @return an element - */ - Element get(String elementName); + /** + * Get element by name. + * + * @return an element + */ + Element get(String elementName); - /** - * Get link by element name and pad name. - */ - Link getLink(String elementName, String padName); + /** + * Get link by element name and pad name. + */ + Link getLink(String elementName, String padName); - /** - * Set link by element name and pad name. Allows to link external elements - * into internal elements of pipeline. Special elements "IN" and "OUT" are - * pointing to pipeline outer interfaces. - */ - void setLink(String elementName, String padName, Link link, Direction direction); + /** + * Set link by element name and pad name. Allows to link external elements + * into internal elements of pipeline. Special elements "IN" and "OUT" are + * pointing to pipeline outer interfaces. + */ + void setLink(String elementName, String padName, Link link, Direction direction); - /** - * Get link connected to given pad in given element and run it main loop. - * @param separateThread - * set to true to start main loop in separate thread. - * @param waitForStartEvent TODO - */ - void runMainLoop(String element, String padName, boolean separateThread, boolean waitForStartEvent); + /** + * Get link connected to given pad in given element and run it main loop. + * @param separateThread + * set to true to start main loop in separate thread. + * @param waitForStartEvent TODO + */ + void runMainLoop(String element, String padName, boolean separateThread, boolean waitForStartEvent); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java index 20312ebaada..4e6fc0a44ca 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java @@ -22,288 +22,288 @@ import java.util.Set; public class PipelineImpl implements Pipeline { - protected String id; - protected boolean verbose = System.getProperty("streamer.Pipeline.debug", "false").equals("true"); + protected String id; + protected boolean verbose = System.getProperty("streamer.Pipeline.debug", "false").equals("true"); - public PipelineImpl(String id) { - this.id = id; - elements = initElementMap(id); - } - - protected Map elements; - - protected HashMap initElementMap(String id) { - HashMap map = new HashMap(); - - map.put(IN, new BaseElement(id + "." + IN)); - map.put(OUT, new BaseElement(id + "." + OUT)); - return map; - } - - @Override - public Link getLink(String padName) { - Link link = elements.get(IN).getLink(padName); - if (link == null) - link = elements.get(OUT).getLink(padName); - return link; - } - - @Override - public Set getPads(Direction direction) { - switch (direction) { - case IN: - return elements.get(IN).getPads(direction); - - case OUT: - return elements.get(OUT).getPads(direction); - } - return null; - } - - @Override - public void validate() { - for (Element element : elements.values()) - element.validate(); - - // Check IN element - { - Element element = get(IN); - int outPadsNumber = element.getPads(Direction.OUT).size(); - int inPadsNumber = element.getPads(Direction.IN).size(); - if ((outPadsNumber | inPadsNumber) > 0 && (outPadsNumber == 0 || inPadsNumber == 0)) - throw new RuntimeException("[ " + this + "] Pads of input element of pipeline are not balanced. Element: " + element + ", output pads: " - + element.getPads(Direction.OUT).toString() + ", input pads: " + element.getPads(Direction.IN).toString() + "."); + public PipelineImpl(String id) { + this.id = id; + elements = initElementMap(id); } - // Check OUT element - { - Element element = get(OUT); - int outPadsNumber = element.getPads(Direction.OUT).size(); - int inPadsNumber = element.getPads(Direction.IN).size(); - if ((outPadsNumber | inPadsNumber) > 0 && (outPadsNumber == 0 || inPadsNumber == 0)) - throw new RuntimeException("[ " + this + "] Pads of output element of pipeline are not balanced. Element: " + element + ", output pads: " - + element.getPads(Direction.OUT).toString() + ", input pads: " + element.getPads(Direction.IN).toString() + "."); + protected Map elements; + + protected HashMap initElementMap(String id) { + HashMap map = new HashMap(); + + map.put(IN, new BaseElement(id + "." + IN)); + map.put(OUT, new BaseElement(id + "." + OUT)); + return map; } - } - - @Override - public void dropLink(String padName) { - if (elements.get(IN).getLink(padName) != null) - elements.get(IN).dropLink(padName); - - if (elements.get(OUT).getLink(padName) != null) - elements.get(OUT).dropLink(padName); - } - - @Override - public void dropLink(Link link) { - elements.get(IN).dropLink(link); - elements.get(OUT).dropLink(link); - } - - @Override - public void replaceLink(Link existingLink, Link newLink) { - elements.get(IN).replaceLink(existingLink, newLink); - elements.get(OUT).replaceLink(existingLink, newLink); - } - - @Override - public void setLink(String padName, Link link, Direction direction) { - // Wire links to internal elements instead - elements.get(direction.toString()).setLink(padName, link, direction); - } - - @Override - public void poll(boolean block) { - throw new RuntimeException("Not implemented."); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - get(IN).handleData(buf, link); - } - - @Override - public void handleEvent(Event event, Direction direction) { - switch (direction) { - case IN: - get(IN).handleEvent(event, direction); - break; - case OUT: - get(OUT).handleEvent(event, direction); - break; - } - } - - @Override - public void add(Element... elements) { - for (Element element : elements) { - String id = element.getId(); - - if (this.elements.containsKey(id)) - throw new RuntimeException("This pipeline already contains element with same ID. New element: " + element + ", existing element: " - + this.elements.get(id) + "."); - - this.elements.put(id, element); - } - } - - @Override - public void link(String... elementNames) { - - if (elementNames.length < 2) - throw new RuntimeException("At least two elements are necessary to create link between them."); - - // Parse array of element and pad names - - Element elements[] = new Element[elementNames.length]; - String inputPads[] = new String[elementNames.length]; - String outputPads[] = new String[elementNames.length]; - - int i = 0; - for (String elementName : elementNames) { - if (elementName.contains("< ")) { - inputPads[i] = elementName.substring(0, elementName.indexOf("< ")); - elementName = elementName.substring(elementName.indexOf("< ") + 2); - } else { - inputPads[i] = STDIN; - } - - if (elementName.contains(" >")) { - outputPads[i] = elementName.substring(elementName.indexOf(" >") + 2); - elementName = elementName.substring(0, elementName.indexOf(" >")); - } else { - outputPads[i] = STDOUT; - } - - elements[i] = get(elementName); - - if (elements[i] == null) - throw new RuntimeException("Cannot find element by name in this pipeline. Element name: \"" + elementName + "\" (" + elementNames[i] + "), pipeline: " - + this + "."); - - i++; + @Override + public Link getLink(String padName) { + Link link = elements.get(IN).getLink(padName); + if (link == null) + link = elements.get(OUT).getLink(padName); + return link; } - // Link elements - for (i = 0; i < elements.length - 1; i++) { - Element leftElement = elements[i]; - Element rightElement = elements[i + 1]; - String leftPad = outputPads[i]; - String rightPad = inputPads[i + 1]; + @Override + public Set getPads(Direction direction) { + switch (direction) { + case IN: + return elements.get(IN).getPads(direction); - String linkId = leftElement.getId() + " >" + leftPad + " | " + rightPad + "< " + rightElement.getId(); - - if (verbose) - System.out.println("[" + this + "] INFO: Linking: " + linkId + "."); - - Link link = new SyncLink(linkId); - leftElement.setLink(leftPad, link, Direction.OUT); - rightElement.setLink(rightPad, link, Direction.IN); - } - } - - @Override - public void addAndLink(Element... elements) { - add(elements); - link(elements); - } - - private void link(Element... elements) { - String elementNames[] = new String[elements.length]; - - int i = 0; - for (Element element : elements) { - elementNames[i++] = element.getId(); + case OUT: + return elements.get(OUT).getPads(direction); + } + return null; } - link(elementNames); - } + @Override + public void validate() { + for (Element element : elements.values()) + element.validate(); - @Override - public Element get(String elementName) { - return elements.get(elementName); - } + // Check IN element + { + Element element = get(IN); + int outPadsNumber = element.getPads(Direction.OUT).size(); + int inPadsNumber = element.getPads(Direction.IN).size(); + if ((outPadsNumber | inPadsNumber) > 0 && (outPadsNumber == 0 || inPadsNumber == 0)) + throw new RuntimeException("[ " + this + "] Pads of input element of pipeline are not balanced. Element: " + element + ", output pads: " + + element.getPads(Direction.OUT).toString() + ", input pads: " + element.getPads(Direction.IN).toString() + "."); + } - @Override - public Link getLink(String elementName, String padName) { - return elements.get(elementName).getLink(padName); + // Check OUT element + { + Element element = get(OUT); + int outPadsNumber = element.getPads(Direction.OUT).size(); + int inPadsNumber = element.getPads(Direction.IN).size(); + if ((outPadsNumber | inPadsNumber) > 0 && (outPadsNumber == 0 || inPadsNumber == 0)) + throw new RuntimeException("[ " + this + "] Pads of output element of pipeline are not balanced. Element: " + element + ", output pads: " + + element.getPads(Direction.OUT).toString() + ", input pads: " + element.getPads(Direction.IN).toString() + "."); + } - } - - @Override - public void setLink(String elementName, String padName, Link link, Direction direction) { - elements.get(elementName).setLink(padName, link, direction); - } - - @Override - public String getId() { - return id; - } - - @Override - public void runMainLoop(String elementName, String padName, boolean separateThread, boolean waitForStartEvent) { - validate(); - - Link link = getLink(elementName, padName); - - if (link == null) - throw new NullPointerException("Cannot find link. Element name: " + elementName + ", element: " + get(elementName) + ", pad: " + padName + "."); - - if (!waitForStartEvent) - link.sendEvent(Event.STREAM_START, Direction.OUT); - - if (separateThread) { - Thread thread = new Thread(link); - thread.setDaemon(true); - thread.start(); - } else { - link.run(); } - } - @Override - public String toString() { - return "Pipeline(" + id + ")"; - } + @Override + public void dropLink(String padName) { + if (elements.get(IN).getLink(padName) != null) + elements.get(IN).dropLink(padName); - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - // System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + if (elements.get(OUT).getLink(padName) != null) + elements.get(OUT).dropLink(padName); + } - Pipeline pipeline = new PipelineImpl("main"); + @Override + public void dropLink(Link link) { + elements.get(IN).dropLink(link); + elements.get(OUT).dropLink(link); + } - // Create elements - pipeline.add(new FakeSource("source") { - { - this.incommingBufLength = 3; - this.numBuffers = 10; - this.delay = 100; - } - }); - pipeline.add(new BaseElement("tee")); - pipeline.add(new FakeSink("sink") { - { - this.verbose = true; - } - }); - pipeline.add(new FakeSink("sink2") { - { - this.verbose = true; - } - }); + @Override + public void replaceLink(Link existingLink, Link newLink) { + elements.get(IN).replaceLink(existingLink, newLink); + elements.get(OUT).replaceLink(existingLink, newLink); + } - // Link elements - pipeline.link("source", "tee", "sink"); - pipeline.link("tee >out2", "sink2"); + @Override + public void setLink(String padName, Link link, Direction direction) { + // Wire links to internal elements instead + elements.get(direction.toString()).setLink(padName, link, direction); + } - // Run main loop - pipeline.runMainLoop("source", STDOUT, false, false); - } + @Override + public void poll(boolean block) { + throw new RuntimeException("Not implemented."); + } + + @Override + public void handleData(ByteBuffer buf, Link link) { + get(IN).handleData(buf, link); + } + + @Override + public void handleEvent(Event event, Direction direction) { + switch (direction) { + case IN: + get(IN).handleEvent(event, direction); + break; + case OUT: + get(OUT).handleEvent(event, direction); + break; + } + } + + @Override + public void add(Element... elements) { + for (Element element : elements) { + String id = element.getId(); + + if (this.elements.containsKey(id)) + throw new RuntimeException("This pipeline already contains element with same ID. New element: " + element + ", existing element: " + + this.elements.get(id) + "."); + + this.elements.put(id, element); + } + } + + @Override + public void link(String... elementNames) { + + if (elementNames.length < 2) + throw new RuntimeException("At least two elements are necessary to create link between them."); + + // Parse array of element and pad names + + Element elements[] = new Element[elementNames.length]; + String inputPads[] = new String[elementNames.length]; + String outputPads[] = new String[elementNames.length]; + + int i = 0; + for (String elementName : elementNames) { + if (elementName.contains("< ")) { + inputPads[i] = elementName.substring(0, elementName.indexOf("< ")); + elementName = elementName.substring(elementName.indexOf("< ") + 2); + } else { + inputPads[i] = STDIN; + } + + if (elementName.contains(" >")) { + outputPads[i] = elementName.substring(elementName.indexOf(" >") + 2); + elementName = elementName.substring(0, elementName.indexOf(" >")); + } else { + outputPads[i] = STDOUT; + } + + elements[i] = get(elementName); + + if (elements[i] == null) + throw new RuntimeException("Cannot find element by name in this pipeline. Element name: \"" + elementName + "\" (" + elementNames[i] + "), pipeline: " + + this + "."); + + i++; + } + + // Link elements + for (i = 0; i < elements.length - 1; i++) { + Element leftElement = elements[i]; + Element rightElement = elements[i + 1]; + String leftPad = outputPads[i]; + String rightPad = inputPads[i + 1]; + + String linkId = leftElement.getId() + " >" + leftPad + " | " + rightPad + "< " + rightElement.getId(); + + if (verbose) + System.out.println("[" + this + "] INFO: Linking: " + linkId + "."); + + Link link = new SyncLink(linkId); + leftElement.setLink(leftPad, link, Direction.OUT); + rightElement.setLink(rightPad, link, Direction.IN); + } + } + + @Override + public void addAndLink(Element... elements) { + add(elements); + link(elements); + } + + private void link(Element... elements) { + String elementNames[] = new String[elements.length]; + + int i = 0; + for (Element element : elements) { + elementNames[i++] = element.getId(); + } + + link(elementNames); + } + + @Override + public Element get(String elementName) { + return elements.get(elementName); + } + + @Override + public Link getLink(String elementName, String padName) { + return elements.get(elementName).getLink(padName); + + } + + @Override + public void setLink(String elementName, String padName, Link link, Direction direction) { + elements.get(elementName).setLink(padName, link, direction); + } + + @Override + public String getId() { + return id; + } + + @Override + public void runMainLoop(String elementName, String padName, boolean separateThread, boolean waitForStartEvent) { + validate(); + + Link link = getLink(elementName, padName); + + if (link == null) + throw new NullPointerException("Cannot find link. Element name: " + elementName + ", element: " + get(elementName) + ", pad: " + padName + "."); + + if (!waitForStartEvent) + link.sendEvent(Event.STREAM_START, Direction.OUT); + + if (separateThread) { + Thread thread = new Thread(link); + thread.setDaemon(true); + thread.start(); + } else { + link.run(); + } + } + + @Override + public String toString() { + return "Pipeline(" + id + ")"; + } + + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + // System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + + Pipeline pipeline = new PipelineImpl("main"); + + // Create elements + pipeline.add(new FakeSource("source") { + { + this.incommingBufLength = 3; + this.numBuffers = 10; + this.delay = 100; + } + }); + pipeline.add(new BaseElement("tee")); + pipeline.add(new FakeSink("sink") { + { + this.verbose = true; + } + }); + pipeline.add(new FakeSink("sink2") { + { + this.verbose = true; + } + }); + + // Link elements + pipeline.link("source", "tee", "sink"); + pipeline.link("tee >out2", "sink2"); + + // Run main loop + pipeline.runMainLoop("source", STDOUT, false, false); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java index 7a1734053d9..23c57e0add8 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java @@ -24,113 +24,113 @@ import java.util.concurrent.TimeUnit; */ public class Queue extends BaseElement { - protected LinkedBlockingQueue queue = new LinkedBlockingQueue(); + protected LinkedBlockingQueue queue = new LinkedBlockingQueue(); - public Queue(String id) { - super(id); - } - - @SuppressWarnings("incomplete-switch") - @Override - public void poll(boolean block) { - try { - ByteBuffer buf = null; - if (block) { - buf = queue.take(); - } else { - buf = queue.poll(100, TimeUnit.MILLISECONDS); - } - - if (buf != null) - pushDataToAllOuts(buf); - - } catch (Exception e) { - sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); - closeQueue(); + public Queue(String id) { + super(id); } - } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @SuppressWarnings("incomplete-switch") + @Override + public void poll(boolean block) { + try { + ByteBuffer buf = null; + if (block) { + buf = queue.take(); + } else { + buf = queue.poll(100, TimeUnit.MILLISECONDS); + } - // Put incoming data into queue - try { - queue.put(buf); - } catch (Exception e) { - sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN); - closeQueue(); + if (buf != null) + pushDataToAllOuts(buf); + + } catch (Exception e) { + sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT); + closeQueue(); + } } - } - @Override - public void handleEvent(Event event, Direction direction) { - switch (event) { - case LINK_SWITCH_TO_PULL_MODE: - // Do not propagate this event, because this element is boundary between - // threads - break; - default: - super.handleEvent(event, direction); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + // Put incoming data into queue + try { + queue.put(buf); + } catch (Exception e) { + sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN); + closeQueue(); + } } - } - @Override - protected void onClose() { - super.onClose(); - closeQueue(); - } + @Override + public void handleEvent(Event event, Direction direction) { + switch (event) { + case LINK_SWITCH_TO_PULL_MODE: + // Do not propagate this event, because this element is boundary between + // threads + break; + default: + super.handleEvent(event, direction); + } + } - private void closeQueue() { - queue.clear(); - queue.add(null); - // Drop queue to indicate that upstream is closed. - // May produce NPE in poll(). - queue = null; - } + @Override + protected void onClose() { + super.onClose(); + closeQueue(); + } - @Override - public String toString() { - return "Queue(" + id + ")"; - } + private void closeQueue() { + queue.clear(); + queue.add(null); + // Drop queue to indicate that upstream is closed. + // May produce NPE in poll(). + queue = null; + } - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); + @Override + public String toString() { + return "Queue(" + id + ")"; + } - Element source1 = new FakeSource("source1") { - { - this.delay = 100; - this.numBuffers = 10; - this.incommingBufLength = 10; - } - }; + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); - Element source2 = new FakeSource("source2") { - { - this.delay = 100; - this.numBuffers = 10; - this.incommingBufLength = 10; - } - }; + Element source1 = new FakeSource("source1") { + { + this.delay = 100; + this.numBuffers = 10; + this.incommingBufLength = 10; + } + }; - Pipeline pipeline = new PipelineImpl("test"); - pipeline.add(source1); - pipeline.add(source2); - pipeline.add(new Queue("queue")); - pipeline.add(new FakeSink("sink")); + Element source2 = new FakeSource("source2") { + { + this.delay = 100; + this.numBuffers = 10; + this.incommingBufLength = 10; + } + }; - // Main flow - pipeline.link("source1", "in1< queue"); - pipeline.link("source2", "in2< queue"); - pipeline.link("queue", "sink"); + Pipeline pipeline = new PipelineImpl("test"); + pipeline.add(source1); + pipeline.add(source2); + pipeline.add(new Queue("queue")); + pipeline.add(new FakeSink("sink")); - new Thread(pipeline.getLink("source1", STDOUT)).start(); - new Thread(pipeline.getLink("source2", STDOUT)).start(); - pipeline.getLink("sink", STDIN).run(); - } + // Main flow + pipeline.link("source1", "in1< queue"); + pipeline.link("source2", "in2< queue"); + pipeline.link("queue", "sink"); + + new Thread(pipeline.getLink("source1", STDOUT)).start(); + new Thread(pipeline.getLink("source2", STDOUT)).start(); + pipeline.getLink("sink", STDIN).run(); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java index 25dffb75cd1..19ac0629f45 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java @@ -38,202 +38,202 @@ import rdpclient.TrustAllX509TrustManager; public class SocketWrapper extends PipelineImpl { - protected InputStreamSource source; - protected OutputStreamSink sink; - protected Socket socket; - protected InetSocketAddress address; + protected InputStreamSource source; + protected OutputStreamSink sink; + protected Socket socket; + protected InetSocketAddress address; - protected SSLSocket sslSocket; + protected SSLSocket sslSocket; - //protected String SSL_VERSION_TO_USE = "TLSv1.2"; - /*DEBUG*/protected String SSL_VERSION_TO_USE = "TLSv1"; + //protected String SSL_VERSION_TO_USE = "TLSv1.2"; + /*DEBUG*/protected String SSL_VERSION_TO_USE = "TLSv1"; - public SocketWrapper(String id) { - super(id); - } - - @Override - protected HashMap initElementMap(String id) { - HashMap map = new HashMap(); - - source = new InputStreamSource(id + "." + OUT, this); - sink = new OutputStreamSink(id + "." + IN, this); - - // Pass requests to read data to socket input stream - map.put(OUT, source); - - // All incoming data, which is sent to this socket wrapper, will be sent - // to socket remote - map.put(IN, sink); - - return map; - } - - /** - * Connect this socket wrapper to remote server and start main loop on - * IputStreamSource stdout link, to watch for incoming data, and - * OutputStreamSink stdin link, to pull for outgoing data. - * - * @param address - * @throws IOException - */ - public void connect(InetSocketAddress address) throws IOException { - this.address = address; - - // Connect socket to server - socket = SocketFactory.getDefault().createSocket(); - try { - socket.connect(address); - - InputStream is = socket.getInputStream(); - source.setInputStream(is); - - OutputStream os = socket.getOutputStream(); - sink.setOutputStream(os); - - // Start polling for data to send to remote sever - runMainLoop(IN, STDIN, true, true); - - // Push incoming data from server to handlers - runMainLoop(OUT, STDOUT, false, false); - - } finally { - socket.close(); - } - } - - @Override - public void handleEvent(Event event, Direction direction) { - switch (event) { - case SOCKET_UPGRADE_TO_SSL: - upgradeToSsl(); - break; - default: - super.handleEvent(event, direction); - break; - } - } - - public void upgradeToSsl() { - - if (sslSocket != null) - // Already upgraded - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Upgrading socket to SSL."); - - try { - // Use most secure implementation of SSL available now. - // JVM will try to negotiate TLS1.2, then will fallback to TLS1.0, if - // TLS1.2 is not supported. - SSLContext sslContext = SSLContext.getInstance(SSL_VERSION_TO_USE); - - // Trust all certificates (FIXME: insecure) - sslContext.init(null, new TrustManager[] { new TrustAllX509TrustManager() }, null); - - SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); - sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true); - sslSocket.startHandshake(); - - InputStream sis = sslSocket.getInputStream(); - source.setInputStream(sis); - - OutputStream sos = sslSocket.getOutputStream(); - sink.setOutputStream(sos); - - } catch (Exception e) { - throw new RuntimeException("Cannot upgrade socket to SSL: " + e.getMessage(), e); + public SocketWrapper(String id) { + super(id); } - } + @Override + protected HashMap initElementMap(String id) { + HashMap map = new HashMap(); - @Override - public void validate() { - for (Element element : elements.values()) - element.validate(); + source = new InputStreamSource(id + "." + OUT, this); + sink = new OutputStreamSink(id + "." + IN, this); - if (get(IN).getPads(Direction.IN).size() == 0) - throw new RuntimeException("[ " + this + "] Input of socket is not connected."); + // Pass requests to read data to socket input stream + map.put(OUT, source); - if (get(OUT).getPads(Direction.OUT).size() == 0) - throw new RuntimeException("[ " + this + "] Output of socket is not connected."); + // All incoming data, which is sent to this socket wrapper, will be sent + // to socket remote + map.put(IN, sink); - } - - public void shutdown() { - try { - handleEvent(Event.STREAM_CLOSE, Direction.IN); - } catch (Exception e) { + return map; } - try { - handleEvent(Event.STREAM_CLOSE, Direction.OUT); - } catch (Exception e) { - } - try { - if (sslSocket != null) - sslSocket.close(); - } catch (Exception e) { - } - try { - socket.close(); - } catch (Exception e) { - } - } - @Override - public String toString() { - return "SocketWrapper(" + id + ")"; - } + /** + * Connect this socket wrapper to remote server and start main loop on + * IputStreamSource stdout link, to watch for incoming data, and + * OutputStreamSink stdin link, to pull for outgoing data. + * + * @param address + * @throws IOException + */ + public void connect(InetSocketAddress address) throws IOException { + this.address = address; - /** - * Example. - */ - public static void main(String args[]) { - try { - System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - System.setProperty("rdpclient.MockServer.debug", "true"); + // Connect socket to server + socket = SocketFactory.getDefault().createSocket(); + try { + socket.connect(address); - Pipeline pipeline = new PipelineImpl("echo client"); + InputStream is = socket.getInputStream(); + source.setInputStream(is); - SocketWrapper socketWrapper = new SocketWrapper("socket"); + OutputStream os = socket.getOutputStream(); + sink.setOutputStream(os); - pipeline.add(socketWrapper); - pipeline.add(new BaseElement("echo")); + // Start polling for data to send to remote sever + runMainLoop(IN, STDIN, true, true); - pipeline.link("socket", "echo", "socket"); + // Push incoming data from server to handlers + runMainLoop(OUT, STDOUT, false, false); - final byte[] mockData = new byte[] { 0x01, 0x02, 0x03 }; - MockServer server = new MockServer(new Packet[] { new Packet("Server hello") { - { - type = SERVER; - data = mockData; + } finally { + socket.close(); } - }, new Packet("Client hello") { - { - type = CLIENT; - data = mockData; - } - }, new Packet("Server hello") { - { - type = SERVER; - data = mockData; - } - }, new Packet("Client hello") { - { - type = CLIENT; - data = mockData; - } - } }); - server.start(); - InetSocketAddress address = server.getAddress(); - - socketWrapper.connect(address); - - } catch (IOException e) { - e.printStackTrace(System.err); } - } + @Override + public void handleEvent(Event event, Direction direction) { + switch (event) { + case SOCKET_UPGRADE_TO_SSL: + upgradeToSsl(); + break; + default: + super.handleEvent(event, direction); + break; + } + } + + public void upgradeToSsl() { + + if (sslSocket != null) + // Already upgraded + return; + + if (verbose) + System.out.println("[" + this + "] INFO: Upgrading socket to SSL."); + + try { + // Use most secure implementation of SSL available now. + // JVM will try to negotiate TLS1.2, then will fallback to TLS1.0, if + // TLS1.2 is not supported. + SSLContext sslContext = SSLContext.getInstance(SSL_VERSION_TO_USE); + + // Trust all certificates (FIXME: insecure) + sslContext.init(null, new TrustManager[] {new TrustAllX509TrustManager()}, null); + + SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); + sslSocket = (SSLSocket)sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true); + sslSocket.startHandshake(); + + InputStream sis = sslSocket.getInputStream(); + source.setInputStream(sis); + + OutputStream sos = sslSocket.getOutputStream(); + sink.setOutputStream(sos); + + } catch (Exception e) { + throw new RuntimeException("Cannot upgrade socket to SSL: " + e.getMessage(), e); + } + + } + + @Override + public void validate() { + for (Element element : elements.values()) + element.validate(); + + if (get(IN).getPads(Direction.IN).size() == 0) + throw new RuntimeException("[ " + this + "] Input of socket is not connected."); + + if (get(OUT).getPads(Direction.OUT).size() == 0) + throw new RuntimeException("[ " + this + "] Output of socket is not connected."); + + } + + public void shutdown() { + try { + handleEvent(Event.STREAM_CLOSE, Direction.IN); + } catch (Exception e) { + } + try { + handleEvent(Event.STREAM_CLOSE, Direction.OUT); + } catch (Exception e) { + } + try { + if (sslSocket != null) + sslSocket.close(); + } catch (Exception e) { + } + try { + socket.close(); + } catch (Exception e) { + } + } + + @Override + public String toString() { + return "SocketWrapper(" + id + ")"; + } + + /** + * Example. + */ + public static void main(String args[]) { + try { + System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + System.setProperty("rdpclient.MockServer.debug", "true"); + + Pipeline pipeline = new PipelineImpl("echo client"); + + SocketWrapper socketWrapper = new SocketWrapper("socket"); + + pipeline.add(socketWrapper); + pipeline.add(new BaseElement("echo")); + + pipeline.link("socket", "echo", "socket"); + + final byte[] mockData = new byte[] {0x01, 0x02, 0x03}; + MockServer server = new MockServer(new Packet[] {new Packet("Server hello") { + { + type = SERVER; + data = mockData; + } + }, new Packet("Client hello") { + { + type = CLIENT; + data = mockData; + } + }, new Packet("Server hello") { + { + type = SERVER; + data = mockData; + } + }, new Packet("Client hello") { + { + type = CLIENT; + data = mockData; + } + }}); + server.start(); + InetSocketAddress address = server.getAddress(); + + socketWrapper.connect(address); + + } catch (IOException e) { + e.printStackTrace(System.err); + } + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java index 32e0fe0716c..2bd4919e5f4 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java @@ -22,381 +22,380 @@ package streamer; */ public class SyncLink implements Link { - /** - * When null packet is pulled from source element, then make slight delay to - * avoid consuming of 100% of CPU in main loop in cases when link is pauses or - * source element cannot produce data right now. - */ - protected static final long STANDARD_DELAY_FOR_EMPTY_PACKET = 10; // Milliseconds + /** + * When null packet is pulled from source element, then make slight delay to + * avoid consuming of 100% of CPU in main loop in cases when link is pauses or + * source element cannot produce data right now. + */ + protected static final long STANDARD_DELAY_FOR_EMPTY_PACKET = 10; // Milliseconds - /** - * Delay for null packets in poll method when blocking is requested, in - * milliseconds. - */ - protected long delay = STANDARD_DELAY_FOR_EMPTY_PACKET; + /** + * Delay for null packets in poll method when blocking is requested, in + * milliseconds. + */ + protected long delay = STANDARD_DELAY_FOR_EMPTY_PACKET; - /** - * Set to true to print debugging messages. - */ - protected boolean verbose = System.getProperty("streamer.Link.debug", "false").equals("true");; + /** + * Set to true to print debugging messages. + */ + protected boolean verbose = System.getProperty("streamer.Link.debug", "false").equals("true");; - /** - * ID of this link. - */ - protected String id = null; + /** + * ID of this link. + */ + protected String id = null; - /** - * Buffer with data to hold because link is paused, or data is pushed back. - */ - protected ByteBuffer cacheBuffer = null; + /** + * Buffer with data to hold because link is paused, or data is pushed back. + */ + protected ByteBuffer cacheBuffer = null; - /** - * Size of expected packet. Data must be hold in link until full packet will - * be read. - */ - protected int expectedPacketSize = 0; + /** + * Size of expected packet. Data must be hold in link until full packet will + * be read. + */ + protected int expectedPacketSize = 0; - /** - * Number of packets and packet header transferred to element. - */ - protected int packetNumber = 0; + /** + * Number of packets and packet header transferred to element. + */ + protected int packetNumber = 0; - /** - * Set to true to hold all data in link until it will be set to false again. - */ - protected boolean paused = false; + /** + * Set to true to hold all data in link until it will be set to false again. + */ + protected boolean paused = false; - /** - * Element to pull data from, when in pull mode. - */ - protected Element source = null; + /** + * Element to pull data from, when in pull mode. + */ + protected Element source = null; - /** - * Element to send data to in both pull and push modes. - */ - protected Element sink = null; + /** + * Element to send data to in both pull and push modes. + */ + protected Element sink = null; - /** - * When in loop, indicates that loop must be stopped. - * - * @see run() - */ - private boolean shutdown = false; + /** + * When in loop, indicates that loop must be stopped. + * + * @see run() + */ + private boolean shutdown = false; - /** - * Indicates that event STREAM_START is passed over this link, so main loop - * can be started to pull data from source element. - */ - protected boolean start; + /** + * Indicates that event STREAM_START is passed over this link, so main loop + * can be started to pull data from source element. + */ + protected boolean start; - /** - * Operate in pull mode. - */ - protected boolean pullMode; + /** + * Operate in pull mode. + */ + protected boolean pullMode; - public SyncLink() { - } - - public SyncLink(String id) { - this.id = id; - } - - @Override - public void pushBack(ByteBuffer buf) { - if (verbose) - System.out.println("[" + this + "] INFO: Buffer pushed back: " + buf + "."); - - if (cacheBuffer != null) { - ByteBuffer tmp = cacheBuffer.join(buf); - cacheBuffer.unref(); - cacheBuffer = tmp; - } else { - cacheBuffer = buf; - cacheBuffer.ref(); + public SyncLink() { } - resetCursor(); - } - - private void resetCursor() { - // Reset cursor - cacheBuffer.cursor = 0; - } - - @Override - public void pushBack(ByteBuffer buf, int lengthOfFullPacket) { - pushBack(buf); - expectedPacketSize = lengthOfFullPacket; - } - - @Override - public String toString() { - return "SyncLink(" + ((id != null) ? id + ", " : "") + source + ":" + sink + ")"; - } - - /** - * Push data to sink. Call with null to push cached data. - */ - @Override - public void sendData(ByteBuffer buf) { - if (!paused && pullMode) - throw new RuntimeException("[" + this + "] ERROR: link is not in push mode."); - - if (verbose) - System.out.println("[" + this + "] INFO: Incoming buffer: " + buf + "."); - - if (buf == null && cacheBuffer == null) - return; - - if (cacheBuffer != null && buf != null) { - // Join old data with fresh data - buf = cacheBuffer.join(buf); - cacheBuffer.unref(); - cacheBuffer = buf; + public SyncLink(String id) { + this.id = id; } - // Store buffer in cache field to simplify following loop - if (buf != null) - cacheBuffer = buf; - - // When data pushed back and length of data is less than length of full - // packet, then feed data to sink element immediately - while (cacheBuffer != null) { - if (paused) { + @Override + public void pushBack(ByteBuffer buf) { if (verbose) - System.out.println("[" + this + "] INFO: Transfer is paused. Data in cache buffer: " + cacheBuffer + "."); + System.out.println("[" + this + "] INFO: Buffer pushed back: " + buf + "."); - // Wait until rest of packet will be read - return; - } - - if (expectedPacketSize > 0 && cacheBuffer.length < expectedPacketSize) { - if (verbose) - System.out.println("[" + this + "] INFO: Transfer is suspended because available data is less than expected packet size. Expected packet size: " - + expectedPacketSize + ", data in cache buffer: " + cacheBuffer + "."); - - // Wait until rest of packet will be read - return; - } - - // Full packet or packet header is read, feed it to element - buf = cacheBuffer; - cacheBuffer = null; - expectedPacketSize = 0; - packetNumber++; - - if (sink == null) - throw new NullPointerException("[" + this + "] ERROR: Cannot send data to sink: sink is null. Data: " + buf + "."); - - sink.handleData(buf, this); - // cacheBuffer and expectedPacketSize can be changed at this time - } - - } - - @SuppressWarnings("incomplete-switch") - @Override - public void sendEvent(Event event, Direction direction) { - - if (verbose) - System.out.println("[" + this + "] INFO: Event " + event + " is received."); - - // Shutdown main loop (if any) when STREAM_CLOSE event is received. - switch (event) { - case STREAM_START: { - if (!start) - start = true; - else - // Event already sent trough this link - return; - break; - } - case STREAM_CLOSE: { - if (!shutdown) - shutdown = true; - else - // Event already sent trough this link - return; - break; - } - case LINK_SWITCH_TO_PULL_MODE: { - setPullMode(); - break; - } - - } - - switch (direction) { - case IN: - source.handleEvent(event, direction); - break; - case OUT: - sink.handleEvent(event, direction); - break; - } - } - - @Override - public ByteBuffer pull(boolean block) { - if (!pullMode) - throw new RuntimeException("This link is not in pull mode."); - - if (paused) { - if (verbose) - System.out.println("[" + this + "] INFO: Cannot pull, link is paused."); - - // Make slight delay in such case, to avoid consuming 100% of CPU - if (block) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { + if (cacheBuffer != null) { + ByteBuffer tmp = cacheBuffer.join(buf); + cacheBuffer.unref(); + cacheBuffer = tmp; + } else { + cacheBuffer = buf; + cacheBuffer.ref(); } - } - return null; + resetCursor(); } - // If data in cache can be sent immediately, - // then return it instead of asking for more data from source - if (cacheBuffer != null && (expectedPacketSize == 0 || (expectedPacketSize > 0 && cacheBuffer.length >= expectedPacketSize))) { - if (verbose) - System.out.println("[" + this + "] INFO: Data pulled from cache buffer: " + cacheBuffer + "."); - - ByteBuffer tmp = cacheBuffer; - cacheBuffer = null; - return tmp; + private void resetCursor() { + // Reset cursor + cacheBuffer.cursor = 0; } - // Pause this link, so incoming data will not be sent to sink - // immediately, then ask source element for more data - pause(); - source.poll(block); - resume(); - - // Can return something only when data was stored in buffer - if (cacheBuffer != null && (expectedPacketSize == 0 || (expectedPacketSize > 0 && cacheBuffer.length >= expectedPacketSize))) { - if (verbose) - System.out.println("[" + this + "] INFO: Data pulled from source: " + cacheBuffer + "."); - - ByteBuffer tmp = cacheBuffer; - cacheBuffer = null; - return tmp; - } else { - return null; - } - } - - @Override - public Element setSink(Element sink) { - if (sink != null && this.sink != null) - throw new RuntimeException("This link sink element is already set. Link: " + this + ", new sink: " + sink + ", existing sink: " + this.sink + "."); - - if (sink == null && cacheBuffer != null) - throw new RuntimeException("Cannot drop link: cache is not empty. Link: " + this + ", cache: " + cacheBuffer); - - this.sink = sink; - - return sink; - } - - @Override - public Element setSource(Element source) { - if (this.source != null && source != null) - throw new RuntimeException("This link source element is already set. Link: " + this + ", new source: " + source + ", existing source: " + this.source - + "."); - - this.source = source; - return source; - } - - @Override - public Element getSource() { - return source; - } - - @Override - public Element getSink() { - return sink; - } - - @Override - public void pause() { - if (paused) - throw new RuntimeException("Link is already paused."); - - paused = true; - - } - - @Override - public void resume() { - paused = false; - } - - /** - * Run pull loop to actively pull data from source and push it to sink. It - * must be only one pull loop per thread. - * - * Pull loop will start after event STREAM_START. This link and source element - * incomming links will be switched to pull mode before pull loop will be - * started using event LINK_SWITCH_TO_PULL_MODE. - */ - @Override - public void run() { - // Wait until even STREAM_START will arrive - while (!start) { - delay(); + @Override + public void pushBack(ByteBuffer buf, int lengthOfFullPacket) { + pushBack(buf); + expectedPacketSize = lengthOfFullPacket; } - sendEvent(Event.LINK_SWITCH_TO_PULL_MODE, Direction.IN); - - if (verbose) - System.out.println("[" + this + "] INFO: Starting pull loop."); - - // Pull source in loop - while (!shutdown) { - // Pull data from source element and send it to sink element - ByteBuffer data = pull(true); - if (data != null) - sink.handleData(data, this); - - if (!shutdown && data == null) { - // Make slight delay to avoid consuming of 100% of CPU - delay(); - } + @Override + public String toString() { + return "SyncLink(" + ((id != null) ? id + ", " : "") + source + ":" + sink + ")"; } - if (verbose) - System.out.println("[" + this + "] INFO: Pull loop finished."); + /** + * Push data to sink. Call with null to push cached data. + */ + @Override + public void sendData(ByteBuffer buf) { + if (!paused && pullMode) + throw new RuntimeException("[" + this + "] ERROR: link is not in push mode."); - } + if (verbose) + System.out.println("[" + this + "] INFO: Incoming buffer: " + buf + "."); + + if (buf == null && cacheBuffer == null) + return; + + if (cacheBuffer != null && buf != null) { + // Join old data with fresh data + buf = cacheBuffer.join(buf); + cacheBuffer.unref(); + cacheBuffer = buf; + } + + // Store buffer in cache field to simplify following loop + if (buf != null) + cacheBuffer = buf; + + // When data pushed back and length of data is less than length of full + // packet, then feed data to sink element immediately + while (cacheBuffer != null) { + if (paused) { + if (verbose) + System.out.println("[" + this + "] INFO: Transfer is paused. Data in cache buffer: " + cacheBuffer + "."); + + // Wait until rest of packet will be read + return; + } + + if (expectedPacketSize > 0 && cacheBuffer.length < expectedPacketSize) { + if (verbose) + System.out.println("[" + this + "] INFO: Transfer is suspended because available data is less than expected packet size. Expected packet size: " + + expectedPacketSize + ", data in cache buffer: " + cacheBuffer + "."); + + // Wait until rest of packet will be read + return; + } + + // Full packet or packet header is read, feed it to element + buf = cacheBuffer; + cacheBuffer = null; + expectedPacketSize = 0; + packetNumber++; + + if (sink == null) + throw new NullPointerException("[" + this + "] ERROR: Cannot send data to sink: sink is null. Data: " + buf + "."); + + sink.handleData(buf, this); + // cacheBuffer and expectedPacketSize can be changed at this time + } - protected void delay() { - try { - Thread.sleep(delay); - } catch (InterruptedException e) { - e.printStackTrace(System.err); - throw new RuntimeException("Interrupted in main loop.", e); } - } - @Override - public void setPullMode() { - if (verbose) - System.out.println("[" + this + "] INFO: Switching to PULL mode."); + @SuppressWarnings("incomplete-switch") + @Override + public void sendEvent(Event event, Direction direction) { - this.pullMode = true; - } + if (verbose) + System.out.println("[" + this + "] INFO: Event " + event + " is received."); - @Override - public void drop() { - if (pullMode) - throw new RuntimeException("Cannot drop link in pull mode."); + // Shutdown main loop (if any) when STREAM_CLOSE event is received. + switch (event) { + case STREAM_START: { + if (!start) + start = true; + else + // Event already sent trough this link + return; + break; + } + case STREAM_CLOSE: { + if (!shutdown) + shutdown = true; + else + // Event already sent trough this link + return; + break; + } + case LINK_SWITCH_TO_PULL_MODE: { + setPullMode(); + break; + } - if (cacheBuffer != null) - throw new RuntimeException("Cannot drop link when cache conatains data: " + cacheBuffer + "."); + } - source.dropLink(this); - sink.dropLink(this); - } + switch (direction) { + case IN: + source.handleEvent(event, direction); + break; + case OUT: + sink.handleEvent(event, direction); + break; + } + } + + @Override + public ByteBuffer pull(boolean block) { + if (!pullMode) + throw new RuntimeException("This link is not in pull mode."); + + if (paused) { + if (verbose) + System.out.println("[" + this + "] INFO: Cannot pull, link is paused."); + + // Make slight delay in such case, to avoid consuming 100% of CPU + if (block) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + + return null; + } + + // If data in cache can be sent immediately, + // then return it instead of asking for more data from source + if (cacheBuffer != null && (expectedPacketSize == 0 || (expectedPacketSize > 0 && cacheBuffer.length >= expectedPacketSize))) { + if (verbose) + System.out.println("[" + this + "] INFO: Data pulled from cache buffer: " + cacheBuffer + "."); + + ByteBuffer tmp = cacheBuffer; + cacheBuffer = null; + return tmp; + } + + // Pause this link, so incoming data will not be sent to sink + // immediately, then ask source element for more data + pause(); + source.poll(block); + resume(); + + // Can return something only when data was stored in buffer + if (cacheBuffer != null && (expectedPacketSize == 0 || (expectedPacketSize > 0 && cacheBuffer.length >= expectedPacketSize))) { + if (verbose) + System.out.println("[" + this + "] INFO: Data pulled from source: " + cacheBuffer + "."); + + ByteBuffer tmp = cacheBuffer; + cacheBuffer = null; + return tmp; + } else { + return null; + } + } + + @Override + public Element setSink(Element sink) { + if (sink != null && this.sink != null) + throw new RuntimeException("This link sink element is already set. Link: " + this + ", new sink: " + sink + ", existing sink: " + this.sink + "."); + + if (sink == null && cacheBuffer != null) + throw new RuntimeException("Cannot drop link: cache is not empty. Link: " + this + ", cache: " + cacheBuffer); + + this.sink = sink; + + return sink; + } + + @Override + public Element setSource(Element source) { + if (this.source != null && source != null) + throw new RuntimeException("This link source element is already set. Link: " + this + ", new source: " + source + ", existing source: " + this.source + "."); + + this.source = source; + return source; + } + + @Override + public Element getSource() { + return source; + } + + @Override + public Element getSink() { + return sink; + } + + @Override + public void pause() { + if (paused) + throw new RuntimeException("Link is already paused."); + + paused = true; + + } + + @Override + public void resume() { + paused = false; + } + + /** + * Run pull loop to actively pull data from source and push it to sink. It + * must be only one pull loop per thread. + * + * Pull loop will start after event STREAM_START. This link and source element + * incomming links will be switched to pull mode before pull loop will be + * started using event LINK_SWITCH_TO_PULL_MODE. + */ + @Override + public void run() { + // Wait until even STREAM_START will arrive + while (!start) { + delay(); + } + + sendEvent(Event.LINK_SWITCH_TO_PULL_MODE, Direction.IN); + + if (verbose) + System.out.println("[" + this + "] INFO: Starting pull loop."); + + // Pull source in loop + while (!shutdown) { + // Pull data from source element and send it to sink element + ByteBuffer data = pull(true); + if (data != null) + sink.handleData(data, this); + + if (!shutdown && data == null) { + // Make slight delay to avoid consuming of 100% of CPU + delay(); + } + } + + if (verbose) + System.out.println("[" + this + "] INFO: Pull loop finished."); + + } + + protected void delay() { + try { + Thread.sleep(delay); + } catch (InterruptedException e) { + e.printStackTrace(System.err); + throw new RuntimeException("Interrupted in main loop.", e); + } + } + + @Override + public void setPullMode() { + if (verbose) + System.out.println("[" + this + "] INFO: Switching to PULL mode."); + + this.pullMode = true; + } + + @Override + public void drop() { + if (pullMode) + throw new RuntimeException("Cannot drop link in pull mode."); + + if (cacheBuffer != null) + throw new RuntimeException("Cannot drop link when cache conatains data: " + cacheBuffer + "."); + + source.dropLink(this); + sink.dropLink(this); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtKeyboardEventToVncAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtKeyboardEventToVncAdapter.java index 5537d24d29b..a804e262e59 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtKeyboardEventToVncAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtKeyboardEventToVncAdapter.java @@ -21,349 +21,348 @@ import java.awt.event.KeyEvent; import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; - import common.KeyOrder; public class AwtKeyboardEventToVncAdapter extends BaseElement { - protected boolean sh = false; - protected boolean caps = false; - protected boolean num = false; + protected boolean sh = false; + protected boolean caps = false; + protected boolean num = false; - public AwtKeyboardEventToVncAdapter(String id) { - super(id); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - KeyOrder order = (KeyOrder) buf.getOrder(); - buf.unref(); - - ByteBuffer outBuf = new ByteBuffer(8); - outBuf.writeByte(RfbConstants.CLIENT_KEYBOARD_EVENT); - - outBuf.writeByte((order.pressed) ? RfbConstants.KEY_DOWN : RfbConstants.KEY_UP); - outBuf.writeShort(0); // padding - outBuf.writeInt(map_en_us(order)); - - pushDataToAllOuts(outBuf); - } - - /** - * Return key scan code (in lower byte) and extended flags (in second byte). - */ - private int map_en_us(KeyOrder order) { - - switch (order.event.getKeyCode()) { - // Functional keys - case KeyEvent.VK_ESCAPE: - return 0xff1b; - case KeyEvent.VK_F1: - return 0xffbe; - case KeyEvent.VK_F2: - return 0xffbf; - case KeyEvent.VK_F3: - return 0xffc0; - case KeyEvent.VK_F4: - return 0xffc1; - case KeyEvent.VK_F5: - return 0xffc2; - case KeyEvent.VK_F6: - return 0xffc3; - case KeyEvent.VK_F7: - return 0xffc4; - case KeyEvent.VK_F8: - return 0xffc5; - case KeyEvent.VK_F9: - return 0xffc6; - case KeyEvent.VK_F10: - return 0xffc7; - case KeyEvent.VK_F11: - return 0xffc8; - case KeyEvent.VK_F12: - return 0xffc9; - - // Row #1 - case KeyEvent.VK_BACK_QUOTE: - return (sh) ? '~' : '`'; - case KeyEvent.VK_1: - return (sh) ? '!' : '1'; - case KeyEvent.VK_2: - return (sh) ? '@' : '2'; - case KeyEvent.VK_3: - return (sh) ? '#' : '3'; - case KeyEvent.VK_4: - return (sh) ? '$' : '4'; - case KeyEvent.VK_5: - return (sh) ? '%' : '5'; - case KeyEvent.VK_6: - return (sh) ? '^' : '6'; - case KeyEvent.VK_7: - return (sh) ? '&' : '7'; - case KeyEvent.VK_8: - return (sh) ? '*' : '8'; - case KeyEvent.VK_9: - return (sh) ? '(' : '9'; - case KeyEvent.VK_0: - return (sh) ? ')' : '0'; - case KeyEvent.VK_MINUS: - return (sh) ? '_' : '-'; - case KeyEvent.VK_EQUALS: - return (sh) ? '+' : '='; - case KeyEvent.VK_BACK_SPACE: - return 0xff08; - - // Row #2 - case KeyEvent.VK_TAB: - return 0xff09; - case KeyEvent.VK_Q: - return (sh ^ caps) ? 'Q' : 'q'; - case KeyEvent.VK_W: - return (sh ^ caps) ? 'W' : 'w'; - case KeyEvent.VK_E: - return (sh ^ caps) ? 'E' : 'e'; - case KeyEvent.VK_R: - return (sh ^ caps) ? 'R' : 'r'; - case KeyEvent.VK_T: - return (sh ^ caps) ? 'T' : 't'; - case KeyEvent.VK_Y: - return (sh ^ caps) ? 'Y' : 'y'; - case KeyEvent.VK_U: - return (sh ^ caps) ? 'U' : 'u'; - case KeyEvent.VK_I: - return (sh ^ caps) ? 'I' : 'i'; - case KeyEvent.VK_O: - return (sh ^ caps) ? 'O' : 'o'; - case KeyEvent.VK_P: - return (sh ^ caps) ? 'P' : 'p'; - case KeyEvent.VK_OPEN_BRACKET: - return (sh) ? '{' : '['; - case KeyEvent.VK_CLOSE_BRACKET: - return (sh) ? '{' : ']'; - case KeyEvent.VK_ENTER: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_STANDARD: - return 0xff0d; - case KeyEvent.KEY_LOCATION_NUMPAD: - return 0xff8d; - } - - // Row #3 - case KeyEvent.VK_CAPS_LOCK: - if (order.pressed) - caps = !caps; - return 0xFFE5; - case KeyEvent.VK_A: - return (sh ^ caps) ? 'A' : 'a'; - case KeyEvent.VK_S: - return (sh ^ caps) ? 'S' : 's'; - case KeyEvent.VK_D: - return (sh ^ caps) ? 'D' : 'd'; - case KeyEvent.VK_F: - return (sh ^ caps) ? 'F' : 'f'; - case KeyEvent.VK_G: - return (sh ^ caps) ? 'G' : 'g'; - case KeyEvent.VK_H: - return (sh ^ caps) ? 'H' : 'h'; - case KeyEvent.VK_J: - return (sh ^ caps) ? 'J' : 'j'; - case KeyEvent.VK_K: - return (sh ^ caps) ? 'K' : 'k'; - case KeyEvent.VK_L: - return (sh ^ caps) ? 'L' : 'l'; - case KeyEvent.VK_SEMICOLON: - return (sh) ? ':' : ';'; - case KeyEvent.VK_QUOTE: - return (sh) ? '"' : '\''; - - // Row #4 - case KeyEvent.VK_SHIFT: - sh = !sh; - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xffe1; - case KeyEvent.KEY_LOCATION_RIGHT: - return 0xffe2; - } - case KeyEvent.VK_BACK_SLASH: - return (sh) ? '|' : '\\'; - case KeyEvent.VK_Z: - return (sh ^ caps) ? 'Z' : 'z'; - case KeyEvent.VK_X: - return (sh ^ caps) ? 'X' : 'x'; - case KeyEvent.VK_C: - return (sh ^ caps) ? 'C' : 'c'; - case KeyEvent.VK_V: - return (sh ^ caps) ? 'V' : 'v'; - case KeyEvent.VK_B: - return (sh ^ caps) ? 'B' : 'b'; - case KeyEvent.VK_N: - return (sh ^ caps) ? 'N' : 'n'; - case KeyEvent.VK_M: - return (sh ^ caps) ? 'M' : 'M'; - case KeyEvent.VK_COMMA: - return (sh) ? '<' : ','; - case KeyEvent.VK_PERIOD: - return (sh) ? '>' : '.'; - case KeyEvent.VK_SLASH: - return (sh) ? '?' : '/'; - - // - // Bottom row - case KeyEvent.VK_CONTROL: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xFFE3; - case KeyEvent.KEY_LOCATION_RIGHT: - return 0xFFE4; - } - case KeyEvent.VK_WINDOWS: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xFFED; // HyperL - case KeyEvent.KEY_LOCATION_RIGHT: - return 0xFFEE; // HyperR - } - case KeyEvent.VK_META: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xFFE7; // MetaL - case KeyEvent.KEY_LOCATION_RIGHT: - return 0xFFE8; // MetaR - } - - case KeyEvent.VK_ALT: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xFFE9; - case KeyEvent.KEY_LOCATION_RIGHT: - return 0xFFEA; - } - case KeyEvent.VK_ALT_GRAPH: - return 0xfe03; - - case KeyEvent.VK_SPACE: - return ' '; - - case KeyEvent.VK_CONTEXT_MENU: - return 0xff67; - - // - // Special keys - case KeyEvent.VK_PRINTSCREEN: - return (sh) ? 0xFF15/* SysRq */: 0xFF61 /* Print */; - case KeyEvent.VK_SCROLL_LOCK: - return 0xFF14; - case KeyEvent.VK_PAUSE: - return (sh) ? 0xFF6B/* Break */: 0xFF13/* Pause */; - - // Text navigation keys - case KeyEvent.VK_INSERT: - return 0xff63; - case KeyEvent.VK_DELETE: - return 0xffff; - case KeyEvent.VK_HOME: - return 0xff50; - case KeyEvent.VK_END: - return 0xff57; - case KeyEvent.VK_PAGE_UP: - return 0xff55; - case KeyEvent.VK_PAGE_DOWN: - return 0xff56; - - // Cursor keys - case KeyEvent.VK_LEFT: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xff51; - case KeyEvent.KEY_LOCATION_NUMPAD: - return 0xFF96; - } - case KeyEvent.VK_UP: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xff52; - case KeyEvent.KEY_LOCATION_NUMPAD: - return 0xFF97; - } - case KeyEvent.VK_RIGHT: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xff53; - case KeyEvent.KEY_LOCATION_NUMPAD: - return 0xFF98; - } - case KeyEvent.VK_DOWN: - switch (order.event.getKeyLocation()) { - default: - case KeyEvent.KEY_LOCATION_LEFT: - return 0xff54; - case KeyEvent.KEY_LOCATION_NUMPAD: - return 0xFF99; - } - - // Keypad - case KeyEvent.VK_NUM_LOCK: - if (order.pressed) - num = !num; - return 0xFF6F; - case KeyEvent.VK_DIVIDE: - return 0xFFAF; - case KeyEvent.VK_MULTIPLY: - return 0xFFAA; - case KeyEvent.VK_SUBTRACT: - return 0xFFAD; - case KeyEvent.VK_ADD: - return 0xFFAB; - - case KeyEvent.VK_KP_LEFT: - return 0xFF96; - case KeyEvent.VK_KP_UP: - return 0xFF97; - case KeyEvent.VK_KP_RIGHT: - return 0xFF98; - case KeyEvent.VK_KP_DOWN: - return 0xFF99; - - case KeyEvent.VK_NUMPAD0: - return 0xFFB0; - case KeyEvent.VK_NUMPAD1: - return 0xFFB1; - case KeyEvent.VK_NUMPAD2: - return 0xFFB2; - case KeyEvent.VK_NUMPAD3: - return 0xFFB3; - case KeyEvent.VK_NUMPAD4: - return 0xFFB4; - case KeyEvent.VK_NUMPAD5: - return 0xFFB5; - case KeyEvent.VK_NUMPAD6: - return 0xFFB6; - case KeyEvent.VK_NUMPAD7: - return 0xFFB7; - case KeyEvent.VK_NUMPAD8: - return 0xFFB8; - case KeyEvent.VK_NUMPAD9: - return 0xFFB9; - case KeyEvent.VK_DECIMAL: - return 0xFFAE; - - default: - System.err.println("Key is not mapped: " + order + "."); - return ' '; // Space + public AwtKeyboardEventToVncAdapter(String id) { + super(id); + } + + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + KeyOrder order = (KeyOrder)buf.getOrder(); + buf.unref(); + + ByteBuffer outBuf = new ByteBuffer(8); + outBuf.writeByte(RfbConstants.CLIENT_KEYBOARD_EVENT); + + outBuf.writeByte((order.pressed) ? RfbConstants.KEY_DOWN : RfbConstants.KEY_UP); + outBuf.writeShort(0); // padding + outBuf.writeInt(map_en_us(order)); + + pushDataToAllOuts(outBuf); + } + + /** + * Return key scan code (in lower byte) and extended flags (in second byte). + */ + private int map_en_us(KeyOrder order) { + + switch (order.event.getKeyCode()) { + // Functional keys + case KeyEvent.VK_ESCAPE: + return 0xff1b; + case KeyEvent.VK_F1: + return 0xffbe; + case KeyEvent.VK_F2: + return 0xffbf; + case KeyEvent.VK_F3: + return 0xffc0; + case KeyEvent.VK_F4: + return 0xffc1; + case KeyEvent.VK_F5: + return 0xffc2; + case KeyEvent.VK_F6: + return 0xffc3; + case KeyEvent.VK_F7: + return 0xffc4; + case KeyEvent.VK_F8: + return 0xffc5; + case KeyEvent.VK_F9: + return 0xffc6; + case KeyEvent.VK_F10: + return 0xffc7; + case KeyEvent.VK_F11: + return 0xffc8; + case KeyEvent.VK_F12: + return 0xffc9; + + // Row #1 + case KeyEvent.VK_BACK_QUOTE: + return (sh) ? '~' : '`'; + case KeyEvent.VK_1: + return (sh) ? '!' : '1'; + case KeyEvent.VK_2: + return (sh) ? '@' : '2'; + case KeyEvent.VK_3: + return (sh) ? '#' : '3'; + case KeyEvent.VK_4: + return (sh) ? '$' : '4'; + case KeyEvent.VK_5: + return (sh) ? '%' : '5'; + case KeyEvent.VK_6: + return (sh) ? '^' : '6'; + case KeyEvent.VK_7: + return (sh) ? '&' : '7'; + case KeyEvent.VK_8: + return (sh) ? '*' : '8'; + case KeyEvent.VK_9: + return (sh) ? '(' : '9'; + case KeyEvent.VK_0: + return (sh) ? ')' : '0'; + case KeyEvent.VK_MINUS: + return (sh) ? '_' : '-'; + case KeyEvent.VK_EQUALS: + return (sh) ? '+' : '='; + case KeyEvent.VK_BACK_SPACE: + return 0xff08; + + // Row #2 + case KeyEvent.VK_TAB: + return 0xff09; + case KeyEvent.VK_Q: + return (sh ^ caps) ? 'Q' : 'q'; + case KeyEvent.VK_W: + return (sh ^ caps) ? 'W' : 'w'; + case KeyEvent.VK_E: + return (sh ^ caps) ? 'E' : 'e'; + case KeyEvent.VK_R: + return (sh ^ caps) ? 'R' : 'r'; + case KeyEvent.VK_T: + return (sh ^ caps) ? 'T' : 't'; + case KeyEvent.VK_Y: + return (sh ^ caps) ? 'Y' : 'y'; + case KeyEvent.VK_U: + return (sh ^ caps) ? 'U' : 'u'; + case KeyEvent.VK_I: + return (sh ^ caps) ? 'I' : 'i'; + case KeyEvent.VK_O: + return (sh ^ caps) ? 'O' : 'o'; + case KeyEvent.VK_P: + return (sh ^ caps) ? 'P' : 'p'; + case KeyEvent.VK_OPEN_BRACKET: + return (sh) ? '{' : '['; + case KeyEvent.VK_CLOSE_BRACKET: + return (sh) ? '{' : ']'; + case KeyEvent.VK_ENTER: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_STANDARD: + return 0xff0d; + case KeyEvent.KEY_LOCATION_NUMPAD: + return 0xff8d; + } + + // Row #3 + case KeyEvent.VK_CAPS_LOCK: + if (order.pressed) + caps = !caps; + return 0xFFE5; + case KeyEvent.VK_A: + return (sh ^ caps) ? 'A' : 'a'; + case KeyEvent.VK_S: + return (sh ^ caps) ? 'S' : 's'; + case KeyEvent.VK_D: + return (sh ^ caps) ? 'D' : 'd'; + case KeyEvent.VK_F: + return (sh ^ caps) ? 'F' : 'f'; + case KeyEvent.VK_G: + return (sh ^ caps) ? 'G' : 'g'; + case KeyEvent.VK_H: + return (sh ^ caps) ? 'H' : 'h'; + case KeyEvent.VK_J: + return (sh ^ caps) ? 'J' : 'j'; + case KeyEvent.VK_K: + return (sh ^ caps) ? 'K' : 'k'; + case KeyEvent.VK_L: + return (sh ^ caps) ? 'L' : 'l'; + case KeyEvent.VK_SEMICOLON: + return (sh) ? ':' : ';'; + case KeyEvent.VK_QUOTE: + return (sh) ? '"' : '\''; + + // Row #4 + case KeyEvent.VK_SHIFT: + sh = !sh; + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xffe1; + case KeyEvent.KEY_LOCATION_RIGHT: + return 0xffe2; + } + case KeyEvent.VK_BACK_SLASH: + return (sh) ? '|' : '\\'; + case KeyEvent.VK_Z: + return (sh ^ caps) ? 'Z' : 'z'; + case KeyEvent.VK_X: + return (sh ^ caps) ? 'X' : 'x'; + case KeyEvent.VK_C: + return (sh ^ caps) ? 'C' : 'c'; + case KeyEvent.VK_V: + return (sh ^ caps) ? 'V' : 'v'; + case KeyEvent.VK_B: + return (sh ^ caps) ? 'B' : 'b'; + case KeyEvent.VK_N: + return (sh ^ caps) ? 'N' : 'n'; + case KeyEvent.VK_M: + return (sh ^ caps) ? 'M' : 'M'; + case KeyEvent.VK_COMMA: + return (sh) ? '<' : ','; + case KeyEvent.VK_PERIOD: + return (sh) ? '>' : '.'; + case KeyEvent.VK_SLASH: + return (sh) ? '?' : '/'; + + // + // Bottom row + case KeyEvent.VK_CONTROL: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xFFE3; + case KeyEvent.KEY_LOCATION_RIGHT: + return 0xFFE4; + } + case KeyEvent.VK_WINDOWS: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xFFED; // HyperL + case KeyEvent.KEY_LOCATION_RIGHT: + return 0xFFEE; // HyperR + } + case KeyEvent.VK_META: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xFFE7; // MetaL + case KeyEvent.KEY_LOCATION_RIGHT: + return 0xFFE8; // MetaR + } + + case KeyEvent.VK_ALT: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xFFE9; + case KeyEvent.KEY_LOCATION_RIGHT: + return 0xFFEA; + } + case KeyEvent.VK_ALT_GRAPH: + return 0xfe03; + + case KeyEvent.VK_SPACE: + return ' '; + + case KeyEvent.VK_CONTEXT_MENU: + return 0xff67; + + // + // Special keys + case KeyEvent.VK_PRINTSCREEN: + return (sh) ? 0xFF15/* SysRq */: 0xFF61 /* Print */; + case KeyEvent.VK_SCROLL_LOCK: + return 0xFF14; + case KeyEvent.VK_PAUSE: + return (sh) ? 0xFF6B/* Break */: 0xFF13/* Pause */; + + // Text navigation keys + case KeyEvent.VK_INSERT: + return 0xff63; + case KeyEvent.VK_DELETE: + return 0xffff; + case KeyEvent.VK_HOME: + return 0xff50; + case KeyEvent.VK_END: + return 0xff57; + case KeyEvent.VK_PAGE_UP: + return 0xff55; + case KeyEvent.VK_PAGE_DOWN: + return 0xff56; + + // Cursor keys + case KeyEvent.VK_LEFT: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xff51; + case KeyEvent.KEY_LOCATION_NUMPAD: + return 0xFF96; + } + case KeyEvent.VK_UP: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xff52; + case KeyEvent.KEY_LOCATION_NUMPAD: + return 0xFF97; + } + case KeyEvent.VK_RIGHT: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xff53; + case KeyEvent.KEY_LOCATION_NUMPAD: + return 0xFF98; + } + case KeyEvent.VK_DOWN: + switch (order.event.getKeyLocation()) { + default: + case KeyEvent.KEY_LOCATION_LEFT: + return 0xff54; + case KeyEvent.KEY_LOCATION_NUMPAD: + return 0xFF99; + } + + // Keypad + case KeyEvent.VK_NUM_LOCK: + if (order.pressed) + num = !num; + return 0xFF6F; + case KeyEvent.VK_DIVIDE: + return 0xFFAF; + case KeyEvent.VK_MULTIPLY: + return 0xFFAA; + case KeyEvent.VK_SUBTRACT: + return 0xFFAD; + case KeyEvent.VK_ADD: + return 0xFFAB; + + case KeyEvent.VK_KP_LEFT: + return 0xFF96; + case KeyEvent.VK_KP_UP: + return 0xFF97; + case KeyEvent.VK_KP_RIGHT: + return 0xFF98; + case KeyEvent.VK_KP_DOWN: + return 0xFF99; + + case KeyEvent.VK_NUMPAD0: + return 0xFFB0; + case KeyEvent.VK_NUMPAD1: + return 0xFFB1; + case KeyEvent.VK_NUMPAD2: + return 0xFFB2; + case KeyEvent.VK_NUMPAD3: + return 0xFFB3; + case KeyEvent.VK_NUMPAD4: + return 0xFFB4; + case KeyEvent.VK_NUMPAD5: + return 0xFFB5; + case KeyEvent.VK_NUMPAD6: + return 0xFFB6; + case KeyEvent.VK_NUMPAD7: + return 0xFFB7; + case KeyEvent.VK_NUMPAD8: + return 0xFFB8; + case KeyEvent.VK_NUMPAD9: + return 0xFFB9; + case KeyEvent.VK_DECIMAL: + return 0xFFAE; + + default: + System.err.println("Key is not mapped: " + order + "."); + return ' '; // Space + } } - } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java index 210333dc528..a54d101f6a9 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java @@ -16,56 +16,57 @@ // under the License. package vncclient; +import java.awt.event.InputEvent; import java.awt.event.MouseEvent; -import common.MouseOrder; - import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; +import common.MouseOrder; public class AwtMouseEventToVncAdapter extends BaseElement { - public AwtMouseEventToVncAdapter(String id) { - super(id); - } + public AwtMouseEventToVncAdapter(String id) { + super(id); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + @Override + public void handleData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Get mouse event - MouseOrder order = (MouseOrder)buf.getOrder(); + // Get mouse event + MouseOrder order = (MouseOrder)buf.getOrder(); - ByteBuffer outBuf = new ByteBuffer(6); + ByteBuffer outBuf = new ByteBuffer(6); - outBuf.writeByte(RfbConstants.CLIENT_POINTER_EVENT); + outBuf.writeByte(RfbConstants.CLIENT_POINTER_EVENT); - int buttonMask = mapAwtModifiersToVncButtonMask(order.event.getModifiersEx()); - outBuf.writeByte(buttonMask); - outBuf.writeShort(order.event.getX()); - outBuf.writeShort(order.event.getY()); + int buttonMask = mapAwtModifiersToVncButtonMask(order.event.getModifiersEx()); + outBuf.writeByte(buttonMask); + outBuf.writeShort(order.event.getX()); + outBuf.writeShort(order.event.getY()); - pushDataToAllOuts(outBuf); - } + pushDataToAllOuts(outBuf); + } - /** - * Current state of buttons 1 to 8 are represented by bits 0 to 7 of - * button-mask respectively, 0 meaning up, 1 meaning down (pressed). On a - * conventional mouse, buttons 1, 2 and 3 correspond to the left, middle and - * right buttons on the mouse. On a wheel mouse, each step of the wheel - * upwards is represented by a press and release of button 4, and each step - * downwards is represented by a press and release of button 5. - * - * @param modifiers - * extended modifiers from AWT mouse event - * @return VNC mouse button mask - */ - public static int mapAwtModifiersToVncButtonMask(int modifiers) { - int mask = (((modifiers & MouseEvent.BUTTON1_DOWN_MASK) != 0) ? 0x1 : 0) | (((modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0) ? 0x2 : 0) - | (((modifiers & MouseEvent.BUTTON3_DOWN_MASK) != 0) ? 0x4 : 0); - return mask; - } + /** + * Current state of buttons 1 to 8 are represented by bits 0 to 7 of + * button-mask respectively, 0 meaning up, 1 meaning down (pressed). On a + * conventional mouse, buttons 1, 2 and 3 correspond to the left, middle and + * right buttons on the mouse. On a wheel mouse, each step of the wheel + * upwards is represented by a press and release of button 4, and each step + * downwards is represented by a press and release of button 5. + * + * @param modifiers + * extended modifiers from AWT mouse event + * @return VNC mouse button mask + */ + public static int mapAwtModifiersToVncButtonMask(int modifiers) { + int mask = + (((modifiers & InputEvent.BUTTON1_DOWN_MASK) != 0) ? 0x1 : 0) | (((modifiers & InputEvent.BUTTON2_DOWN_MASK) != 0) ? 0x2 : 0) | + (((modifiers & InputEvent.BUTTON3_DOWN_MASK) != 0) ? 0x4 : 0); + return mask; + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/EncodingsMessage.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/EncodingsMessage.java index 9ee3566efae..81540d66412 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/EncodingsMessage.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/EncodingsMessage.java @@ -22,42 +22,42 @@ import streamer.Link; public class EncodingsMessage extends BaseElement { - protected final int[] encodings; + protected final int[] encodings; - public EncodingsMessage(String id, int[] encodings) { - super(id); - this.encodings = encodings; - declarePads(); - } - - protected void declarePads() { - inputPads.put(STDIN, null); - outputPads.put(STDOUT, null); - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - buf.unref(); - - ByteBuffer outBuf = new ByteBuffer(4 + encodings.length * 4); - - outBuf.writeByte(RfbConstants.CLIENT_SET_ENCODINGS); - - outBuf.writeByte(0);// padding - - outBuf.writeShort(encodings.length); - - for (int i = 0; i < encodings.length; i++) { - outBuf.writeInt(encodings[i]); + public EncodingsMessage(String id, int[] encodings) { + super(id); + this.encodings = encodings; + declarePads(); } - pushDataToAllOuts(outBuf); + protected void declarePads() { + inputPads.put(STDIN, null); + outputPads.put(STDOUT, null); + } - } + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; + + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + buf.unref(); + + ByteBuffer outBuf = new ByteBuffer(4 + encodings.length * 4); + + outBuf.writeByte(RfbConstants.CLIENT_SET_ENCODINGS); + + outBuf.writeByte(0);// padding + + outBuf.writeShort(encodings.length); + + for (int i = 0; i < encodings.length; i++) { + outBuf.writeInt(encodings[i]); + } + + pushDataToAllOuts(outBuf); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/FrameBufferUpdateRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/FrameBufferUpdateRequest.java index c8fab216a62..0081827bd01 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/FrameBufferUpdateRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/FrameBufferUpdateRequest.java @@ -16,8 +16,6 @@ // under the License. package vncclient; -import common.ScreenDescription; - import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Element; @@ -26,102 +24,103 @@ import streamer.MockSink; import streamer.MockSource; import streamer.Pipeline; import streamer.PipelineImpl; +import common.ScreenDescription; public class FrameBufferUpdateRequest extends BaseElement { - // TODO: use object with fields instead of raw values in map - public static final String INCREMENTAL_UPDATE = "incremental"; - public static final String TARGET_X = "x"; - public static final String TARGET_Y = "y"; - public static final String WIDTH = "width"; - public static final String HEIGHT = "height"; + // TODO: use object with fields instead of raw values in map + public static final String INCREMENTAL_UPDATE = "incremental"; + public static final String TARGET_X = "x"; + public static final String TARGET_Y = "y"; + public static final String WIDTH = "width"; + public static final String HEIGHT = "height"; - protected ScreenDescription screen; + protected ScreenDescription screen; - public FrameBufferUpdateRequest(String id, ScreenDescription screen) { - super(id); - this.screen = screen; - } - - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; - - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - Boolean incremental = (Boolean) buf.getMetadata(INCREMENTAL_UPDATE); - Integer x = (Integer) buf.getMetadata(TARGET_X); - Integer y = (Integer) buf.getMetadata(TARGET_Y); - Integer width = (Integer) buf.getMetadata(WIDTH); - Integer height = (Integer) buf.getMetadata(HEIGHT); - buf.unref(); - - // Set default values when parameters are not set - if (incremental == null) - incremental = false; - - if (x == null) - x = 0; - if (y == null) - y = 0; - - if (width == null) - width = screen.getFramebufferWidth(); - if (height == null) - height = screen.getFramebufferHeight(); - - ByteBuffer outBuf = new ByteBuffer(10); - - outBuf.writeByte(RfbConstants.CLIENT_FRAMEBUFFER_UPDATE_REQUEST); - outBuf.writeByte((incremental) ? RfbConstants.FRAMEBUFFER_INCREMENTAL_UPDATE_REQUEST : RfbConstants.FRAMEBUFFER_FULL_UPDATE_REQUEST); - outBuf.writeShort(x); - outBuf.writeShort(y); - outBuf.writeShort(width); - outBuf.writeShort(height); - - if (verbose) { - outBuf.putMetadata("sender", this); - outBuf.putMetadata("dimensions", width + "x" + height + "@" + x + "x" + y); + public FrameBufferUpdateRequest(String id, ScreenDescription screen) { + super(id); + this.screen = screen; } - pushDataToAllOuts(outBuf); - } + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - public static void main(String args[]) { - System.setProperty("streamer.Element.debug", "true"); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - ScreenDescription screen = new ScreenDescription(); - screen.setFramebufferSize(120, 80); - Element adapter = new FrameBufferUpdateRequest("renderer", screen); + Boolean incremental = (Boolean)buf.getMetadata(INCREMENTAL_UPDATE); + Integer x = (Integer)buf.getMetadata(TARGET_X); + Integer y = (Integer)buf.getMetadata(TARGET_Y); + Integer width = (Integer)buf.getMetadata(WIDTH); + Integer height = (Integer)buf.getMetadata(HEIGHT); + buf.unref(); - Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { - // Request - RfbConstants.CLIENT_FRAMEBUFFER_UPDATE_REQUEST, - // Full update (redraw area) - RfbConstants.FRAMEBUFFER_FULL_UPDATE_REQUEST, - // X - 0, 1, - // Y - 0, 2, - // Width - 0, 3, - // Height - 0, 4 })); + // Set default values when parameters are not set + if (incremental == null) + incremental = false; - ByteBuffer buf = new ByteBuffer(new byte[0]); - buf.putMetadata(TARGET_X, 1); - buf.putMetadata(TARGET_Y, 2); - buf.putMetadata(WIDTH, 3); - buf.putMetadata(HEIGHT, 4); + if (x == null) + x = 0; + if (y == null) + y = 0; - Element source = new MockSource("source", new ByteBuffer[] { buf }); + if (width == null) + width = screen.getFramebufferWidth(); + if (height == null) + height = screen.getFramebufferHeight(); - Pipeline pipeline = new PipelineImpl("test"); + ByteBuffer outBuf = new ByteBuffer(10); - pipeline.addAndLink(source, adapter, sink); - pipeline.runMainLoop("source", STDOUT, false, false); + outBuf.writeByte(RfbConstants.CLIENT_FRAMEBUFFER_UPDATE_REQUEST); + outBuf.writeByte((incremental) ? RfbConstants.FRAMEBUFFER_INCREMENTAL_UPDATE_REQUEST : RfbConstants.FRAMEBUFFER_FULL_UPDATE_REQUEST); + outBuf.writeShort(x); + outBuf.writeShort(y); + outBuf.writeShort(width); + outBuf.writeShort(height); - } + if (verbose) { + outBuf.putMetadata("sender", this); + outBuf.putMetadata("dimensions", width + "x" + height + "@" + x + "x" + y); + } + + pushDataToAllOuts(outBuf); + } + + public static void main(String args[]) { + System.setProperty("streamer.Element.debug", "true"); + + ScreenDescription screen = new ScreenDescription(); + screen.setFramebufferSize(120, 80); + Element adapter = new FrameBufferUpdateRequest("renderer", screen); + + Element sink = new MockSink("sink", ByteBuffer.convertByteArraysToByteBuffers(new byte[] { + // Request + RfbConstants.CLIENT_FRAMEBUFFER_UPDATE_REQUEST, + // Full update (redraw area) + RfbConstants.FRAMEBUFFER_FULL_UPDATE_REQUEST, + // X + 0, 1, + // Y + 0, 2, + // Width + 0, 3, + // Height + 0, 4})); + + ByteBuffer buf = new ByteBuffer(new byte[0]); + buf.putMetadata(TARGET_X, 1); + buf.putMetadata(TARGET_Y, 2); + buf.putMetadata(WIDTH, 3); + buf.putMetadata(HEIGHT, 4); + + Element source = new MockSource("source", new ByteBuffer[] {buf}); + + Pipeline pipeline = new PipelineImpl("test"); + + pipeline.addAndLink(source, adapter, sink); + pipeline.runMainLoop("source", STDOUT, false, false); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RGB888LE32PixelFormatRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RGB888LE32PixelFormatRequest.java index 8c691e72839..32de903d706 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RGB888LE32PixelFormatRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RGB888LE32PixelFormatRequest.java @@ -16,75 +16,74 @@ // under the License. package vncclient; -import common.ScreenDescription; - import streamer.BaseElement; import streamer.ByteBuffer; import streamer.Link; +import common.ScreenDescription; public class RGB888LE32PixelFormatRequest extends BaseElement { - protected int bitsPerPixel = 32; - protected int depth = 24; - protected int bigEndianFlag = RfbConstants.LITTLE_ENDIAN; - protected int trueColourFlag = RfbConstants.TRUE_COLOR; - protected int redMax = 255; - protected int greenMax = 255; - protected int blueMax = 255; - protected int redShift = 0; - protected int greenShift = 8; - protected int blueShift = 16; + protected int bitsPerPixel = 32; + protected int depth = 24; + protected int bigEndianFlag = RfbConstants.LITTLE_ENDIAN; + protected int trueColourFlag = RfbConstants.TRUE_COLOR; + protected int redMax = 255; + protected int greenMax = 255; + protected int blueMax = 255; + protected int redShift = 0; + protected int greenShift = 8; + protected int blueShift = 16; - protected ScreenDescription screen; + protected ScreenDescription screen; - public RGB888LE32PixelFormatRequest(String id, ScreenDescription screen) { - super(id); - this.screen = screen; - } + public RGB888LE32PixelFormatRequest(String id, ScreenDescription screen) { + super(id); + this.screen = screen; + } - protected void declarePads() { - inputPads.put(STDIN, null); - outputPads.put(STDOUT, null); - } + protected void declarePads() { + inputPads.put(STDIN, null); + outputPads.put(STDOUT, null); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - buf.unref(); + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + buf.unref(); - ByteBuffer outBuf = new ByteBuffer(20); + ByteBuffer outBuf = new ByteBuffer(20); - outBuf.writeByte(RfbConstants.CLIENT_SET_PIXEL_FORMAT); + outBuf.writeByte(RfbConstants.CLIENT_SET_PIXEL_FORMAT); - // Padding - outBuf.writeByte(0); - outBuf.writeByte(0); - outBuf.writeByte(0); + // Padding + outBuf.writeByte(0); + outBuf.writeByte(0); + outBuf.writeByte(0); - // Send pixel format - outBuf.writeByte(bitsPerPixel); - outBuf.writeByte(depth); - outBuf.writeByte(bigEndianFlag); - outBuf.writeByte(trueColourFlag); - outBuf.writeShort(redMax); - outBuf.writeShort(greenMax); - outBuf.writeShort(blueMax); - outBuf.writeByte(redShift); - outBuf.writeByte(greenShift); - outBuf.writeByte(blueShift); + // Send pixel format + outBuf.writeByte(bitsPerPixel); + outBuf.writeByte(depth); + outBuf.writeByte(bigEndianFlag); + outBuf.writeByte(trueColourFlag); + outBuf.writeShort(redMax); + outBuf.writeShort(greenMax); + outBuf.writeShort(blueMax); + outBuf.writeByte(redShift); + outBuf.writeByte(greenShift); + outBuf.writeByte(blueShift); - // Padding - outBuf.writeByte(0); - outBuf.writeByte(0); - outBuf.writeByte(0); + // Padding + outBuf.writeByte(0); + outBuf.writeByte(0); + outBuf.writeByte(0); - screen.setPixelFormat(bitsPerPixel, depth, bigEndianFlag != RfbConstants.LITTLE_ENDIAN, trueColourFlag == RfbConstants.TRUE_COLOR, redMax, greenMax, - blueMax, redShift, greenShift, blueShift); + screen.setPixelFormat(bitsPerPixel, depth, bigEndianFlag != RfbConstants.LITTLE_ENDIAN, trueColourFlag == RfbConstants.TRUE_COLOR, redMax, greenMax, blueMax, + redShift, greenShift, blueShift); - pushDataToAllOuts(outBuf); - } + pushDataToAllOuts(outBuf); + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java index 86b40376516..7359cd30099 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java @@ -20,66 +20,66 @@ import java.nio.charset.Charset; public interface RfbConstants { - public static final String RFB_PROTOCOL_VERSION_MAJOR = "RFB 003."; - public static final String VNC_PROTOCOL_VERSION_MINOR = "003"; - public static final String RFB_PROTOCOL_VERSION = RFB_PROTOCOL_VERSION_MAJOR + VNC_PROTOCOL_VERSION_MINOR; + public static final String RFB_PROTOCOL_VERSION_MAJOR = "RFB 003."; + public static final String VNC_PROTOCOL_VERSION_MINOR = "003"; + public static final String RFB_PROTOCOL_VERSION = RFB_PROTOCOL_VERSION_MAJOR + VNC_PROTOCOL_VERSION_MINOR; - /** - * Server message types. - */ - final static int SERVER_FRAMEBUFFER_UPDATE = 0, SERVER_SET_COLOURMAP_ENTRIES = 1, SERVER_BELL = 2, SERVER_CUT_TEXT = 3; + /** + * Server message types. + */ + final static int SERVER_FRAMEBUFFER_UPDATE = 0, SERVER_SET_COLOURMAP_ENTRIES = 1, SERVER_BELL = 2, SERVER_CUT_TEXT = 3; - /** - * Client message types. - */ - public static final int CLIENT_SET_PIXEL_FORMAT = 0, CLIENT_FIX_COLOURMAP_ENTRIES = 1, CLIENT_SET_ENCODINGS = 2, CLIENT_FRAMEBUFFER_UPDATE_REQUEST = 3, - CLIENT_KEYBOARD_EVENT = 4, CLIENT_POINTER_EVENT = 5, CLIENT_CUT_TEXT = 6; + /** + * Client message types. + */ + public static final int CLIENT_SET_PIXEL_FORMAT = 0, CLIENT_FIX_COLOURMAP_ENTRIES = 1, CLIENT_SET_ENCODINGS = 2, CLIENT_FRAMEBUFFER_UPDATE_REQUEST = 3, + CLIENT_KEYBOARD_EVENT = 4, CLIENT_POINTER_EVENT = 5, CLIENT_CUT_TEXT = 6; - /** - * Server authorization type - */ - public final static int CONNECTION_FAILED = 0, NO_AUTH = 1, VNC_AUTH = 2; + /** + * Server authorization type + */ + public final static int CONNECTION_FAILED = 0, NO_AUTH = 1, VNC_AUTH = 2; - /** - * Server authorization reply. - */ - public final static int VNC_AUTH_OK = 0, VNC_AUTH_FAILED = 1, VNC_AUTH_TOO_MANY = 2; + /** + * Server authorization reply. + */ + public final static int VNC_AUTH_OK = 0, VNC_AUTH_FAILED = 1, VNC_AUTH_TOO_MANY = 2; - /** - * Encodings. - */ - public final static int ENCODING_RAW = 0, ENCODING_COPY_RECT = 1, ENCODING_RRE = 2, ENCODING_CO_RRE = 4, ENCODING_HEXTILE = 5, ENCODING_ZRLE = 16; + /** + * Encodings. + */ + public final static int ENCODING_RAW = 0, ENCODING_COPY_RECT = 1, ENCODING_RRE = 2, ENCODING_CO_RRE = 4, ENCODING_HEXTILE = 5, ENCODING_ZRLE = 16; - /** - * Pseudo-encodings. - */ - public final static int ENCODING_CURSOR = -239 /*0xFFFFFF11*/, ENCODING_DESKTOP_SIZE = -223 /*0xFFFFFF21*/; + /** + * Pseudo-encodings. + */ + public final static int ENCODING_CURSOR = -239 /*0xFFFFFF11*/, ENCODING_DESKTOP_SIZE = -223 /*0xFFFFFF21*/; - /** - * Encodings, which we support. - */ - public final static int[] SUPPORTED_ENCODINGS_ARRAY = { ENCODING_RAW, ENCODING_COPY_RECT, ENCODING_DESKTOP_SIZE }; + /** + * Encodings, which we support. + */ + public final static int[] SUPPORTED_ENCODINGS_ARRAY = {ENCODING_RAW, ENCODING_COPY_RECT, ENCODING_DESKTOP_SIZE}; - /** - * Frame buffer update request type: update of whole screen or partial update. - */ - public static final int FRAMEBUFFER_FULL_UPDATE_REQUEST = 0, FRAMEBUFFER_INCREMENTAL_UPDATE_REQUEST = 1; + /** + * Frame buffer update request type: update of whole screen or partial update. + */ + public static final int FRAMEBUFFER_FULL_UPDATE_REQUEST = 0, FRAMEBUFFER_INCREMENTAL_UPDATE_REQUEST = 1; - public static final int KEY_UP = 0, KEY_DOWN = 1; + public static final int KEY_UP = 0, KEY_DOWN = 1; - public static final int LITTLE_ENDIAN = 0, BIG_ENDIAN = 1; + public static final int LITTLE_ENDIAN = 0, BIG_ENDIAN = 1; - public static final int EXCLUSIVE_ACCESS = 0, SHARED_ACCESS = 1; + public static final int EXCLUSIVE_ACCESS = 0, SHARED_ACCESS = 1; - public static final int PALETTE = 0, TRUE_COLOR = 1; + public static final int PALETTE = 0, TRUE_COLOR = 1; - /** - * Default 8 bit charset to use when communicating with server. - */ - public static final Charset US_ASCII_CHARSET = Charset.availableCharsets().get("US-ASCII"); + /** + * Default 8 bit charset to use when communicating with server. + */ + public static final Charset US_ASCII_CHARSET = Charset.availableCharsets().get("US-ASCII"); - /** - * Default 16 bit charset to use when communicating with server. - */ - public static final Charset UCS2_CHARSET = Charset.availableCharsets().get("UTF-16LE"); + /** + * Default 16 bit charset to use when communicating with server. + */ + public static final Charset UCS2_CHARSET = Charset.availableCharsets().get("UTF-16LE"); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java index 2b77e0a9603..c16a9f000c1 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java @@ -18,7 +18,6 @@ package vncclient; import streamer.PipelineImpl; import streamer.Queue; - import common.AwtBellAdapter; import common.AwtCanvasAdapter; import common.AwtClipboardAdapter; @@ -29,79 +28,79 @@ import common.ScreenDescription; public class VncClient extends PipelineImpl { - public VncClient(String id, String password, ScreenDescription screen, BufferedImageCanvas canvas) { - super(id); - assembleVNCPipeline(password, screen, canvas); - } + public VncClient(String id, String password, ScreenDescription screen, BufferedImageCanvas canvas) { + super(id); + assembleVNCPipeline(password, screen, canvas); + } - private void assembleVNCPipeline(String password, ScreenDescription screen, BufferedImageCanvas canvas) { + private void assembleVNCPipeline(String password, ScreenDescription screen, BufferedImageCanvas canvas) { - AwtMouseEventSource mouseEventSource = new AwtMouseEventSource("mouse"); - AwtKeyEventSource keyEventSource = new AwtKeyEventSource("keyboard"); + AwtMouseEventSource mouseEventSource = new AwtMouseEventSource("mouse"); + AwtKeyEventSource keyEventSource = new AwtKeyEventSource("keyboard"); - // Subscribe packet sender to various events - canvas.addMouseListener(mouseEventSource); - canvas.addMouseMotionListener(mouseEventSource); - canvas.addKeyListener(keyEventSource); + // Subscribe packet sender to various events + canvas.addMouseListener(mouseEventSource); + canvas.addMouseMotionListener(mouseEventSource); + canvas.addKeyListener(keyEventSource); - add( - // Handshake + add( + // Handshake - // RFB protocol version exchanger - new Vnc_3_3_Hello("hello"), - // Authenticator - new Vnc_3_3_Authentication("auth", password), - // Initializer - new VncInitializer("init", true, screen), + // RFB protocol version exchanger + new Vnc_3_3_Hello("hello"), + // Authenticator + new Vnc_3_3_Authentication("auth", password), + // Initializer + new VncInitializer("init", true, screen), - new EncodingsMessage("encodings", RfbConstants.SUPPORTED_ENCODINGS_ARRAY), + new EncodingsMessage("encodings", RfbConstants.SUPPORTED_ENCODINGS_ARRAY), - new RGB888LE32PixelFormatRequest("pixel_format", screen), + new RGB888LE32PixelFormatRequest("pixel_format", screen), - // Main + // Main - // Packet receiver - new VncMessageHandler("message_handler", screen), + // Packet receiver + new VncMessageHandler("message_handler", screen), - new AwtBellAdapter("bell"), + new AwtBellAdapter("bell"), - new AwtClipboardAdapter("clipboard"), + new AwtClipboardAdapter("clipboard"), - new AwtCanvasAdapter("pixels", canvas, screen), + new AwtCanvasAdapter("pixels", canvas, screen), - new Queue("queue"), + new Queue("queue"), - new FrameBufferUpdateRequest("fbur", screen), + new FrameBufferUpdateRequest("fbur", screen), - new AwtKeyboardEventToVncAdapter("keyboard_adapter"), + new AwtKeyboardEventToVncAdapter("keyboard_adapter"), - new AwtMouseEventToVncAdapter("mouse_adapter"), + new AwtMouseEventToVncAdapter("mouse_adapter"), - mouseEventSource, keyEventSource + mouseEventSource, keyEventSource - ); + ); - // Link handshake elements - link("IN", "hello", "auth", "init", "message_handler"); - link("hello >otout", "hello< OUT"); - link("auth >otout", "auth< OUT"); - link("init >otout", "init< OUT"); - link("init >encodings", "encodings"); - link("init >pixel_format", "pixel_format"); - link("encodings", "encodings< OUT"); - link("pixel_format", "pixel_format< OUT"); + // Link handshake elements + link("IN", "hello", "auth", "init", "message_handler"); + link("hello >otout", "hello< OUT"); + link("auth >otout", "auth< OUT"); + link("init >otout", "init< OUT"); + link("init >encodings", "encodings"); + link("init >pixel_format", "pixel_format"); + link("encodings", "encodings< OUT"); + link("pixel_format", "pixel_format< OUT"); - // Link main elements - link("message_handler >bell", "bell"); - link("message_handler >clipboard", "clipboard"); - link("message_handler >pixels", "pixels"); - link("message_handler >fbur", "fbur"); + // Link main elements + link("message_handler >bell", "bell"); + link("message_handler >clipboard", "clipboard"); + link("message_handler >pixels", "pixels"); + link("message_handler >fbur", "fbur"); - link("fbur", "fbur< queue"); - link("keyboard", "keyboard_adapter", "keyboard< queue"); - link("mouse", "mouse_adapter", "mouse< queue"); - link("queue", "OUT"); + link("fbur", "fbur< queue"); + link("keyboard", "keyboard_adapter", "keyboard< queue"); + link("mouse", "mouse_adapter", "mouse< queue"); + link("queue", "OUT"); - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncInitializer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncInitializer.java index 0882d13ef82..a812a616945 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncInitializer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncInitializer.java @@ -24,221 +24,222 @@ import streamer.MockSource; import streamer.OneTimeSwitch; import streamer.Pipeline; import streamer.PipelineImpl; - import common.ScreenDescription; public class VncInitializer extends OneTimeSwitch { - // Pad names - public static final String CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD = "encodings"; - public static final String CLIENT_PIXEL_FORMAT_ADAPTER_PAD = "pixel_format"; + // Pad names + public static final String CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD = "encodings"; + public static final String CLIENT_PIXEL_FORMAT_ADAPTER_PAD = "pixel_format"; - protected byte sharedFlag = RfbConstants.EXCLUSIVE_ACCESS; + protected byte sharedFlag = RfbConstants.EXCLUSIVE_ACCESS; - /** - * Properties of remote screen . - */ - protected ScreenDescription screen; + /** + * Properties of remote screen . + */ + protected ScreenDescription screen; - public VncInitializer(String id, boolean shared, ScreenDescription screen) { - super(id); + public VncInitializer(String id, boolean shared, ScreenDescription screen) { + super(id); - setSharedFlag(shared); - this.screen = screen; + setSharedFlag(shared); + this.screen = screen; - declarePads(); - } - - @Override - protected void declarePads() { - super.declarePads(); - outputPads.put(CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, null); - outputPads.put(CLIENT_PIXEL_FORMAT_ADAPTER_PAD, null); - } - - public ScreenDescription getScreen() { - return screen; - } - - public void setScreen(ScreenDescription screen) { - this.screen = screen; - } - - public void setSharedFlag(boolean shared) { - if (shared) - sharedFlag = RfbConstants.SHARED_ACCESS; - else - sharedFlag = RfbConstants.EXCLUSIVE_ACCESS; - } - - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // Server initialization message is at least 24 bytes long + length of - // desktop name - if (!cap(buf, 24, UNLIMITED, link, false)) - return; - - // Read server initialization message - // Read frame buffer size - int framebufferWidth = buf.readUnsignedShort(); - int framebufferHeight = buf.readUnsignedShort(); - - // Read pixel format - int bitsPerPixel = buf.readUnsignedByte(); - int depth = buf.readUnsignedByte(); - - int bigEndianFlag = buf.readUnsignedByte(); - int trueColorFlag = buf.readUnsignedByte(); - - int redMax = buf.readUnsignedShort(); - int greenMax = buf.readUnsignedShort(); - int blueMax = buf.readUnsignedShort(); - - int redShift = buf.readUnsignedByte(); - int greenShift = buf.readUnsignedByte(); - int blueShift = buf.readUnsignedByte(); - - // Skip padding - buf.skipBytes(3); - - // Read desktop name - int length = buf.readSignedInt(); - - // Consume exactly $length bytes, push back any extra bytes - if (!cap(buf, length, length, link, true)) - return; - - String desktopName = buf.readString(length, RfbConstants.US_ASCII_CHARSET); - buf.unref(); - if (verbose) - System.out.println("[" + this + "] INFO: Desktop name: \"" + desktopName + "\", bpp: " + bitsPerPixel + ", depth: " + depth + ", screen size: " - + framebufferWidth + "x" + framebufferHeight + "."); - - // Set screen properties - screen.setFramebufferSize(framebufferWidth, framebufferHeight); - screen.setPixelFormat(bitsPerPixel, depth, bigEndianFlag!=RfbConstants.LITTLE_ENDIAN, trueColorFlag==RfbConstants.TRUE_COLOR, redMax, greenMax, blueMax, redShift, greenShift, blueShift); - screen.setDesktopName(desktopName); - - // If sever screen has different parameters than ours, then change it - if (!screen.isRGB888_32_LE()) { - // Send client pixel format - sendClientPixelFormat(); + declarePads(); } - // Send encodings supported by client - sendSupportedEncodings(); + @Override + protected void declarePads() { + super.declarePads(); + outputPads.put(CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, null); + outputPads.put(CLIENT_PIXEL_FORMAT_ADAPTER_PAD, null); + } - switchOff(); + public ScreenDescription getScreen() { + return screen; + } - } + public void setScreen(ScreenDescription screen) { + this.screen = screen; + } - @Override - protected void onStart() { - ByteBuffer buf = new ByteBuffer(new byte[] { sharedFlag }); - pushDataToOTOut(buf); - } + public void setSharedFlag(boolean shared) { + if (shared) + sharedFlag = RfbConstants.SHARED_ACCESS; + else + sharedFlag = RfbConstants.EXCLUSIVE_ACCESS; + } - private void sendClientPixelFormat() { - pushDataToPad(CLIENT_PIXEL_FORMAT_ADAPTER_PAD, new ByteBuffer(0)); - } + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - private void sendSupportedEncodings() { - pushDataToPad(CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, new ByteBuffer(0)); - } + // Server initialization message is at least 24 bytes long + length of + // desktop name + if (!cap(buf, 24, UNLIMITED, link, false)) + return; - public String toString() { - return "VncInit(" + id + ")"; - } + // Read server initialization message + // Read frame buffer size + int framebufferWidth = buf.readUnsignedShort(); + int framebufferHeight = buf.readUnsignedShort(); - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + // Read pixel format + int bitsPerPixel = buf.readUnsignedByte(); + int depth = buf.readUnsignedByte(); - final String desktopName = "test"; + int bigEndianFlag = buf.readUnsignedByte(); + int trueColorFlag = buf.readUnsignedByte(); - Element source = new MockSource("source") { - { - bufs = ByteBuffer.convertByteArraysToByteBuffers( - // Send screen description - new byte[] { - // Framebuffer width (short) - 0, (byte) 200, - // Framebuffer height (short) - 0, 100, - // Bits per pixel - 32, - // Depth, - 24, - // Endianness flag - RfbConstants.LITTLE_ENDIAN, - // Truecolor flag - RfbConstants.TRUE_COLOR, - // Red max (short) - 0, (byte) 255, - // Green max (short) - 0, (byte) 255, - // Blue max (short) - 0, (byte) 255, - // Red shift - 16, - // Green shift - 8, - // Blue shift - 0, - // Padding - 0, 0, 0, - // Desktop name length (int) - 0, 0, 0, 4, - // Desktop name ("test", 4 bytes) - 't', 'e', 's', 't', + int redMax = buf.readUnsignedShort(); + int greenMax = buf.readUnsignedShort(); + int blueMax = buf.readUnsignedShort(); - // Tail - 1, 2, 3 + int redShift = buf.readUnsignedByte(); + int greenShift = buf.readUnsignedByte(); + int blueShift = buf.readUnsignedByte(); - }, - // Tail packet - new byte[] { 4, 5, 6 }); - } - }; + // Skip padding + buf.skipBytes(3); - ScreenDescription screen = new ScreenDescription(); - final VncInitializer init = new VncInitializer("init", true, screen); - Element initSink = new MockSink("initSink") { - { - // Expect shared flag - bufs = ByteBuffer.convertByteArraysToByteBuffers(new byte[] { RfbConstants.SHARED_ACCESS }); - } - }; - Element mainSink = new MockSink("mainSink") { - { - // Expect two tail packets - bufs = ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3 }, new byte[] { 4, 5, 6 }); - } - }; - ByteBuffer[] emptyBuf = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}); - Element encodingsSink = new MockSink("encodings", emptyBuf); - Element pixelFormatSink = new MockSink("pixel_format", emptyBuf); + // Read desktop name + int length = buf.readSignedInt(); - Pipeline pipeline = new PipelineImpl("test"); - pipeline.addAndLink(source, init, mainSink); - pipeline.add(encodingsSink, pixelFormatSink, initSink); - pipeline.link("init >otout", "initSink"); - pipeline.link("init >" + CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, "encodings"); - pipeline.link("init >" + CLIENT_PIXEL_FORMAT_ADAPTER_PAD, "pixel_format"); + // Consume exactly $length bytes, push back any extra bytes + if (!cap(buf, length, length, link, true)) + return; - pipeline.runMainLoop("source", STDOUT, false, false); + String desktopName = buf.readString(length, RfbConstants.US_ASCII_CHARSET); + buf.unref(); + if (verbose) + System.out.println("[" + this + "] INFO: Desktop name: \"" + desktopName + "\", bpp: " + bitsPerPixel + ", depth: " + depth + ", screen size: " + + framebufferWidth + "x" + framebufferHeight + "."); - if (!screen.isRGB888_32_LE()) - System.err.println("Screen description was read incorrectly: " + screen + "."); - if (!desktopName.equals(screen.getDesktopName())) - System.err.println("Screen desktop name was read incorrectly: \"" + screen.getDesktopName() + "\"."); + // Set screen properties + screen.setFramebufferSize(framebufferWidth, framebufferHeight); + screen.setPixelFormat(bitsPerPixel, depth, bigEndianFlag != RfbConstants.LITTLE_ENDIAN, trueColorFlag == RfbConstants.TRUE_COLOR, redMax, greenMax, blueMax, + redShift, greenShift, blueShift); + screen.setDesktopName(desktopName); - } + // If sever screen has different parameters than ours, then change it + if (!screen.isRGB888_32_LE()) { + // Send client pixel format + sendClientPixelFormat(); + } + + // Send encodings supported by client + sendSupportedEncodings(); + + switchOff(); + + } + + @Override + protected void onStart() { + ByteBuffer buf = new ByteBuffer(new byte[] {sharedFlag}); + pushDataToOTOut(buf); + } + + private void sendClientPixelFormat() { + pushDataToPad(CLIENT_PIXEL_FORMAT_ADAPTER_PAD, new ByteBuffer(0)); + } + + private void sendSupportedEncodings() { + pushDataToPad(CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, new ByteBuffer(0)); + } + + @Override + public String toString() { + return "VncInit(" + id + ")"; + } + + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); + + final String desktopName = "test"; + + Element source = new MockSource("source") { + { + bufs = ByteBuffer.convertByteArraysToByteBuffers( + // Send screen description + new byte[] { + // Framebuffer width (short) + 0, (byte)200, + // Framebuffer height (short) + 0, 100, + // Bits per pixel + 32, + // Depth, + 24, + // Endianness flag + RfbConstants.LITTLE_ENDIAN, + // Truecolor flag + RfbConstants.TRUE_COLOR, + // Red max (short) + 0, (byte)255, + // Green max (short) + 0, (byte)255, + // Blue max (short) + 0, (byte)255, + // Red shift + 16, + // Green shift + 8, + // Blue shift + 0, + // Padding + 0, 0, 0, + // Desktop name length (int) + 0, 0, 0, 4, + // Desktop name ("test", 4 bytes) + 't', 'e', 's', 't', + + // Tail + 1, 2, 3 + + }, + // Tail packet + new byte[] {4, 5, 6}); + } + }; + + ScreenDescription screen = new ScreenDescription(); + final VncInitializer init = new VncInitializer("init", true, screen); + Element initSink = new MockSink("initSink") { + { + // Expect shared flag + bufs = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {RfbConstants.SHARED_ACCESS}); + } + }; + Element mainSink = new MockSink("mainSink") { + { + // Expect two tail packets + bufs = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3}, new byte[] {4, 5, 6}); + } + }; + ByteBuffer[] emptyBuf = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}); + Element encodingsSink = new MockSink("encodings", emptyBuf); + Element pixelFormatSink = new MockSink("pixel_format", emptyBuf); + + Pipeline pipeline = new PipelineImpl("test"); + pipeline.addAndLink(source, init, mainSink); + pipeline.add(encodingsSink, pixelFormatSink, initSink); + pipeline.link("init >otout", "initSink"); + pipeline.link("init >" + CLIENT_SUPPORTED_ENCODINGS_ADAPTER_PAD, "encodings"); + pipeline.link("init >" + CLIENT_PIXEL_FORMAT_ADAPTER_PAD, "pixel_format"); + + pipeline.runMainLoop("source", STDOUT, false, false); + + if (!screen.isRGB888_32_LE()) + System.err.println("Screen description was read incorrectly: " + screen + "."); + if (!desktopName.equals(screen.getDesktopName())) + System.err.println("Screen desktop name was read incorrectly: \"" + screen.getDesktopName() + "\"."); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java index fc20213c1e1..0d4abfe0334 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java @@ -24,396 +24,397 @@ import streamer.MockSink; import streamer.MockSource; import streamer.Pipeline; import streamer.PipelineImpl; - import common.BitmapOrder; import common.BitmapRectangle; import common.CopyRectOrder; import common.ScreenDescription; public class VncMessageHandler extends BaseElement { - protected ScreenDescription screen = null; + protected ScreenDescription screen = null; - // Pad names - public static final String SERVER_BELL_ADAPTER_PAD = "bell"; - public static final String SERVER_CLIPBOARD_ADAPTER_PAD = "clipboard"; - public static final String PIXEL_ADAPTER_PAD = "pixels"; - public static final String FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD = "fbur"; + // Pad names + public static final String SERVER_BELL_ADAPTER_PAD = "bell"; + public static final String SERVER_CLIPBOARD_ADAPTER_PAD = "clipboard"; + public static final String PIXEL_ADAPTER_PAD = "pixels"; + public static final String FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD = "fbur"; - // Keys for metadata - public static final String CLIPBOARD_CONTENT = "content"; - public static final String TARGET_X = "x"; - public static final String TARGET_Y = "y"; - public static final String WIDTH = "width"; - public static final String HEIGHT = "height"; - public static final String SOURCE_X = "srcX"; - public static final String SOURCE_Y = "srcY"; - public static final String PIXEL_FORMAT = "pixel_format"; + // Keys for metadata + public static final String CLIPBOARD_CONTENT = "content"; + public static final String TARGET_X = "x"; + public static final String TARGET_Y = "y"; + public static final String WIDTH = "width"; + public static final String HEIGHT = "height"; + public static final String SOURCE_X = "srcX"; + public static final String SOURCE_Y = "srcY"; + public static final String PIXEL_FORMAT = "pixel_format"; - private static final String NUM_OF_PROCESSED_RECTANGLES = "rects"; - private static final String SAVED_CURSOR_POSITION = "cursor"; + private static final String NUM_OF_PROCESSED_RECTANGLES = "rects"; + private static final String SAVED_CURSOR_POSITION = "cursor"; - // Pixel format: RGB888 LE 32 - public static final String RGB888LE32 = "RGB888LE32"; + // Pixel format: RGB888 LE 32 + public static final String RGB888LE32 = "RGB888LE32"; - public VncMessageHandler(String id, ScreenDescription screen) { - super(id); - this.screen = screen; - declarePads(); - } + public VncMessageHandler(String id, ScreenDescription screen) { + super(id); + this.screen = screen; + declarePads(); + } - private void declarePads() { - outputPads.put(SERVER_BELL_ADAPTER_PAD, null); - outputPads.put(SERVER_BELL_ADAPTER_PAD, null); - outputPads.put(SERVER_CLIPBOARD_ADAPTER_PAD, null); - outputPads.put(PIXEL_ADAPTER_PAD, null); - outputPads.put(FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, null); + private void declarePads() { + outputPads.put(SERVER_BELL_ADAPTER_PAD, null); + outputPads.put(SERVER_BELL_ADAPTER_PAD, null); + outputPads.put(SERVER_CLIPBOARD_ADAPTER_PAD, null); + outputPads.put(PIXEL_ADAPTER_PAD, null); + outputPads.put(FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, null); - inputPads.put("stdin", null); - } + inputPads.put("stdin", null); + } - @Override - public void handleData(ByteBuffer buf, Link link) { - if (buf == null) - return; + @Override + public void handleData(ByteBuffer buf, Link link) { + if (buf == null) + return; - try { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + try { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - if (!cap(buf, 1, UNLIMITED, link, false)) - return; + if (!cap(buf, 1, UNLIMITED, link, false)) + return; - // Read server message type - int messageType = buf.readUnsignedByte(); + // Read server message type + int messageType = buf.readUnsignedByte(); - // Invoke packet handler by packet type. - switch (messageType) { + // Invoke packet handler by packet type. + switch (messageType) { - case RfbConstants.SERVER_FRAMEBUFFER_UPDATE: { - // Handle frame buffer update - if (!handleFBU(buf, link)) - return; + case RfbConstants.SERVER_FRAMEBUFFER_UPDATE: { + // Handle frame buffer update + if (!handleFBU(buf, link)) + return; - // Frame buffer update is received and fully processed, send request for - // another frame buffer update to server. + // Frame buffer update is received and fully processed, send request for + // another frame buffer update to server. + sendFBUR(); + + break; + } + + case RfbConstants.SERVER_BELL: { + if (!handleBell(buf, link)) + return; + break; + } + + case RfbConstants.SERVER_CUT_TEXT: { + if (!handleClipboard(buf, link)) + return; + break; + } + + default: + // TODO: allow to extend functionality + throw new RuntimeException("Unknown server packet type: " + messageType + "."); + } + + // Cut tail, if any + cap(buf, 0, 0, link, true); + } finally { + + // Return processed buffer back to pool + buf.unref(); + } + } + + private boolean handleClipboard(ByteBuffer buf, Link link) { + if (!cap(buf, 3 + 4, UNLIMITED, link, true)) + return false; + + // Skip padding + buf.skipBytes(3); + + // Read text length + int length = buf.readSignedInt(); + + // We need full string to parse it + if (!cap(buf, length, UNLIMITED, link, true)) + return false; + + String content = buf.readString(length, RfbConstants.US_ASCII_CHARSET); + + // Send content in metadata + ByteBuffer outBuf = new ByteBuffer(0); + outBuf.putMetadata(CLIPBOARD_CONTENT, content); + + pushDataToPad(SERVER_CLIPBOARD_ADAPTER_PAD, outBuf); + + return true; + } + + private boolean handleBell(ByteBuffer buf, Link link) { + // Send empty packet to bell adapter to produce bell + pushDataToPad(SERVER_BELL_ADAPTER_PAD, new ByteBuffer(0)); + + return true; + } + + // FIXME: this method is too complex + private boolean handleFBU(ByteBuffer buf, Link link) { + + // We need at least 3 bytes here, 1 - padding, 2 - number of rectangles + if (!cap(buf, 3, UNLIMITED, link, true)) + return false; + + buf.skipBytes(1);// Skip padding + + // Read number of rectangles + int numberOfRectangles = buf.readUnsignedShort(); + + if (verbose) + System.out.println("[" + this + "] INFO: Frame buffer update. Number of rectangles: " + numberOfRectangles + "."); + + // Each rectangle must have header at least, header length is 12 bytes. + if (!cap(buf, 12 * numberOfRectangles, UNLIMITED, link, true)) + return false; + + // For all rectangles + + // Restore saved point, to avoid flickering and performance problems when + // frame buffer update is split between few incoming packets. + int numberOfProcessedRectangles = (buf.getMetadata(NUM_OF_PROCESSED_RECTANGLES) != null) ? (Integer)buf.getMetadata(NUM_OF_PROCESSED_RECTANGLES) : 0; + if (buf.getMetadata(SAVED_CURSOR_POSITION) != null) + buf.cursor = (Integer)buf.getMetadata(SAVED_CURSOR_POSITION); + + if (verbose && numberOfProcessedRectangles > 0) + System.out.println("[" + this + "] INFO: Restarting from saved point. Number of already processed rectangles: " + numberOfRectangles + ", cursor: " + + buf.cursor + "."); + + // For all new rectangles + for (int i = numberOfProcessedRectangles; i < numberOfRectangles; i++) { + + // We need coordinates of rectangle (2x4 bytes) and encoding type (4 + // bytes) + if (!cap(buf, 12, UNLIMITED, link, true)) + return false; + + // Read coordinates of rectangle + int x = buf.readUnsignedShort(); + int y = buf.readUnsignedShort(); + int width = buf.readUnsignedShort(); + int height = buf.readUnsignedShort(); + + // Read rectangle encoding + int encodingType = buf.readSignedInt(); + + // Process rectangle + switch (encodingType) { + + case RfbConstants.ENCODING_RAW: { + if (!handleRawRectangle(buf, link, x, y, width, height)) + return false; + break; + } + + case RfbConstants.ENCODING_COPY_RECT: { + if (!handleCopyRect(buf, link, x, y, width, height)) + return false; + break; + } + + case RfbConstants.ENCODING_DESKTOP_SIZE: { + if (!handleScreenSizeChangeRect(buf, link, x, y, width, height)) + return false; + break; + } + + default: + // TODO: allow to extend functionality + throw new RuntimeException("Unsupported ecnoding: " + encodingType + "."); + } + + // Update information about processed rectangles to avoid handling of same + // rectangle multiple times. + // TODO: push back partial rectangle only instead + buf.putMetadata(NUM_OF_PROCESSED_RECTANGLES, ++numberOfProcessedRectangles); + buf.putMetadata(SAVED_CURSOR_POSITION, buf.cursor); + } + + return true; + } + + private boolean handleScreenSizeChangeRect(ByteBuffer buf, Link link, int x, int y, int width, int height) { + // Remote screen size is changed + if (verbose) + System.out.println("[" + this + "] INFO: Screen size rect. Width: " + width + ", height: " + height + "."); + + screen.setFramebufferSize(width, height); + + return true; + } + + private boolean handleCopyRect(ByteBuffer buf, Link link, int x, int y, int width, int height) { + // Copy rectangle from one part of screen to another. + // Areas may overlap. Antialiasing may cause visible artifacts. + + // We need 4 bytes with coordinates of source rectangle + if (!cap(buf, 4, UNLIMITED, link, true)) + return false; + + CopyRectOrder order = new CopyRectOrder(); + + order.srcX = buf.readUnsignedShort(); + order.srcY = buf.readUnsignedShort(); + order.x = x; + order.y = y; + order.width = width; + order.height = height; + + if (verbose) + System.out.println("[" + this + "] INFO: Copy rect. X: " + x + ", y: " + y + ", width: " + width + ", height: " + height + ", srcX: " + order.srcX + + ", srcY: " + order.srcY + "."); + + pushDataToPad(PIXEL_ADAPTER_PAD, new ByteBuffer(order)); + + return true; + } + + private boolean handleRawRectangle(ByteBuffer buf, Link link, int x, int y, int width, int height) { + // Raw rectangle is just array of pixels to draw on screen. + int rectDataLength = width * height * screen.getBytesPerPixel(); + + // We need at least rectDataLength bytes. Extra bytes may contain other + // rectangles. + if (!cap(buf, rectDataLength, UNLIMITED, link, true)) + return false; + + if (verbose) + System.out.println("[" + this + "] INFO: Raw rect. X: " + x + ", y: " + y + ", width: " + width + ", height: " + height + ", data length: " + rectDataLength + + "."); + + BitmapRectangle rectangle = new BitmapRectangle(); + rectangle.x = x; + rectangle.y = y; + rectangle.width = width; + rectangle.height = height; + rectangle.bufferWidth = width; + rectangle.bufferHeight = height; + rectangle.bitmapDataStream = buf.readBytes(rectDataLength); + rectangle.colorDepth = screen.getColorDeph(); + + BitmapOrder order = new BitmapOrder(); + order.rectangles = new BitmapRectangle[] {rectangle}; + + pushDataToPad(PIXEL_ADAPTER_PAD, new ByteBuffer(order)); + return true; + } + + @Override + public void onStart() { + // Send Frame Buffer Update request sendFBUR(); - - break; - } - - case RfbConstants.SERVER_BELL: { - if (!handleBell(buf, link)) - return; - break; - } - - case RfbConstants.SERVER_CUT_TEXT: { - if (!handleClipboard(buf, link)) - return; - break; - } - - default: - // TODO: allow to extend functionality - throw new RuntimeException("Unknown server packet type: " + messageType + "."); - } - - // Cut tail, if any - cap(buf, 0, 0, link, true); - } finally { - - // Return processed buffer back to pool - buf.unref(); - } - } - - private boolean handleClipboard(ByteBuffer buf, Link link) { - if (!cap(buf, 3 + 4, UNLIMITED, link, true)) - return false; - - // Skip padding - buf.skipBytes(3); - - // Read text length - int length = buf.readSignedInt(); - - // We need full string to parse it - if (!cap(buf, length, UNLIMITED, link, true)) - return false; - - String content = buf.readString(length, RfbConstants.US_ASCII_CHARSET); - - // Send content in metadata - ByteBuffer outBuf = new ByteBuffer(0); - outBuf.putMetadata(CLIPBOARD_CONTENT, content); - - pushDataToPad(SERVER_CLIPBOARD_ADAPTER_PAD, outBuf); - - return true; - } - - private boolean handleBell(ByteBuffer buf, Link link) { - // Send empty packet to bell adapter to produce bell - pushDataToPad(SERVER_BELL_ADAPTER_PAD, new ByteBuffer(0)); - - return true; - } - - // FIXME: this method is too complex - private boolean handleFBU(ByteBuffer buf, Link link) { - - // We need at least 3 bytes here, 1 - padding, 2 - number of rectangles - if (!cap(buf, 3, UNLIMITED, link, true)) - return false; - - buf.skipBytes(1);// Skip padding - - // Read number of rectangles - int numberOfRectangles = buf.readUnsignedShort(); - - if (verbose) - System.out.println("[" + this + "] INFO: Frame buffer update. Number of rectangles: " + numberOfRectangles + "."); - - // Each rectangle must have header at least, header length is 12 bytes. - if (!cap(buf, 12 * numberOfRectangles, UNLIMITED, link, true)) - return false; - - // For all rectangles - - // Restore saved point, to avoid flickering and performance problems when - // frame buffer update is split between few incoming packets. - int numberOfProcessedRectangles = (buf.getMetadata(NUM_OF_PROCESSED_RECTANGLES) != null) ? (Integer) buf.getMetadata(NUM_OF_PROCESSED_RECTANGLES) : 0; - if (buf.getMetadata(SAVED_CURSOR_POSITION) != null) - buf.cursor = (Integer) buf.getMetadata(SAVED_CURSOR_POSITION); - - if (verbose && numberOfProcessedRectangles > 0) - System.out.println("[" + this + "] INFO: Restarting from saved point. Number of already processed rectangles: " + numberOfRectangles + ", cursor: " - + buf.cursor + "."); - - // For all new rectangles - for (int i = numberOfProcessedRectangles; i < numberOfRectangles; i++) { - - // We need coordinates of rectangle (2x4 bytes) and encoding type (4 - // bytes) - if (!cap(buf, 12, UNLIMITED, link, true)) - return false; - - // Read coordinates of rectangle - int x = buf.readUnsignedShort(); - int y = buf.readUnsignedShort(); - int width = buf.readUnsignedShort(); - int height = buf.readUnsignedShort(); - - // Read rectangle encoding - int encodingType = buf.readSignedInt(); - - // Process rectangle - switch (encodingType) { - - case RfbConstants.ENCODING_RAW: { - if (!handleRawRectangle(buf, link, x, y, width, height)) - return false; - break; - } - - case RfbConstants.ENCODING_COPY_RECT: { - if (!handleCopyRect(buf, link, x, y, width, height)) - return false; - break; - } - - case RfbConstants.ENCODING_DESKTOP_SIZE: { - if (!handleScreenSizeChangeRect(buf, link, x, y, width, height)) - return false; - break; - } - - default: - // TODO: allow to extend functionality - throw new RuntimeException("Unsupported ecnoding: " + encodingType + "."); - } - - // Update information about processed rectangles to avoid handling of same - // rectangle multiple times. - // TODO: push back partial rectangle only instead - buf.putMetadata(NUM_OF_PROCESSED_RECTANGLES, ++numberOfProcessedRectangles); - buf.putMetadata(SAVED_CURSOR_POSITION, buf.cursor); } - return true; - } + private void sendFBUR() { + ByteBuffer buf = new ByteBuffer(0); + buf.putMetadata("incremental", true); + pushDataToPad(FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, buf); + } - private boolean handleScreenSizeChangeRect(ByteBuffer buf, Link link, int x, int y, int width, int height) { - // Remote screen size is changed - if (verbose) - System.out.println("[" + this + "] INFO: Screen size rect. Width: " + width + ", height: " + height + "."); + @Override + public String toString() { + return "VNCMessageHandler(" + id + ")"; + } - screen.setFramebufferSize(width, height); + /** + * Example. + */ + public static void main(String[] args) { - return true; - } + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - private boolean handleCopyRect(ByteBuffer buf, Link link, int x, int y, int width, int height) { - // Copy rectangle from one part of screen to another. - // Areas may overlap. Antialiasing may cause visible artifacts. + Element source = new MockSource("source") { + { + // Split messages at random boundaries to check "pushback" logic + bufs = + ByteBuffer.convertByteArraysToByteBuffers(new byte[] { + // Message type: server bell + RfbConstants.SERVER_BELL, - // We need 4 bytes with coordinates of source rectangle - if (!cap(buf, 4, UNLIMITED, link, true)) - return false; + // Message type: clipboard text + RfbConstants.SERVER_CUT_TEXT, + // Padding + 0, 0, 0, + // Length (test) + 0, 0, 0, 4, - CopyRectOrder order = new CopyRectOrder(); + }, new byte[] { + // Clipboard text + 't', 'e', 's', 't', - order.srcX = buf.readUnsignedShort(); - order.srcY = buf.readUnsignedShort(); - order.x = x; - order.y = y; - order.width = width; - order.height = height; + // Message type: frame buffer update + RfbConstants.SERVER_FRAMEBUFFER_UPDATE, + // Padding + 0, + // Number of rectangles + 0, 3,}, - if (verbose) - System.out.println("[" + this + "] INFO: Copy rect. X: " + x + ", y: " + y + ", width: " + width + ", height: " + height + ", srcX: " + order.srcX - + ", srcY: " + order.srcY + "."); + new byte[] { - pushDataToPad(PIXEL_ADAPTER_PAD, new ByteBuffer(order)); + // x, y, width, height: 0x0@4x4 + 0, 0, 0, 0, 0, 4, 0, 4, + // Encoding: desktop size + (byte)((RfbConstants.ENCODING_DESKTOP_SIZE >> 24) & 0xff), (byte)((RfbConstants.ENCODING_DESKTOP_SIZE >> 16) & 0xff), + (byte)((RfbConstants.ENCODING_DESKTOP_SIZE >> 8) & 0xff), (byte)((RfbConstants.ENCODING_DESKTOP_SIZE >> 0) & 0xff),}, - return true; - } + new byte[] { - private boolean handleRawRectangle(ByteBuffer buf, Link link, int x, int y, int width, int height) { - // Raw rectangle is just array of pixels to draw on screen. - int rectDataLength = width * height * screen.getBytesPerPixel(); + // x, y, width, height: 0x0@4x4 + 0, 0, 0, 0, 0, 4, 0, 4, + // Encoding: raw rect + (byte)((RfbConstants.ENCODING_RAW >> 24) & 0xff), (byte)((RfbConstants.ENCODING_RAW >> 16) & 0xff), + (byte)((RfbConstants.ENCODING_RAW >> 8) & 0xff), (byte)((RfbConstants.ENCODING_RAW >> 0) & 0xff), + // Raw pixel data 4x4x1 bpp + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,}, new byte[] {11, 12, 13, 14, 15, 16, - // We need at least rectDataLength bytes. Extra bytes may contain other - // rectangles. - if (!cap(buf, rectDataLength, UNLIMITED, link, true)) - return false; + // x, y, width, height: 0x0@2x2 + 0, 0, 0, 0, 0, 2, 0, 2, + // Encoding: copy rect + (byte)((RfbConstants.ENCODING_COPY_RECT >> 24) & 0xff), (byte)((RfbConstants.ENCODING_COPY_RECT >> 16) & 0xff), + (byte)((RfbConstants.ENCODING_COPY_RECT >> 8) & 0xff), (byte)((RfbConstants.ENCODING_COPY_RECT >> 0) & 0xff), + // srcX, srcY: 2x2 + 0, 2, 0, 2,}); + } + }; - if (verbose) - System.out.println("[" + this + "] INFO: Raw rect. X: " + x + ", y: " + y + ", width: " + width + ", height: " + height + ", data length: " - + rectDataLength + "."); + ScreenDescription screen = new ScreenDescription() { + { + this.bytesPerPixel = 1; + } + }; - BitmapRectangle rectangle = new BitmapRectangle(); - rectangle.x = x; - rectangle.y = y; - rectangle.width = width; - rectangle.height = height; - rectangle.bufferWidth = width; - rectangle.bufferHeight = height; - rectangle.bitmapDataStream = buf.readBytes(rectDataLength); - rectangle.colorDepth=screen.getColorDeph(); + final Element handler = new VncMessageHandler("handler", screen); - BitmapOrder order = new BitmapOrder(); - order.rectangles = new BitmapRectangle[] { rectangle }; + ByteBuffer[] emptyBuf = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}); + Element fburSink = new MockSink("fbur", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}, new byte[] {})); + Element bellSink = new MockSink("bell", emptyBuf); + Element clipboardSink = new MockSink("clipboard", emptyBuf); + Element desktopSizeChangeSink = new MockSink("desktop_size", emptyBuf); + Element pixelsSink = new MockSink("pixels", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,})); + Element copyRectSink = new MockSink("copy_rect", emptyBuf); - pushDataToPad(PIXEL_ADAPTER_PAD, new ByteBuffer(order)); - return true; - } + Pipeline pipeline = new PipelineImpl("test"); + pipeline.addAndLink(source, handler); + pipeline.add(fburSink, bellSink, clipboardSink, desktopSizeChangeSink, pixelsSink, copyRectSink); - public void onStart() { - // Send Frame Buffer Update request - sendFBUR(); - } + pipeline.link("handler >" + FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, "fbur"); + pipeline.link("handler >" + SERVER_BELL_ADAPTER_PAD, "bell"); + pipeline.link("handler >" + SERVER_CLIPBOARD_ADAPTER_PAD, "clipboard"); + pipeline.link("handler >" + PIXEL_ADAPTER_PAD, "pixels"); - private void sendFBUR() { - ByteBuffer buf = new ByteBuffer(0); - buf.putMetadata("incremental", true); - pushDataToPad(FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, buf); - } + pipeline.runMainLoop("source", STDOUT, false, false); - public String toString() { - return "VNCMessageHandler(" + id + ")"; - } - - /** - * Example. - */ - public static void main(String[] args) { - - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); - - Element source = new MockSource("source") { - { - // Split messages at random boundaries to check "pushback" logic - bufs = ByteBuffer.convertByteArraysToByteBuffers(new byte[] { - // Message type: server bell - RfbConstants.SERVER_BELL, - - // Message type: clipboard text - RfbConstants.SERVER_CUT_TEXT, - // Padding - 0, 0, 0, - // Length (test) - 0, 0, 0, 4, - - }, new byte[] { - // Clipboard text - 't', 'e', 's', 't', - - // Message type: frame buffer update - RfbConstants.SERVER_FRAMEBUFFER_UPDATE, - // Padding - 0, - // Number of rectangles - 0, 3, }, - - new byte[] { - - // x, y, width, height: 0x0@4x4 - 0, 0, 0, 0, 0, 4, 0, 4, - // Encoding: desktop size - (byte) ((RfbConstants.ENCODING_DESKTOP_SIZE >> 24) & 0xff), (byte) ((RfbConstants.ENCODING_DESKTOP_SIZE >> 16) & 0xff), - (byte) ((RfbConstants.ENCODING_DESKTOP_SIZE >> 8) & 0xff), (byte) ((RfbConstants.ENCODING_DESKTOP_SIZE >> 0) & 0xff), }, - - new byte[] { - - // x, y, width, height: 0x0@4x4 - 0, 0, 0, 0, 0, 4, 0, 4, - // Encoding: raw rect - (byte) ((RfbConstants.ENCODING_RAW >> 24) & 0xff), (byte) ((RfbConstants.ENCODING_RAW >> 16) & 0xff), - (byte) ((RfbConstants.ENCODING_RAW >> 8) & 0xff), (byte) ((RfbConstants.ENCODING_RAW >> 0) & 0xff), - // Raw pixel data 4x4x1 bpp - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, }, new byte[] { 11, 12, 13, 14, 15, 16, - - // x, y, width, height: 0x0@2x2 - 0, 0, 0, 0, 0, 2, 0, 2, - // Encoding: copy rect - (byte) ((RfbConstants.ENCODING_COPY_RECT >> 24) & 0xff), (byte) ((RfbConstants.ENCODING_COPY_RECT >> 16) & 0xff), - (byte) ((RfbConstants.ENCODING_COPY_RECT >> 8) & 0xff), (byte) ((RfbConstants.ENCODING_COPY_RECT >> 0) & 0xff), - // srcX, srcY: 2x2 - 0, 2, 0, 2, }); - } - }; - - ScreenDescription screen = new ScreenDescription() { - { - this.bytesPerPixel = 1; - } - }; - - final Element handler = new VncMessageHandler("handler", screen); - - ByteBuffer[] emptyBuf = ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}); - Element fburSink = new MockSink("fbur", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {}, new byte[] {})); - Element bellSink = new MockSink("bell", emptyBuf); - Element clipboardSink = new MockSink("clipboard", emptyBuf); - Element desktopSizeChangeSink = new MockSink("desktop_size", emptyBuf); - Element pixelsSink = new MockSink("pixels", - ByteBuffer.convertByteArraysToByteBuffers(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, })); - Element copyRectSink = new MockSink("copy_rect", emptyBuf); - - Pipeline pipeline = new PipelineImpl("test"); - pipeline.addAndLink(source, handler); - pipeline.add(fburSink, bellSink, clipboardSink, desktopSizeChangeSink, pixelsSink, copyRectSink); - - pipeline.link("handler >" + FRAME_BUFFER_UPDATE_REQUEST_ADAPTER_PAD, "fbur"); - pipeline.link("handler >" + SERVER_BELL_ADAPTER_PAD, "bell"); - pipeline.link("handler >" + SERVER_CLIPBOARD_ADAPTER_PAD, "clipboard"); - pipeline.link("handler >" + PIXEL_ADAPTER_PAD, "pixels"); - - pipeline.runMainLoop("source", STDOUT, false, false); - - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java index 18abbc5bef8..e810fdc0625 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java @@ -35,257 +35,258 @@ import streamer.PipelineImpl; public class Vnc_3_3_Authentication extends OneTimeSwitch { - /** - * Password to use when authentication is required. - */ - protected String password = null; + /** + * Password to use when authentication is required. + */ + protected String password = null; - /** - * Authentication stage: - *
    - *
  • 0 - challenge received, response must be sent - *
  • 1 - authentication result received. - *
- */ - protected int stage = 0; + /** + * Authentication stage: + *
    + *
  • 0 - challenge received, response must be sent + *
  • 1 - authentication result received. + *
+ */ + protected int stage = 0; - public Vnc_3_3_Authentication(String id) { - super(id); - } - - public Vnc_3_3_Authentication(String id, String password) { - super(id); - this.password = password; - } - - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - switch (stage) { - case 0: // Read security with optional challenge and response - stage0(buf, link); - - break; - case 1: // Read authentication response - stage1(buf, link); - break; + public Vnc_3_3_Authentication(String id) { + super(id); } - } - - /** - * Read security type. If connection type is @see - * RfbConstants.CONNECTION_FAILED, then throw exception. If connection type is @see - * RfbConstants.NO_AUTH, then switch off this element. If connection type is @see - * RfbConstants.VNC_AUTH, then read challenge, send encoded password, and read - * authentication response. - */ - private void stage0(ByteBuffer buf, Link link) { - // At least 4 bytes are necessary - if (!cap(buf, 4, UNLIMITED, link, true)) - return; - - // Read security type - int authType = buf.readSignedInt(); - - switch (authType) { - case RfbConstants.CONNECTION_FAILED: { - // Server forbids to connect. Read reason and throw exception - - int length = buf.readSignedInt(); - String reason = new String(buf.data, buf.offset, length, RfbConstants.US_ASCII_CHARSET); - - throw new RuntimeException("Authentication to VNC server is failed. Reason: " + reason); + public Vnc_3_3_Authentication(String id, String password) { + super(id); + this.password = password; } - case RfbConstants.NO_AUTH: { - // Client can connect without authorization. Nothing to do. - // Switch off this element from circuit - switchOff(); - break; + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); + + switch (stage) { + case 0: // Read security with optional challenge and response + stage0(buf, link); + + break; + case 1: // Read authentication response + stage1(buf, link); + break; + } + } - case RfbConstants.VNC_AUTH: { - // Read challenge and generate response - responseToChallenge(buf, link); - break; + /** + * Read security type. If connection type is @see + * RfbConstants.CONNECTION_FAILED, then throw exception. If connection type is @see + * RfbConstants.NO_AUTH, then switch off this element. If connection type is @see + * RfbConstants.VNC_AUTH, then read challenge, send encoded password, and read + * authentication response. + */ + private void stage0(ByteBuffer buf, Link link) { + // At least 4 bytes are necessary + if (!cap(buf, 4, UNLIMITED, link, true)) + return; + + // Read security type + int authType = buf.readSignedInt(); + + switch (authType) { + case RfbConstants.CONNECTION_FAILED: { + // Server forbids to connect. Read reason and throw exception + + int length = buf.readSignedInt(); + String reason = new String(buf.data, buf.offset, length, RfbConstants.US_ASCII_CHARSET); + + throw new RuntimeException("Authentication to VNC server is failed. Reason: " + reason); + } + + case RfbConstants.NO_AUTH: { + // Client can connect without authorization. Nothing to do. + // Switch off this element from circuit + switchOff(); + break; + } + + case RfbConstants.VNC_AUTH: { + // Read challenge and generate response + responseToChallenge(buf, link); + break; + } + + default: + throw new RuntimeException("Unsupported VNC protocol authorization scheme, scheme code: " + authType + "."); + } + } - default: - throw new RuntimeException("Unsupported VNC protocol authorization scheme, scheme code: " + authType + "."); + private void responseToChallenge(ByteBuffer buf, Link link) { + // Challenge is exactly 16 bytes long + if (!cap(buf, 16, 16, link, true)) + return; + + ByteBuffer challenge = buf.slice(buf.cursor, 16, true); + buf.unref(); + + // Encode challenge with password + ByteBuffer response; + try { + response = encodePassword(challenge, password); + challenge.unref(); + } catch (Exception e) { + throw new RuntimeException("Cannot encrypt client password to send to server: " + e.getMessage()); + } + + if (verbose) { + response.putMetadata("sender", this); + } + + // Send encoded challenge + nextStage(); + pushDataToOTOut(response); + } - } + private void nextStage() { + stage++; - private void responseToChallenge(ByteBuffer buf, Link link) { - // Challenge is exactly 16 bytes long - if (!cap(buf, 16, 16, link, true)) - return; - - ByteBuffer challenge = buf.slice(buf.cursor, 16, true); - buf.unref(); - - // Encode challenge with password - ByteBuffer response; - try { - response = encodePassword(challenge, password); - challenge.unref(); - } catch (Exception e) { - throw new RuntimeException("Cannot encrypt client password to send to server: " + e.getMessage()); + if (verbose) + System.out.println("[" + this + "] INFO: Next stage: " + stage + "."); } - if (verbose) { - response.putMetadata("sender", this); + /** + * Encode password using DES encryption with given challenge. + * + * @param challenge + * a random set of bytes. + * @param password + * a password + * @return DES hash of password and challenge + */ + public ByteBuffer encodePassword(ByteBuffer challenge, String password) { + if (challenge.length != 16) + throw new RuntimeException("Challenge must be exactly 16 bytes long."); + + // VNC password consist of up to eight ASCII characters. + byte[] key = {0, 0, 0, 0, 0, 0, 0, 0}; // Padding + byte[] passwordAsciiBytes = password.getBytes(RfbConstants.US_ASCII_CHARSET); + System.arraycopy(passwordAsciiBytes, 0, key, 0, Math.min(password.length(), 8)); + + // Flip bytes (reverse bits) in key + for (int i = 0; i < key.length; i++) { + key[i] = flipByte(key[i]); + } + + try { + KeySpec desKeySpec = new DESKeySpec(key); + SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("DES"); + SecretKey secretKey = secretKeyFactory.generateSecret(desKeySpec); + Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding"); + cipher.init(Cipher.ENCRYPT_MODE, secretKey); + + ByteBuffer buf = new ByteBuffer(cipher.doFinal(challenge.data, challenge.offset, challenge.length)); + + return buf; + } catch (Exception e) { + throw new RuntimeException("Cannot encode password.", e); + } } - // Send encoded challenge - nextStage(); - pushDataToOTOut(response); - - } - - private void nextStage() { - stage++; - - if (verbose) - System.out.println("[" + this + "] INFO: Next stage: " + stage + "."); - } - - /** - * Encode password using DES encryption with given challenge. - * - * @param challenge - * a random set of bytes. - * @param password - * a password - * @return DES hash of password and challenge - */ - public ByteBuffer encodePassword(ByteBuffer challenge, String password) { - if (challenge.length != 16) - throw new RuntimeException("Challenge must be exactly 16 bytes long."); - - // VNC password consist of up to eight ASCII characters. - byte[] key = { 0, 0, 0, 0, 0, 0, 0, 0 }; // Padding - byte[] passwordAsciiBytes = password.getBytes(RfbConstants.US_ASCII_CHARSET); - System.arraycopy(passwordAsciiBytes, 0, key, 0, Math.min(password.length(), 8)); - - // Flip bytes (reverse bits) in key - for (int i = 0; i < key.length; i++) { - key[i] = flipByte(key[i]); + /** + * Reverse bits in byte, so least significant bit will be most significant + * bit. E.g. 01001100 will become 00110010. + * + * See also: http://www.vidarholen.net/contents/junk/vnc.html , + * http://bytecrafter .blogspot.com/2010/09/des-encryption-as-used-in-vnc.html + * + * @param b + * a byte + * @return byte in reverse order + */ + private static byte flipByte(byte b) { + int b1_8 = (b & 0x1) << 7; + int b2_7 = (b & 0x2) << 5; + int b3_6 = (b & 0x4) << 3; + int b4_5 = (b & 0x8) << 1; + int b5_4 = (b & 0x10) >>> 1; + int b6_3 = (b & 0x20) >>> 3; + int b7_2 = (b & 0x40) >>> 5; + int b8_1 = (b & 0x80) >>> 7; + byte c = (byte)(b1_8 | b2_7 | b3_6 | b4_5 | b5_4 | b6_3 | b7_2 | b8_1); + return c; } - try { - KeySpec desKeySpec = new DESKeySpec(key); - SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("DES"); - SecretKey secretKey = secretKeyFactory.generateSecret(desKeySpec); - Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding"); - cipher.init(Cipher.ENCRYPT_MODE, secretKey); + /** + * Read authentication result, send nothing. + */ + private void stage1(ByteBuffer buf, Link link) { + // Read authentication response + if (!cap(buf, 4, 4, link, false)) + return; - ByteBuffer buf = new ByteBuffer(cipher.doFinal(challenge.data, challenge.offset, challenge.length)); + int authResult = buf.readSignedInt(); - return buf; - } catch (Exception e) { - throw new RuntimeException("Cannot encode password.", e); - } - } + switch (authResult) { + case RfbConstants.VNC_AUTH_OK: { + // Nothing to do + if (verbose) + System.out.println("[" + this + "] INFO: Authentication successfull."); + break; + } - /** - * Reverse bits in byte, so least significant bit will be most significant - * bit. E.g. 01001100 will become 00110010. - * - * See also: http://www.vidarholen.net/contents/junk/vnc.html , - * http://bytecrafter .blogspot.com/2010/09/des-encryption-as-used-in-vnc.html - * - * @param b - * a byte - * @return byte in reverse order - */ - private static byte flipByte(byte b) { - int b1_8 = (b & 0x1) << 7; - int b2_7 = (b & 0x2) << 5; - int b3_6 = (b & 0x4) << 3; - int b4_5 = (b & 0x8) << 1; - int b5_4 = (b & 0x10) >>> 1; - int b6_3 = (b & 0x20) >>> 3; - int b7_2 = (b & 0x40) >>> 5; - int b8_1 = (b & 0x80) >>> 7; - byte c = (byte) (b1_8 | b2_7 | b3_6 | b4_5 | b5_4 | b6_3 | b7_2 | b8_1); - return c; - } + case RfbConstants.VNC_AUTH_TOO_MANY: + throw new RuntimeException("Connection to VNC server failed: too many wrong attempts."); - /** - * Read authentication result, send nothing. - */ - private void stage1(ByteBuffer buf, Link link) { - // Read authentication response - if (!cap(buf, 4, 4, link, false)) - return; + case RfbConstants.VNC_AUTH_FAILED: + throw new RuntimeException("Connection to VNC server failed: wrong password."); - int authResult = buf.readSignedInt(); + default: + throw new RuntimeException("Connection to VNC server failed, reason code: " + authResult); + } + + switchOff(); - switch (authResult) { - case RfbConstants.VNC_AUTH_OK: { - // Nothing to do - if (verbose) - System.out.println("[" + this + "] INFO: Authentication successfull."); - break; } - case RfbConstants.VNC_AUTH_TOO_MANY: - throw new RuntimeException("Connection to VNC server failed: too many wrong attempts."); - - case RfbConstants.VNC_AUTH_FAILED: - throw new RuntimeException("Connection to VNC server failed: wrong password."); - - default: - throw new RuntimeException("Connection to VNC server failed, reason code: " + authResult); + @Override + public String toString() { + return "VNC3.3 Authentication(" + id + ")"; } - switchOff(); + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - } + final String password = "test"; - public String toString() { - return "VNC3.3 Authentication(" + id + ")"; - } + Element source = new MockSource("source") { + { + bufs = ByteBuffer.convertByteArraysToByteBuffers( + // Request authentication and send 16 byte challenge + new byte[] {0, 0, 0, RfbConstants.VNC_AUTH, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, + // Respond to challenge with AUTH_OK + new byte[] {0, 0, 0, RfbConstants.VNC_AUTH_OK}); + } + }; - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + Element mainSink = new FakeSink("mainSink"); + final Vnc_3_3_Authentication auth = new Vnc_3_3_Authentication("auth", password); + Element initSink = new MockSink("initSink") { + { + // Expect encoded password + bufs = new ByteBuffer[] {auth.encodePassword(new ByteBuffer(new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), password)}; + } + }; - final String password = "test"; + Pipeline pipeline = new PipelineImpl("test"); + pipeline.addAndLink(source, auth, mainSink); + pipeline.add(initSink); + pipeline.link("auth >otout", "initSink"); - Element source = new MockSource("source") { - { - bufs = ByteBuffer.convertByteArraysToByteBuffers( - // Request authentication and send 16 byte challenge - new byte[] { 0, 0, 0, RfbConstants.VNC_AUTH, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, - // Respond to challenge with AUTH_OK - new byte[] { 0, 0, 0, RfbConstants.VNC_AUTH_OK }); - } - }; + pipeline.runMainLoop("source", STDOUT, false, false); - Element mainSink = new FakeSink("mainSink"); - final Vnc_3_3_Authentication auth = new Vnc_3_3_Authentication("auth", password); - Element initSink = new MockSink("initSink") { - { - // Expect encoded password - bufs = new ByteBuffer[] { auth.encodePassword(new ByteBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }), password) }; - } - }; - - Pipeline pipeline = new PipelineImpl("test"); - pipeline.addAndLink(source, auth, mainSink); - pipeline.add(initSink); - pipeline.link("auth >otout", "initSink"); - - pipeline.runMainLoop("source", STDOUT, false, false); - - } + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Hello.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Hello.java index 323380b047f..1a65a9933fa 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Hello.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Hello.java @@ -35,81 +35,82 @@ import streamer.PipelineImpl; */ public class Vnc_3_3_Hello extends OneTimeSwitch { - public Vnc_3_3_Hello(String id) { - super(id); - } - - @Override - protected void handleOneTimeData(ByteBuffer buf, Link link) { - if (verbose) - System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - - // Initial packet is exactly 12 bytes long - if (!cap(buf, 12, 12, link, false)) - return; - - // Read protocol version - String rfbProtocol = new String(buf.data, buf.offset, buf.length, RfbConstants.US_ASCII_CHARSET); - buf.unref(); - - // Server should use RFB protocol 3.x - if (!rfbProtocol.contains(RfbConstants.RFB_PROTOCOL_VERSION_MAJOR)) - throw new RuntimeException("Cannot handshake with VNC server. Unsupported protocol version: \"" + rfbProtocol + "\"."); - - // Send response: we support RFB 3.3 only - String ourProtocolString = RfbConstants.RFB_PROTOCOL_VERSION + "\n"; - - ByteBuffer outBuf = new ByteBuffer(ourProtocolString.getBytes(RfbConstants.US_ASCII_CHARSET)); - - if (verbose) { - outBuf.putMetadata("sender", this); - outBuf.putMetadata("version", RfbConstants.RFB_PROTOCOL_VERSION); + public Vnc_3_3_Hello(String id) { + super(id); } - pushDataToOTOut(outBuf); + @Override + protected void handleOneTimeData(ByteBuffer buf, Link link) { + if (verbose) + System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - // Switch off this element from circuit - switchOff(); + // Initial packet is exactly 12 bytes long + if (!cap(buf, 12, 12, link, false)) + return; - } + // Read protocol version + String rfbProtocol = new String(buf.data, buf.offset, buf.length, RfbConstants.US_ASCII_CHARSET); + buf.unref(); - public String toString() { - return "Vnc3.3 Hello(" + id + ")"; - } + // Server should use RFB protocol 3.x + if (!rfbProtocol.contains(RfbConstants.RFB_PROTOCOL_VERSION_MAJOR)) + throw new RuntimeException("Cannot handshake with VNC server. Unsupported protocol version: \"" + rfbProtocol + "\"."); - /** - * Example. - */ - public static void main(String args[]) { - // System.setProperty("streamer.Link.debug", "true"); - System.setProperty("streamer.Element.debug", "true"); - // System.setProperty("streamer.Pipeline.debug", "true"); + // Send response: we support RFB 3.3 only + String ourProtocolString = RfbConstants.RFB_PROTOCOL_VERSION + "\n"; - InputStream is = new ByteArrayInputStream("RFB 003.007\ntest".getBytes(RfbConstants.US_ASCII_CHARSET)); - ByteArrayOutputStream initOS = new ByteArrayOutputStream(); - ByteArrayOutputStream mainOS = new ByteArrayOutputStream(); - InputStreamSource inputStreamSource = new InputStreamSource("source", is); - OutputStreamSink outputStreamSink = new OutputStreamSink("mainSink", mainOS); + ByteBuffer outBuf = new ByteBuffer(ourProtocolString.getBytes(RfbConstants.US_ASCII_CHARSET)); - Vnc_3_3_Hello hello = new Vnc_3_3_Hello("hello"); + if (verbose) { + outBuf.putMetadata("sender", this); + outBuf.putMetadata("version", RfbConstants.RFB_PROTOCOL_VERSION); + } - Pipeline pipeline = new PipelineImpl("test"); + pushDataToOTOut(outBuf); - pipeline.addAndLink(inputStreamSource, hello, outputStreamSink); - pipeline.add(new OutputStreamSink("initSink", initOS)); + // Switch off this element from circuit + switchOff(); - pipeline.link("hello >" + OneTimeSwitch.OTOUT, "initSink"); + } - pipeline.runMainLoop("source", STDOUT, false, false); + @Override + public String toString() { + return "Vnc3.3 Hello(" + id + ")"; + } - String initOut = new String(initOS.toByteArray(), RfbConstants.US_ASCII_CHARSET); - String mainOut = new String(mainOS.toByteArray(), RfbConstants.US_ASCII_CHARSET); + /** + * Example. + */ + public static void main(String args[]) { + // System.setProperty("streamer.Link.debug", "true"); + System.setProperty("streamer.Element.debug", "true"); + // System.setProperty("streamer.Pipeline.debug", "true"); - if (!"RFB 003.003\n".equals(initOut)) - System.err.println("Unexpected value for hello response: \"" + initOut + "\"."); + InputStream is = new ByteArrayInputStream("RFB 003.007\ntest".getBytes(RfbConstants.US_ASCII_CHARSET)); + ByteArrayOutputStream initOS = new ByteArrayOutputStream(); + ByteArrayOutputStream mainOS = new ByteArrayOutputStream(); + InputStreamSource inputStreamSource = new InputStreamSource("source", is); + OutputStreamSink outputStreamSink = new OutputStreamSink("mainSink", mainOS); - if (!"test".equals(mainOut)) - System.err.println("Unexpected value for main data: \"" + mainOut + "\"."); + Vnc_3_3_Hello hello = new Vnc_3_3_Hello("hello"); - } + Pipeline pipeline = new PipelineImpl("test"); + + pipeline.addAndLink(inputStreamSource, hello, outputStreamSink); + pipeline.add(new OutputStreamSink("initSink", initOS)); + + pipeline.link("hello >" + OneTimeSwitch.OTOUT, "initSink"); + + pipeline.runMainLoop("source", STDOUT, false, false); + + String initOut = new String(initOS.toByteArray(), RfbConstants.US_ASCII_CHARSET); + String mainOut = new String(mainOS.toByteArray(), RfbConstants.US_ASCII_CHARSET); + + if (!"RFB 003.003\n".equals(initOut)) + System.err.println("Unexpected value for hello response: \"" + initOut + "\"."); + + if (!"test".equals(mainOut)) + System.err.println("Unexpected value for main data: \"" + mainOut + "\"."); + + } } diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java index ee286f01ee6..283beac3456 100644 --- a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java +++ b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java @@ -36,154 +36,154 @@ public class MockServerTest extends TestCase { public void testIsMockServerCanRespond() throws Exception { - final byte[] mockClientData = new byte[] { 0x01, 0x02, 0x03 }; - final byte[] mockServerData = new byte[] { 0x03, 0x02, 0x01 }; + final byte[] mockClientData = new byte[] {0x01, 0x02, 0x03}; + final byte[] mockServerData = new byte[] {0x03, 0x02, 0x01}; - MockServer server = new MockServer(new Packet[] { new Packet("Client hello") { - { - type = CLIENT; - data = mockClientData; + MockServer server = new MockServer(new Packet[] {new Packet("Client hello") { + { + type = CLIENT; + data = mockClientData; + } + }, new Packet("Server hello") { + { + type = SERVER; + data = mockServerData; + } + }}); + + server.start(); + + // Connect to server and send and receive mock data + + Socket socket = SocketFactory.getDefault().createSocket(); + try { + socket.connect(server.getAddress()); + + InputStream is = socket.getInputStream(); + OutputStream os = socket.getOutputStream(); + + // Write mock data to server + os.write(mockClientData); + + // Read data from server + byte actualData[] = new byte[mockServerData.length]; + int actualDataLength = is.read(actualData); + + // Compare mock data with actual data + assertEquals("Unexpected length of actual data read from server.", mockServerData.length, actualDataLength); + + for (int i = 0; i < actualDataLength; i++) { + assertEquals("Unexpected byte #" + i + " in response", mockServerData[i], actualData[i]); + } + + server.waitUntilShutdowned(1 * 1000 /* up to 1 second */); + + assertNull("Unexpected exception at mock server side.", server.getException()); + assertTrue("Server is not shutdowned at after conversation.", server.isShutdowned()); + + } finally { + socket.close(); } - }, new Packet("Server hello") { - { - type = SERVER; - data = mockServerData; - } - } }); - - server.start(); - - // Connect to server and send and receive mock data - - Socket socket = SocketFactory.getDefault().createSocket(); - try { - socket.connect(server.getAddress()); - - InputStream is = socket.getInputStream(); - OutputStream os = socket.getOutputStream(); - - // Write mock data to server - os.write(mockClientData); - - // Read data from server - byte actualData[] = new byte[mockServerData.length]; - int actualDataLength = is.read(actualData); - - // Compare mock data with actual data - assertEquals("Unexpected length of actual data read from server.", mockServerData.length, actualDataLength); - - for (int i = 0; i < actualDataLength; i++) { - assertEquals("Unexpected byte #" + i + " in response", mockServerData[i], actualData[i]); - } - - server.waitUntilShutdowned(1 * 1000 /* up to 1 second */); - - assertNull("Unexpected exception at mock server side.", server.getException()); - assertTrue("Server is not shutdowned at after conversation.", server.isShutdowned()); - - } finally { - socket.close(); - } } public void testIsMockServerCanUpgradeConnectionToSsl() throws Exception { - final byte[] mockClientData1 = new byte[] { 0x01, 0x02, 0x03 }; - final byte[] mockServerData1 = new byte[] { 0x03, 0x02, 0x01 }; + final byte[] mockClientData1 = new byte[] {0x01, 0x02, 0x03}; + final byte[] mockServerData1 = new byte[] {0x03, 0x02, 0x01}; - final byte[] mockClientData2 = new byte[] { 0x02, 0x04, 0x02, 0x03 }; - final byte[] mockServerData2 = new byte[] { 0x02, 0x02, 0x01, 0x04 }; + final byte[] mockClientData2 = new byte[] {0x02, 0x04, 0x02, 0x03}; + final byte[] mockServerData2 = new byte[] {0x02, 0x02, 0x01, 0x04}; - MockServer server = new MockServer(new Packet[] { new Packet("Client hello") { - { - type = CLIENT; - data = mockClientData1; + MockServer server = new MockServer(new Packet[] {new Packet("Client hello") { + { + type = CLIENT; + data = mockClientData1; + } + }, new Packet("Server hello") { + { + type = SERVER; + data = mockServerData1; + } + }, new Packet("Upgrade connection to SSL") { + { + type = UPGRADE_TO_SSL; + } + }, new Packet("Client data over SSL") { + { + type = CLIENT; + data = mockClientData2; + } + }, new Packet("Server data over SSL") { + { + type = SERVER; + data = mockServerData2; + } + }}); + + server.start(); + + // Connect to server and send and receive mock data + + Socket socket = SocketFactory.getDefault().createSocket(); + try { + InetSocketAddress address = server.getAddress(); + socket.connect(address); + + // Send hello data over plain connection + { + InputStream is = socket.getInputStream(); + OutputStream os = socket.getOutputStream(); + + // Write mock data to server + os.write(mockClientData1); + + // Read data from server + byte actualData[] = new byte[mockServerData1.length]; + int actualDataLength = is.read(actualData); + + // Compare mock data with actual data + assertEquals("Unexpected length of actual data read from server.", mockServerData1.length, actualDataLength); + + for (int i = 0; i < actualDataLength; i++) { + assertEquals("Unexpected byte #" + i + " in response", mockServerData1[i], actualData[i]); + } + } + + // Upgrade connection to SSL and send mock data + { + //System.setProperty("javax.net.debug", "ssl"); + + final SSLSocketFactory sslSocketFactory = (SSLSocketFactory)SSLSocketFactory.getDefault(); + SSLSocket sslSocket = (SSLSocket)sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true); + sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites()); + sslSocket.startHandshake(); + + InputStream is = sslSocket.getInputStream(); + OutputStream os = sslSocket.getOutputStream(); + + // Write mock data to server + os.write(mockClientData2); + + // Read data from server + byte actualData[] = new byte[mockServerData2.length]; + int actualDataLength = is.read(actualData); + + // Compare mock data with actual data + assertEquals("Unexpected length of actual data read from server.", mockServerData2.length, actualDataLength); + + for (int i = 0; i < actualDataLength; i++) { + assertEquals("Unexpected byte #" + i + " in response", mockServerData2[i], actualData[i]); + } + + } + + server.waitUntilShutdowned(1 * 1000 /* up to 1 second */); + + assertNull("Unexpected exception at mock server side.", server.getException()); + assertTrue("Server is not shutdowned at after conversation.", server.isShutdowned()); + } finally { + socket.close(); } - }, new Packet("Server hello") { - { - type = SERVER; - data = mockServerData1; - } - }, new Packet("Upgrade connection to SSL") { - { - type = UPGRADE_TO_SSL; - } - }, new Packet("Client data over SSL") { - { - type = CLIENT; - data = mockClientData2; - } - }, new Packet("Server data over SSL") { - { - type = SERVER; - data = mockServerData2; - } - } }); - - server.start(); - - // Connect to server and send and receive mock data - - Socket socket = SocketFactory.getDefault().createSocket(); - try { - InetSocketAddress address = server.getAddress(); - socket.connect(address); - - // Send hello data over plain connection - { - InputStream is = socket.getInputStream(); - OutputStream os = socket.getOutputStream(); - - // Write mock data to server - os.write(mockClientData1); - - // Read data from server - byte actualData[] = new byte[mockServerData1.length]; - int actualDataLength = is.read(actualData); - - // Compare mock data with actual data - assertEquals("Unexpected length of actual data read from server.", mockServerData1.length, actualDataLength); - - for (int i = 0; i < actualDataLength; i++) { - assertEquals("Unexpected byte #" + i + " in response", mockServerData1[i], actualData[i]); - } - } - - // Upgrade connection to SSL and send mock data - { - //System.setProperty("javax.net.debug", "ssl"); - - final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault(); - SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true); - sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites()); - sslSocket.startHandshake(); - - InputStream is = sslSocket.getInputStream(); - OutputStream os = sslSocket.getOutputStream(); - - // Write mock data to server - os.write(mockClientData2); - - // Read data from server - byte actualData[] = new byte[mockServerData2.length]; - int actualDataLength = is.read(actualData); - - // Compare mock data with actual data - assertEquals("Unexpected length of actual data read from server.", mockServerData2.length, actualDataLength); - - for (int i = 0; i < actualDataLength; i++) { - assertEquals("Unexpected byte #" + i + " in response", mockServerData2[i], actualData[i]); - } - - } - - server.waitUntilShutdowned(1 * 1000 /* up to 1 second */); - - assertNull("Unexpected exception at mock server side.", server.getException()); - assertTrue("Server is not shutdowned at after conversation.", server.isShutdowned()); - } finally { - socket.close(); - } } } diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java index c73a384adf4..0d28e0978a6 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java @@ -35,11 +35,12 @@ import java.util.concurrent.Executor; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.xml.DOMConfigurator; -import com.cloud.consoleproxy.util.Logger; -import com.cloud.utils.PropertiesUtil; import com.google.gson.Gson; import com.sun.net.httpserver.HttpServer; +import com.cloud.consoleproxy.util.Logger; +import com.cloud.utils.PropertiesUtil; + /** * * ConsoleProxy, singleton class that manages overall activities in console proxy process. To make legacy code work, we still @@ -193,8 +194,9 @@ public class ConsoleProxy { if (authMethod != null) { Object result; try { - result = authMethod.invoke(ConsoleProxy.context, param.getClientHostAddress(), String.valueOf(param.getClientHostPort()), param.getClientTag(), - param.getClientHostPassword(), param.getTicket(), new Boolean(reauthentication)); + result = + authMethod.invoke(ConsoleProxy.context, param.getClientHostAddress(), String.valueOf(param.getClientHostPort()), param.getClientTag(), + param.getClientHostPassword(), param.getTicket(), new Boolean(reauthentication)); } catch (IllegalAccessException e) { s_logger.error("Unable to invoke authenticateConsoleAccess due to IllegalAccessException" + " for vm: " + param.getClientTag(), e); authResult.setSuccess(false); @@ -408,7 +410,8 @@ public class ConsoleProxy { s_logger.info("The rfb thread died, reinitializing the viewer " + viewer); viewer.initClient(param); } else if (!param.getClientHostPassword().equals(viewer.getClientHostPassword())) { - s_logger.warn("Bad sid detected(VNC port may be reused). sid in session: " + viewer.getClientHostPassword() + ", sid in request: " + param.getClientHostPassword()); + s_logger.warn("Bad sid detected(VNC port may be reused). sid in session: " + viewer.getClientHostPassword() + ", sid in request: " + + param.getClientHostPassword()); viewer.initClient(param); } } @@ -446,7 +449,8 @@ public class ConsoleProxy { throw new AuthenticationException("Cannot use the existing viewer " + viewer + ": modified AJAX session id"); } - if (param.getClientHostPassword() == null || param.getClientHostPassword().isEmpty() || !param.getClientHostPassword().equals(viewer.getClientHostPassword())) + if (param.getClientHostPassword() == null || param.getClientHostPassword().isEmpty() || + !param.getClientHostPassword().equals(viewer.getClientHostPassword())) throw new AuthenticationException("Cannot use the existing viewer " + viewer + ": bad sid"); if (!viewer.isFrontEndAlive()) { @@ -505,6 +509,7 @@ public class ConsoleProxy { } static class ThreadExecutor implements Executor { + @Override public void execute(Runnable r) { new Thread(r).start(); } diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java index e619f2bdf84..56e2ea997fa 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java @@ -26,17 +26,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.cloud.consoleproxy.util.Logger; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; +import com.cloud.consoleproxy.util.Logger; + public class ConsoleProxyAjaxHandler implements HttpHandler { private static final Logger s_logger = Logger.getLogger(ConsoleProxyAjaxHandler.class); public ConsoleProxyAjaxHandler() { } + @Override public void handle(HttpExchange t) throws IOException { try { if (s_logger.isTraceEnabled()) @@ -130,7 +132,8 @@ public class ConsoleProxyAjaxHandler implements HttpHandler { s_logger.warn("Failed to create viewer due to " + e.getMessage(), e); - String[] content = new String[] {"", "
", + String[] content = + new String[] {"", "
", "

Access is denied for the console session. Please close the window and retry again

", "
"}; StringBuffer sb = new StringBuffer(); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java index 58af11ef2cd..a9799218b2c 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java @@ -24,14 +24,16 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import com.cloud.consoleproxy.util.Logger; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; +import com.cloud.consoleproxy.util.Logger; + public class ConsoleProxyAjaxImageHandler implements HttpHandler { private static final Logger s_logger = Logger.getLogger(ConsoleProxyAjaxImageHandler.class); + @Override public void handle(HttpExchange t) throws IOException { try { if (s_logger.isDebugEnabled()) diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java index b7057ef1e4f..0b7221c1dac 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java @@ -21,9 +21,10 @@ import java.net.InetSocketAddress; import javax.net.ssl.SSLServerSocket; -import com.cloud.consoleproxy.util.Logger; import com.sun.net.httpserver.HttpServer; +import com.cloud.consoleproxy.util.Logger; + public class ConsoleProxyBaseServerFactoryImpl implements ConsoleProxyServerFactory { private static final Logger s_logger = Logger.getLogger(ConsoleProxyBaseServerFactoryImpl.class); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java index 9a69416466a..daef040c9b1 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java @@ -69,8 +69,10 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons return clientId; } + @Override public abstract boolean isHostConnected(); + @Override public abstract boolean isFrontEndAlive(); @Override @@ -83,6 +85,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons return ajaxImageCache; } + @Override public Image getClientScaledImage(int width, int height) { FrameBufferCanvas canvas = getFrameBufferCavas(); if (canvas != null) @@ -91,8 +94,10 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons return null; } + @Override public abstract void sendClientRawKeyboardEvent(InputEventType event, int code, int modifiers); + @Override public abstract void sendClientMouseEvent(InputEventType event, int x, int y, int code, int modifiers); @Override @@ -231,8 +236,8 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons } private String onAjaxClientConnectFailed() { - return "

" + "Unable to start console session as connection is refused by the machine you are accessing" - + "

"; + return "

" + + "Unable to start console session as connection is refused by the machine you are accessing" + "

"; } @Override @@ -298,7 +303,8 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons } } - String[] content = new String[] {"", "", "", + String[] content = + new String[] {"", "", "", "", "", "", @@ -312,10 +318,11 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons "
  • ", "", "\"Keyboard\"Keyboard", "", "", "
    • ", "", - "", "
    ", "
    ", "